Bump version

Multi platform

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,8 @@
-##### What version of ViaBackwards are you using? Type /ver ViaBackwards:
+### What is the output url of /viaversion dump?
+> 
 
+### How/when does this error happen? login?:
+> 
 
-##### What version of ViaVersion are you using? Type /ver ViaVersion:
-
-
-##### What version of Spigot are you using? Type /ver:
-
-
-##### What plugins are you using? Type /plugins:
-
-
-##### How/when does this error happen? login?:
-
-
-##### Is there an error in the console? Use pastebin.com. Is there a kick message?:
-
+### Is there an error in the console? Use pastebin.com. Is there a kick message?:
+> 

.gitignore

@@ -1,6 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Maven template
 target/
+*/target
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
@@ -78,6 +79,8 @@ local.properties
 .idea/tasks.xml
 .idea/dictionaries
 .idea/vcs.xml
+.idea/
+*.iml
 .idea/jsLibraryMappings.xml
 
 # Sensitive or high-churn files:

LICENSE

@@ -1,674 +1,7 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+Copyright (c) 2016 Matsv
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-                            Preamble
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,13 +1,10 @@
 # ViaBackwards
 
-Allows 1.9.x on a 1.10 Spigot server.
-Requires [ViaVersion](http://viaversion.com) to be installed
+Allows older Minecraft versions on a newer Minecraft server
 
-TODO:
-- [ ] Cleanup code
-- [ ] Improve the rewriters
-- [ ] Make it possible to send metadata with the rewriteEntityId
-- [ ] Add support for sound names
-- [ ] Create JavaDocs
-- [ ] Improve the Entity tracker system to work good with multiple versions.
-- [ ] Make it possible to choose your own replacement blocks
+
+Requires [ViaVersion](http://viaversion.com) to be installed
+**Spigot page:** https://www.spigotmc.org/resources/viabackwards.27448/
+
+### Supported versions:
+![supported_versions](http://i.imgur.com/gXCifhK.png)

all/pom.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016 Matsv
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viabackwards-parent</artifactId>
+        <groupId>nl.matsv</groupId>
+        <version>2.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viabackwards-all</artifactId>
+
+    <build>
+        <finalName>${project.name}-${project.version}</finalName>
+        <defaultGoal>clean install</defaultGoal>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <showWarnings>false</showWarnings>
+                    <showDeprecation>false</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <minimizeJar>false</minimizeJar>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-bukkit</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-bungee</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-sponge</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+</project>

bukkit/pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016 Matsv
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viabackwards-parent</artifactId>
+        <groupId>nl.matsv</groupId>
+        <version>2.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viabackwards-bukkit</artifactId>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.11-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>

bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards;
+
+import nl.matsv.viabackwards.api.ViaBackwardsPlatform;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform {
+    @Override
+    public void onEnable() {
+        this.init();
+    }
+
+    @Override
+    public void disable() {
+        getPluginLoader().disablePlugin(this);
+    }
+}

bukkit/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: ViaBackwards
 version: ${project.version}
-main: nl.matsv.viabackwards.ViaBackwards
-description: Allow
+description: Allows 1.9.x on a 1.10 Spigot server
+main: nl.matsv.viabackwards.BukkitPlugin
 
 authors: [Matsv]
 website: https://matsv.nl

bungee/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016 Matsv
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viabackwards-parent</artifactId>
+        <groupId>nl.matsv</groupId>
+        <version>2.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viabackwards-bungee</artifactId>
+
+    <repositories>
+        <!-- Bungee repo -->
+        <repository>
+            <id>bungeecord-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- BungeeCord API -->
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.11-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Core Module -->
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>

bungee/src/main/java/nl/matsv/viabackwards/BungeePlugin.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards;
+
+import net.md_5.bungee.api.plugin.Plugin;
+import nl.matsv.viabackwards.api.ViaBackwardsPlatform;
+
+public class BungeePlugin extends Plugin implements ViaBackwardsPlatform {
+
+    @Override
+    public void onEnable() {
+        this.init();
+    }
+
+    // Why is this not a thing in Bungee? O_o
+    @Override
+    public void disable() {
+    }
+}

bungee/src/main/resources/bungee.yml

@@ -0,0 +1,5 @@
+name: ViaBackwards
+main: nl.matsv.viabackwards.BungeePlugin
+author: Matsv
+version: ${project.version}
+depends: [ViaVersion]

core/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016 Matsv
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viabackwards-parent</artifactId>
+        <groupId>nl.matsv</groupId>
+        <version>2.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viabackwards-core</artifactId>
+
+    <repositories>
+        <repository>
+            <id>viaversion-repo</id>
+            <url>https://repo.viaversion.com/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- Netty (Network Library) -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.20.Final</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+
+</project>

core/src/main/java/nl/matsv/viabackwards/ViaBackwards.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards;
+
+import com.google.common.base.Preconditions;
+import lombok.Getter;
+import nl.matsv.viabackwards.api.ViaBackwardsPlatform;
+
+public class ViaBackwards {
+    @Getter
+    private static ViaBackwardsPlatform platform;
+
+    public static void init(ViaBackwardsPlatform platform) {
+        Preconditions.checkArgument(platform != null, "ViaBackwards is already initialized");
+
+        ViaBackwards.platform = platform;
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api;
+
+import us.myles.ViaVersion.api.protocol.Protocol;
+
+public abstract class BackwardsProtocol extends Protocol {
+
+}

core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api;
+
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
+
+import java.util.Collections;
+import java.util.logging.Logger;
+
+public interface ViaBackwardsPlatform {
+    /**
+     * Initialize ViaBackwards
+     */
+    default void init() {
+        ViaBackwards.init(this);
+
+        if (!isOutdated()) {
+            ProtocolRegistry.registerProtocol(new Protocol1_9_4To1_10(), Collections.singletonList(ProtocolVersion.v1_9_3.getId()), ProtocolVersion.v1_10.getId());
+            ProtocolRegistry.registerProtocol(new Protocol1_10To1_11(), Collections.singletonList(ProtocolVersion.v1_10.getId()), ProtocolVersion.v1_11.getId());
+            ProtocolRegistry.registerProtocol(new Protocol1_11To1_11_1(), Collections.singletonList(ProtocolVersion.v1_11.getId()), ProtocolVersion.v1_11_1.getId());
+            ProtocolRegistry.registerProtocol(new Protocol1_11_1To1_12(), Collections.singletonList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_12.getId());
+        }
+    }
+
+    /**
+     * Logger provided by the platform
+     *
+     * @return logger instance
+     */
+    Logger getLogger();
+
+    // TODO remove or better implement later
+    default boolean isOutdated() {
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName("us.myles.ViaVersion.api.type.types.version.Types1_12");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        if (clazz == null) {
+            getLogger().severe("================================");
+            getLogger().severe("YOUR VIAVERSION IS OUTDATED");
+            getLogger().severe("PLEASE USE THE LATEST VERSION");
+            getLogger().severe("LINK: https://viaversion.com");
+            getLogger().severe("VIABACKWARDS WILL NOW DISABLE");
+            getLogger().severe("================================");
+
+            disable();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Disable the plugin
+     */
+    void disable();
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/blockitem/BlockItemSettings.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.blockitem;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+
+@RequiredArgsConstructor
+@Getter
+public class BlockItemSettings {
+    private final int id;
+    private Item repItem;
+    private Block repBlock;
+    private BlockEntityHandler blockEntityHandler;
+    private ItemHandler itemHandler;
+
+    public BlockItemSettings repItem(Item item) {
+        this.repItem = item;
+        return this;
+    }
+
+    public BlockItemSettings repBlock(Block block) {
+        this.repBlock = block;
+        return this;
+    }
+
+    public BlockItemSettings blockEntityHandler(BlockEntityHandler handler) {
+        this.blockEntityHandler = handler;
+        return this;
+    }
+
+    public BlockItemSettings itemHandler(ItemHandler handler) {
+        this.itemHandler = handler;
+        return this;
+    }
+
+    public boolean hasRepItem() {
+        return repItem != null;
+    }
+
+    public boolean hasRepBlock() {
+        return repBlock != null;
+    }
+
+    public boolean hasEntityHandler() {
+        return blockEntityHandler != null;
+    }
+
+    public boolean hasItemTagHandler() {
+        return itemHandler != null;
+    }
+
+    public interface BlockEntityHandler {
+        CompoundTag handleOrNewCompoundTag(int block, CompoundTag tag);
+    }
+
+    public interface ItemHandler {
+        Item handle(Item i);
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.meta;
+
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+
+public interface MetaHandler {
+    Metadata handle(MetaHandlerEvent e) throws RemovedValueException;
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.meta;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+public class MetaHandlerEvent {
+    private UserConnection user;
+    private EntityTracker.StoredEntity entity;
+    private int index = -1;
+    private Metadata data;
+    @Getter
+    private MetaStorage storage;
+
+    public boolean hasData() {
+        return data != null;
+    }
+
+    public Optional<Metadata> getMetaByIndex(int index) {
+        for (Metadata meta : getStorage().getMetaDataList())
+            if (index == meta.getId())
+                return Optional.of(meta);
+        return Optional.empty();
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.meta;
+
+import lombok.Getter;
+import lombok.ToString;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+
+import java.util.List;
+
+@ToString
+@Getter
+public class MetaHandlerSettings {
+    private AbstractEntityType filterType;
+    private boolean filterFamily = false;
+    private int filterIndex = -1;
+    private MetaHandler handler;
+
+    public MetaHandlerSettings filter(AbstractEntityType type) {
+        return filter(type, filterFamily, filterIndex);
+    }
+
+    public MetaHandlerSettings filter(AbstractEntityType type, boolean filterFamily) {
+        return filter(type, filterFamily, filterIndex);
+    }
+
+    public MetaHandlerSettings filter(int index) {
+        return filter(filterType, filterFamily, index);
+    }
+
+    public MetaHandlerSettings filter(AbstractEntityType type, int index) {
+        return filter(type, filterFamily, index);
+    }
+
+    public MetaHandlerSettings filter(AbstractEntityType type, boolean filterFamily, int index) {
+        this.filterType = type;
+        this.filterFamily = filterFamily;
+        this.filterIndex = index;
+        return this;
+    }
+
+    public void handle(MetaHandler handler) {
+        this.handler = handler;
+    }
+
+    public void handleIndexChange(final int newIndex) {
+        handle(e -> {
+            Metadata data = e.getData();
+            data.setId(newIndex);
+            return data;
+        });
+    }
+
+    public void removed() {
+        handle(e -> {
+            throw new RemovedValueException();
+        });
+    }
+
+    public boolean hasHandler() {
+        return handler != null;
+    }
+
+    public boolean hasType() {
+        return filterType != null;
+    }
+
+    public boolean hasIndex() {
+        return filterIndex > -1;
+    }
+
+    public boolean isFilterFamily() {
+        return filterFamily;
+    }
+
+    public boolean isGucci(AbstractEntityType type, Metadata metadata) {
+        if (hasHandler()) {
+            if (hasType()) {
+                List<AbstractEntityType> family = type.getParents();
+                if (isFilterFamily()) {
+                    if (!family.contains(getFilterType()))
+                        return false;
+                } else {
+                    if (!getFilterType().is(type))
+                        return false;
+                }
+            }
+            return !(hasIndex() && metadata.getId() != getFilterIndex());
+        }
+        return false;
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.storage;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+@RequiredArgsConstructor
+@Getter
+@ToString
+public class EntityData {
+    private final int id;
+    private final boolean isObject;
+    private String mobName;
+
+    private final int replacementId;
+    private final int objectData;
+    private MetaCreator defaultMeta;
+
+    public EntityData mobName(String name) {
+        this.mobName = name;
+        return this;
+    }
+
+    public void spawnMetadata(MetaCreator handler) {
+        this.defaultMeta = handler;
+    }
+
+    public boolean hasBaseMeta() {
+        return this.defaultMeta != null;
+    }
+
+    public interface MetaCreator {
+        void handle(MetaStorage storage);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityStorage.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.storage;
+
+public class EntityStorage {
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.storage;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class EntityTracker extends StoredObject {
+    private Map<BackwardsProtocol, ProtocolEntityTracker> trackers = new ConcurrentHashMap<>();
+
+    public EntityTracker(UserConnection user) {
+        super(user);
+    }
+
+    public void initProtocol(BackwardsProtocol protocol) {
+        trackers.put(protocol, new ProtocolEntityTracker());
+    }
+
+    public ProtocolEntityTracker get(BackwardsProtocol protocol) {
+        return trackers.get(protocol);
+    }
+
+    public class ProtocolEntityTracker {
+        private Map<Integer, StoredEntity> entityMap = new ConcurrentHashMap<>();
+
+        public void trackEntityType(int id, AbstractEntityType type) {
+            if (entityMap.containsKey(id))
+                return;
+            entityMap.put(id, new StoredEntity(id, type));
+        }
+
+        public void removeEntity(int id) {
+            entityMap.remove(id);
+        }
+
+        public AbstractEntityType getEntityType(int id) {
+            if (containsEntity(id))
+                return getEntity(id).getType();
+            return null;
+        }
+
+        public StoredEntity getEntity(int id) {
+            return entityMap.get(id);
+        }
+
+        public boolean containsEntity(int id) {
+            return entityMap.containsKey(id);
+        }
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    @ToString
+    public class StoredEntity {
+        private final int entityId;
+        private final AbstractEntityType type;
+        Map<Class<? extends EntityStorage>, EntityStorage> storedObjects = new ConcurrentHashMap<>();
+
+        /**
+         * Get an object from the storage
+         *
+         * @param objectClass The class of the object to get
+         * @param <T>         The type of the class you want to get.
+         * @return The requested object
+         */
+        public <T extends EntityStorage> T get(Class<T> objectClass) {
+            return (T) storedObjects.get(objectClass);
+        }
+
+        /**
+         * Check if the storage has an object
+         *
+         * @param objectClass The object class to check
+         * @return True if the object is in the storage
+         */
+        public boolean has(Class<? extends EntityStorage> objectClass) {
+            return storedObjects.containsKey(objectClass);
+        }
+
+        /**
+         * Put an object into the stored objects based on class
+         *
+         * @param object The object to store.
+         */
+        public void put(EntityStorage object) {
+            storedObjects.put(object.getClass(), object);
+        }
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.storage;
+
+import lombok.*;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+
+import java.util.List;
+import java.util.Optional;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+public class MetaStorage {
+    @NonNull
+    private List<Metadata> metaDataList;
+
+    public boolean has(Metadata data) {
+        return this.getMetaDataList().contains(data);
+    }
+
+    public void delete(Metadata data) {
+        this.getMetaDataList().remove(data);
+    }
+
+    public void delete(int index) {
+        Optional<Metadata> data = get(index);
+        if (data.isPresent())
+            delete(data.get());
+    }
+
+    public void add(Metadata data) {
+        this.getMetaDataList().add(data);
+    }
+
+    public Optional<Metadata> get(int index) {
+        for (Metadata meta : this.getMetaDataList())
+            if (index == meta.getId())
+                return Optional.of(meta);
+        return Optional.empty();
+    }
+
+    public Metadata getOrDefault(int index, Metadata data) {
+        return getOrDefault(index, false, data);
+    }
+
+    public Metadata getOrDefault(int index, boolean removeIfExists, Metadata data) {
+        Optional<Metadata> existingData = get(index);
+
+        if (removeIfExists && existingData.isPresent())
+            delete(existingData.get());
+        return existingData.orElse(data);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractEntityType.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.types;
+
+import java.util.List;
+
+public interface AbstractEntityType {
+
+    /**
+     * Get the metadata id
+     *
+     * @return the metadata index
+     */
+    int getId();
+
+    /**
+     * Get the parent class of the entity
+     *
+     * @return parent EntityType
+     */
+    AbstractEntityType getParent();
+
+    boolean is(AbstractEntityType... types);
+
+    boolean is(AbstractEntityType type);
+
+    boolean isOrHasParent(AbstractEntityType type);
+
+    List<AbstractEntityType> getParents();
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractObjectType.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.types;
+
+public interface AbstractObjectType {
+    /**
+     * Get the metadata id
+     *
+     * @return the metadata index
+     */
+    int getId();
+
+    /**
+     * Get the entity type
+     *
+     * @return Entity type
+     */
+    AbstractEntityType getType();
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_10.java

@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.types;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import nl.matsv.viabackwards.ViaBackwards;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+// 1.10 Entity / Object ids
+public class EntityType1_10 {
+
+    public static EntityType getTypeFromId(int typeID, boolean isObject) {
+        Optional<EntityType> type;
+
+        if (isObject)
+            type = ObjectType.getPCEntity(typeID);
+        else
+            type = EntityType.findById(typeID);
+
+        if (!type.isPresent()) {
+            ViaBackwards.getPlatform().getLogger().severe("[EntityType1_10] Could not find type id " + typeID + " isObject=" + isObject);
+            return EntityType.ENTITY; // Fall back to the basic ENTITY
+        }
+
+        return type.get();
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum EntityType implements AbstractEntityType {
+        ENTITY(-1),
+        DROPPED_ITEM(1, EntityType.ENTITY),
+        EXPERIENCE_ORB(2, EntityType.ENTITY),
+        LEASH_HITCH(8, EntityType.ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        PAINTING(9, EntityType.ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        ARROW(10, EntityType.ENTITY),
+        SNOWBALL(11, EntityType.ENTITY), // Actually EntityProjectile
+        FIREBALL(12, EntityType.ENTITY),
+        SMALL_FIREBALL(13, EntityType.ENTITY),
+        ENDER_PEARL(14, EntityType.ENTITY), // Actually EntityProjectile
+        ENDER_SIGNAL(15, EntityType.ENTITY),
+        THROWN_EXP_BOTTLE(17, EntityType.ENTITY),
+        ITEM_FRAME(18, EntityType.ENTITY), // Actually EntityHanging
+        WITHER_SKULL(19, EntityType.ENTITY),
+        PRIMED_TNT(20, EntityType.ENTITY),
+        FALLING_BLOCK(21, EntityType.ENTITY),
+        FIREWORK(22, EntityType.ENTITY),
+        TIPPED_ARROW(23, EntityType.ARROW),
+        SPECTRAL_ARROW(24, EntityType.ARROW),
+        SHULKER_BULLET(25, EntityType.ENTITY),
+        DRAGON_FIREBALL(26, EntityType.FIREBALL),
+
+        ENTITY_LIVING(-1, ENTITY),
+        ENTITY_INSENTIENT(-1, ENTITY_LIVING),
+        ENTITY_AGEABLE(-1, ENTITY_INSENTIENT),
+        ENTITY_TAMEABLE_ANIMAL(-1, ENTITY_AGEABLE),
+        ENTITY_HUMAN(-1, ENTITY_LIVING),
+
+        ARMOR_STAND(30, EntityType.ENTITY_LIVING),
+
+        // Vehicles
+        MINECART_ABSTRACT(-1, ENTITY),
+        MINECART_COMMAND(40, MINECART_ABSTRACT),
+        BOAT(41, ENTITY),
+        MINECART_RIDEABLE(42, MINECART_ABSTRACT),
+        MINECART_CHEST(43, MINECART_ABSTRACT),
+        MINECART_FURNACE(44, MINECART_ABSTRACT),
+        MINECART_TNT(45, MINECART_ABSTRACT),
+        MINECART_HOPPER(46, MINECART_ABSTRACT),
+        MINECART_MOB_SPAWNER(47, MINECART_ABSTRACT),
+
+        CREEPER(50, ENTITY_INSENTIENT),
+        SKELETON(51, ENTITY_INSENTIENT),
+        SPIDER(52, ENTITY_INSENTIENT),
+        GIANT(53, ENTITY_INSENTIENT),
+        ZOMBIE(54, ENTITY_INSENTIENT),
+        SLIME(55, ENTITY_INSENTIENT),
+        GHAST(56, ENTITY_INSENTIENT),
+        PIG_ZOMBIE(57, ZOMBIE),
+        ENDERMAN(58, ENTITY_INSENTIENT),
+        CAVE_SPIDER(59, SPIDER),
+        SILVERFISH(60, ENTITY_INSENTIENT),
+        BLAZE(61, ENTITY_INSENTIENT),
+        MAGMA_CUBE(62, SLIME),
+        ENDER_DRAGON(63, ENTITY_INSENTIENT),
+        WITHER(64, ENTITY_INSENTIENT),
+        BAT(65, ENTITY_INSENTIENT),
+        WITCH(66, ENTITY_INSENTIENT),
+        ENDERMITE(67, ENTITY_INSENTIENT),
+        GUARDIAN(68, ENTITY_INSENTIENT),
+        IRON_GOLEM(99, ENTITY_INSENTIENT), // moved up to avoid illegal forward references
+        SHULKER(69, EntityType.IRON_GOLEM),
+        PIG(90, ENTITY_AGEABLE),
+        SHEEP(91, ENTITY_AGEABLE),
+        COW(92, ENTITY_AGEABLE),
+        CHICKEN(93, ENTITY_AGEABLE),
+        SQUID(94, ENTITY_INSENTIENT),
+        WOLF(95, ENTITY_TAMEABLE_ANIMAL),
+        MUSHROOM_COW(96, COW),
+        SNOWMAN(97, EntityType.IRON_GOLEM),
+        OCELOT(98, ENTITY_TAMEABLE_ANIMAL),
+        HORSE(100, ENTITY_AGEABLE),
+        RABBIT(101, ENTITY_AGEABLE),
+        POLAR_BEAR(102, ENTITY_AGEABLE),
+        VILLAGER(120, ENTITY_AGEABLE),
+        ENDER_CRYSTAL(200, ENTITY),
+        SPLASH_POTION(-1, ENTITY),
+        LINGERING_POTION(-1, SPLASH_POTION),
+        AREA_EFFECT_CLOUD(-1, ENTITY),
+        EGG(-1, ENTITY),
+        FISHING_HOOK(-1, ENTITY),
+        LIGHTNING(-1, ENTITY),
+        WEATHER(-1, ENTITY),
+        PLAYER(-1, ENTITY_HUMAN),
+        COMPLEX_PART(-1, ENTITY);
+
+        private final int id;
+        private final EntityType parent;
+
+        EntityType(int id) {
+            this.id = id;
+            this.parent = null;
+        }
+
+        public static Optional<EntityType> findById(int id) {
+            if (id == -1)  // Check if this is called
+                return Optional.empty();
+
+            for (EntityType ent : EntityType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        @Override
+        public boolean is(AbstractEntityType... types) {
+            for (AbstractEntityType type : types)
+                if (is(type))
+                    return true;
+            return false;
+        }
+
+        @Override
+        public boolean is(AbstractEntityType type) {
+            return this == type;
+        }
+
+        @Override
+        public boolean isOrHasParent(AbstractEntityType type) {
+            EntityType parent = this;
+
+            do {
+                if (parent.equals(type))
+                    return true;
+
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return false;
+        }
+
+        @Override
+        public List<AbstractEntityType> getParents() {
+            List<AbstractEntityType> types = new ArrayList<>();
+            EntityType parent = this;
+
+            do {
+                types.add(parent);
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return types;
+        }
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum ObjectType implements AbstractObjectType {
+        BOAT(1, EntityType.BOAT),
+        ITEM(2, EntityType.DROPPED_ITEM),
+        AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
+        MINECART(10, EntityType.MINECART_ABSTRACT),
+        TNT_PRIMED(50, EntityType.PRIMED_TNT),
+        ENDER_CRYSTAL(51, EntityType.ENDER_CRYSTAL),
+        TIPPED_ARROW(60, EntityType.TIPPED_ARROW),
+        SNOWBALL(61, EntityType.SNOWBALL),
+        EGG(62, EntityType.EGG),
+        FIREBALL(63, EntityType.FIREBALL),
+        SMALL_FIREBALL(64, EntityType.SMALL_FIREBALL),
+        ENDER_PEARL(65, EntityType.ENDER_PEARL),
+        WITHER_SKULL(66, EntityType.WITHER_SKULL),
+        SHULKER_BULLET(67, EntityType.SHULKER_BULLET),
+        FALLING_BLOCK(70, EntityType.FALLING_BLOCK),
+        ITEM_FRAME(71, EntityType.ITEM_FRAME),
+        ENDER_SIGNAL(72, EntityType.ENDER_SIGNAL),
+        POTION(73, EntityType.SPLASH_POTION),
+        THROWN_EXP_BOTTLE(75, EntityType.THROWN_EXP_BOTTLE),
+        FIREWORK(76, EntityType.FIREWORK),
+        LEASH(77, EntityType.LEASH_HITCH),
+        ARMOR_STAND(78, EntityType.ARMOR_STAND),
+        FISHIHNG_HOOK(90, EntityType.FISHING_HOOK),
+        SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
+        DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
+
+        private final int id;
+        private final EntityType type;
+
+        public static Optional<ObjectType> findById(int id) {
+            if (id == -1)
+                return Optional.empty();
+
+            for (ObjectType ent : ObjectType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        public static Optional<EntityType> getPCEntity(int id) {
+            Optional<ObjectType> output = findById(id);
+
+            if (!output.isPresent())
+                return Optional.empty();
+            return Optional.of(output.get().getType());
+        }
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_11.java

@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.types;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import nl.matsv.viabackwards.ViaBackwards;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class EntityType1_11 {
+
+    public static EntityType getTypeFromId(int typeID, boolean isObject) throws Exception {
+        Optional<EntityType> type;
+
+        if (isObject)
+            type = ObjectType.getPCEntity(typeID);
+        else
+            type = EntityType.findById(typeID);
+
+        if (!type.isPresent()) {
+            ViaBackwards.getPlatform().getLogger().severe("[EntityType1_11] Could not find type id " + typeID + " isObject=" + isObject);
+            return EntityType.ENTITY; // Fall back to the basic ENTITY
+        }
+
+        return type.get();
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum EntityType implements AbstractEntityType {
+        ENTITY(-1),
+        DROPPED_ITEM(1, ENTITY),
+        EXPERIENCE_ORB(2, ENTITY),
+        LEASH_HITCH(8, ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        PAINTING(9, ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        ARROW(10, ENTITY),
+        SNOWBALL(11, ENTITY), // Actually EntityProjectile
+        FIREBALL(12, ENTITY),
+        SMALL_FIREBALL(13, ENTITY),
+        ENDER_PEARL(14, ENTITY), // Actually EntityProjectile
+        ENDER_SIGNAL(15, ENTITY),
+        THROWN_EXP_BOTTLE(17, ENTITY),
+        ITEM_FRAME(18, ENTITY), // Actually EntityHanging
+        WITHER_SKULL(19, ENTITY),
+        PRIMED_TNT(20, ENTITY),
+        FALLING_BLOCK(21, ENTITY),
+        FIREWORK(22, ENTITY),
+        SPECTRAL_ARROW(24, ARROW),
+        SHULKER_BULLET(25, ENTITY),
+        DRAGON_FIREBALL(26, FIREBALL),
+        EVOCATION_FANGS(33, ENTITY),
+
+
+        ENTITY_LIVING(-1, ENTITY),
+        ENTITY_INSENTIENT(-1, ENTITY_LIVING),
+        ENTITY_AGEABLE(-1, ENTITY_INSENTIENT),
+        ENTITY_TAMEABLE_ANIMAL(-1, ENTITY_AGEABLE),
+        ENTITY_HUMAN(-1, ENTITY_LIVING),
+
+        ARMOR_STAND(30, ENTITY_LIVING),
+        EVOCATION_ILLAGER(34, ENTITY_INSENTIENT),
+        VEX(35, ENTITY_INSENTIENT),
+        VINDICATION_ILLAGER(36, ENTITY_INSENTIENT),
+
+        // Vehicles
+        MINECART_ABSTRACT(-1, ENTITY),
+        MINECART_COMMAND(40, MINECART_ABSTRACT),
+        BOAT(41, ENTITY),
+        MINECART_RIDEABLE(42, MINECART_ABSTRACT),
+        MINECART_CHEST(43, MINECART_ABSTRACT),
+        MINECART_FURNACE(44, MINECART_ABSTRACT),
+        MINECART_TNT(45, MINECART_ABSTRACT),
+        MINECART_HOPPER(46, MINECART_ABSTRACT),
+        MINECART_MOB_SPAWNER(47, MINECART_ABSTRACT),
+
+        CREEPER(50, ENTITY_INSENTIENT),
+
+        ABSTRACT_SKELETON(-1, ENTITY_INSENTIENT),
+        SKELETON(51, ABSTRACT_SKELETON),
+        WITHER_SKELETON(5, ABSTRACT_SKELETON),
+        STRAY(6, ABSTRACT_SKELETON),
+
+        SPIDER(52, ENTITY_INSENTIENT),
+        GIANT(53, ENTITY_INSENTIENT),
+
+        ZOMBIE(54, ENTITY_INSENTIENT),
+        HUSK(23, ZOMBIE),
+        ZOMBIE_VILLAGER(27, ZOMBIE),
+
+        SLIME(55, ENTITY_INSENTIENT),
+        GHAST(56, ENTITY_INSENTIENT),
+        PIG_ZOMBIE(57, ZOMBIE),
+        ENDERMAN(58, ENTITY_INSENTIENT),
+        CAVE_SPIDER(59, SPIDER),
+        SILVERFISH(60, ENTITY_INSENTIENT),
+        BLAZE(61, ENTITY_INSENTIENT),
+        MAGMA_CUBE(62, SLIME),
+        ENDER_DRAGON(63, ENTITY_INSENTIENT),
+        WITHER(64, ENTITY_INSENTIENT),
+        BAT(65, ENTITY_INSENTIENT),
+        WITCH(66, ENTITY_INSENTIENT),
+        ENDERMITE(67, ENTITY_INSENTIENT),
+
+        GUARDIAN(68, ENTITY_INSENTIENT),
+        ELDER_GUARDIAN(4, EntityType.GUARDIAN), // Moved down to avoid illegal forward reference
+
+        IRON_GOLEM(99, ENTITY_INSENTIENT), // moved up to avoid illegal forward references
+        SHULKER(69, EntityType.IRON_GOLEM),
+        PIG(90, ENTITY_AGEABLE),
+        SHEEP(91, ENTITY_AGEABLE),
+        COW(92, ENTITY_AGEABLE),
+        CHICKEN(93, ENTITY_AGEABLE),
+        SQUID(94, ENTITY_INSENTIENT),
+        WOLF(95, ENTITY_TAMEABLE_ANIMAL),
+        MUSHROOM_COW(96, COW),
+        SNOWMAN(97, EntityType.IRON_GOLEM),
+        OCELOT(98, ENTITY_TAMEABLE_ANIMAL),
+
+        ABSTRACT_HORSE(-1, ENTITY_AGEABLE),
+        HORSE(100, ABSTRACT_HORSE),
+        SKELETON_HORSE(28, ABSTRACT_HORSE),
+        ZOMBIE_HORSE(29, ABSTRACT_HORSE),
+
+        CHESTED_HORSE(-1, ABSTRACT_HORSE),
+        DONKEY(31, CHESTED_HORSE),
+        MULE(32, CHESTED_HORSE),
+        LIAMA(103, CHESTED_HORSE),
+
+
+        RABBIT(101, ENTITY_AGEABLE),
+        POLAR_BEAR(102, ENTITY_AGEABLE),
+        VILLAGER(120, ENTITY_AGEABLE),
+        ENDER_CRYSTAL(200, ENTITY),
+        SPLASH_POTION(-1, ENTITY),
+        LINGERING_POTION(-1, SPLASH_POTION),
+        AREA_EFFECT_CLOUD(-1, ENTITY),
+        EGG(-1, ENTITY),
+        FISHING_HOOK(-1, ENTITY),
+        LIGHTNING(-1, ENTITY),
+        WEATHER(-1, ENTITY),
+        PLAYER(-1, ENTITY_HUMAN),
+        COMPLEX_PART(-1, ENTITY),
+        LIAMA_SPIT(-1, ENTITY);
+
+        private final int id;
+        private final EntityType parent;
+
+        EntityType(int id) {
+            this.id = id;
+            this.parent = null;
+        }
+
+        public static Optional<EntityType> findById(int id) {
+            if (id == -1)  // Check if this is called
+                return Optional.empty();
+
+            for (EntityType ent : EntityType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        @Override
+        public boolean is(AbstractEntityType... types) {
+            for (AbstractEntityType type : types)
+                if (is(type))
+                    return true;
+            return false;
+        }
+
+        @Override
+        public boolean is(AbstractEntityType type) {
+            return this == type;
+        }
+
+        @Override
+        public boolean isOrHasParent(AbstractEntityType type) {
+            EntityType parent = this;
+
+            do {
+                if (parent.equals(type))
+                    return true;
+
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return false;
+        }
+
+        @Override
+        public List<AbstractEntityType> getParents() {
+            List<AbstractEntityType> types = new ArrayList<>();
+            EntityType parent = this;
+
+            do {
+                types.add(parent);
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return types;
+        }
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum ObjectType implements AbstractObjectType {
+        BOAT(1, EntityType.BOAT),
+        ITEM(2, EntityType.DROPPED_ITEM),
+        AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
+        MINECART(10, EntityType.MINECART_ABSTRACT),
+        TNT_PRIMED(50, EntityType.PRIMED_TNT),
+        ENDER_CRYSTAL(51, EntityType.ENDER_CRYSTAL),
+        TIPPED_ARROW(60, EntityType.ARROW),
+        SNOWBALL(61, EntityType.SNOWBALL),
+        EGG(62, EntityType.EGG),
+        FIREBALL(63, EntityType.FIREBALL),
+        SMALL_FIREBALL(64, EntityType.SMALL_FIREBALL),
+        ENDER_PEARL(65, EntityType.ENDER_PEARL),
+        WITHER_SKULL(66, EntityType.WITHER_SKULL),
+        SHULKER_BULLET(67, EntityType.SHULKER_BULLET),
+        LIAMA_SPIT(68, EntityType.LIAMA_SPIT),
+        FALLING_BLOCK(70, EntityType.FALLING_BLOCK),
+        ITEM_FRAME(71, EntityType.ITEM_FRAME),
+        ENDER_SIGNAL(72, EntityType.ENDER_SIGNAL),
+        POTION(73, EntityType.SPLASH_POTION),
+        THROWN_EXP_BOTTLE(75, EntityType.THROWN_EXP_BOTTLE),
+        FIREWORK(76, EntityType.FIREWORK),
+        LEASH(77, EntityType.LEASH_HITCH),
+        ARMOR_STAND(78, EntityType.ARMOR_STAND),
+        EVOCATION_FANGS(79, EntityType.EVOCATION_FANGS),
+        FISHIHNG_HOOK(90, EntityType.FISHING_HOOK),
+        SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
+        DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
+
+        private final int id;
+        private final EntityType type;
+
+        public static Optional<ObjectType> findById(int id) {
+            if (id == -1)
+                return Optional.empty();
+
+            for (ObjectType ent : ObjectType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        public static Optional<EntityType> getPCEntity(int id) {
+            Optional<ObjectType> output = findById(id);
+
+            if (!output.isPresent())
+                return Optional.empty();
+            return Optional.of(output.get().getType());
+        }
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_12.java

@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.entities.types;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import nl.matsv.viabackwards.ViaBackwards;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class EntityType1_12 {
+
+    public static EntityType getTypeFromId(int typeID, boolean isObject) throws Exception {
+        Optional<EntityType> type;
+
+        if (isObject)
+            type = ObjectType.getPCEntity(typeID);
+        else
+            type = EntityType.findById(typeID);
+
+        if (!type.isPresent()) {
+            ViaBackwards.getPlatform().getLogger().severe("[EntityType1_12] Could not find type id " + typeID + " isObject=" + isObject);
+            return EntityType.ENTITY; // Fall back to the basic ENTITY
+        }
+
+        return type.get();
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum EntityType implements AbstractEntityType {
+        ENTITY(-1),
+        DROPPED_ITEM(1, ENTITY),
+        EXPERIENCE_ORB(2, ENTITY),
+        LEASH_HITCH(8, ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        PAINTING(9, ENTITY), // Actually entity hanging but it doesn't make a lot of difference for metadata
+        ARROW(10, ENTITY),
+        SNOWBALL(11, ENTITY), // Actually EntityProjectile
+        FIREBALL(12, ENTITY),
+        SMALL_FIREBALL(13, ENTITY),
+        ENDER_PEARL(14, ENTITY), // Actually EntityProjectile
+        ENDER_SIGNAL(15, ENTITY),
+        THROWN_EXP_BOTTLE(17, ENTITY),
+        ITEM_FRAME(18, ENTITY), // Actually EntityHanging
+        WITHER_SKULL(19, ENTITY),
+        PRIMED_TNT(20, ENTITY),
+        FALLING_BLOCK(21, ENTITY),
+        FIREWORK(22, ENTITY),
+        SPECTRAL_ARROW(24, ARROW),
+        SHULKER_BULLET(25, ENTITY),
+        DRAGON_FIREBALL(26, FIREBALL),
+        EVOCATION_FANGS(33, ENTITY),
+
+
+        ENTITY_LIVING(-1, ENTITY),
+        ENTITY_INSENTIENT(-1, ENTITY_LIVING),
+        ENTITY_AGEABLE(-1, ENTITY_INSENTIENT),
+        ENTITY_TAMEABLE_ANIMAL(-1, ENTITY_AGEABLE),
+        ENTITY_HUMAN(-1, ENTITY_LIVING),
+
+        ARMOR_STAND(30, ENTITY_LIVING),
+        ENTITY_ILLAGER_ABSTRACT(-1, ENTITY_INSENTIENT),
+        EVOCATION_ILLAGER(34, ENTITY_ILLAGER_ABSTRACT),
+        VEX(35, ENTITY_INSENTIENT),
+        VINDICATION_ILLAGER(36, ENTITY_ILLAGER_ABSTRACT),
+        ILLUSION_ILLAGER(37, EVOCATION_ILLAGER),
+
+        // Vehicles
+        MINECART_ABSTRACT(-1, ENTITY),
+        MINECART_COMMAND(40, MINECART_ABSTRACT),
+        BOAT(41, ENTITY),
+        MINECART_RIDEABLE(42, MINECART_ABSTRACT),
+        MINECART_CHEST(43, MINECART_ABSTRACT),
+        MINECART_FURNACE(44, MINECART_ABSTRACT),
+        MINECART_TNT(45, MINECART_ABSTRACT),
+        MINECART_HOPPER(46, MINECART_ABSTRACT),
+        MINECART_MOB_SPAWNER(47, MINECART_ABSTRACT),
+
+        CREEPER(50, ENTITY_INSENTIENT),
+
+        ABSTRACT_SKELETON(-1, ENTITY_INSENTIENT),
+        SKELETON(51, ABSTRACT_SKELETON),
+        WITHER_SKELETON(5, ABSTRACT_SKELETON),
+        STRAY(6, ABSTRACT_SKELETON),
+
+        SPIDER(52, ENTITY_INSENTIENT),
+        GIANT(53, ENTITY_INSENTIENT),
+
+        ZOMBIE(54, ENTITY_INSENTIENT),
+        HUSK(23, ZOMBIE),
+        ZOMBIE_VILLAGER(27, ZOMBIE),
+
+        SLIME(55, ENTITY_INSENTIENT),
+        GHAST(56, ENTITY_INSENTIENT),
+        PIG_ZOMBIE(57, ZOMBIE),
+        ENDERMAN(58, ENTITY_INSENTIENT),
+        CAVE_SPIDER(59, SPIDER),
+        SILVERFISH(60, ENTITY_INSENTIENT),
+        BLAZE(61, ENTITY_INSENTIENT),
+        MAGMA_CUBE(62, SLIME),
+        ENDER_DRAGON(63, ENTITY_INSENTIENT),
+        WITHER(64, ENTITY_INSENTIENT),
+        BAT(65, ENTITY_INSENTIENT),
+        WITCH(66, ENTITY_INSENTIENT),
+        ENDERMITE(67, ENTITY_INSENTIENT),
+
+        GUARDIAN(68, ENTITY_INSENTIENT),
+        ELDER_GUARDIAN(4, EntityType.GUARDIAN), // Moved down to avoid illegal forward reference
+
+        IRON_GOLEM(99, ENTITY_INSENTIENT), // moved up to avoid illegal forward references
+        SHULKER(69, EntityType.IRON_GOLEM),
+        PIG(90, ENTITY_AGEABLE),
+        SHEEP(91, ENTITY_AGEABLE),
+        COW(92, ENTITY_AGEABLE),
+        CHICKEN(93, ENTITY_AGEABLE),
+        SQUID(94, ENTITY_INSENTIENT),
+        WOLF(95, ENTITY_TAMEABLE_ANIMAL),
+        MUSHROOM_COW(96, COW),
+        SNOWMAN(97, EntityType.IRON_GOLEM),
+        OCELOT(98, ENTITY_TAMEABLE_ANIMAL),
+        PARROT(105, ENTITY_TAMEABLE_ANIMAL),
+
+        ABSTRACT_HORSE(-1, ENTITY_AGEABLE),
+        HORSE(100, ABSTRACT_HORSE),
+        SKELETON_HORSE(28, ABSTRACT_HORSE),
+        ZOMBIE_HORSE(29, ABSTRACT_HORSE),
+
+        CHESTED_HORSE(-1, ABSTRACT_HORSE),
+        DONKEY(31, CHESTED_HORSE),
+        MULE(32, CHESTED_HORSE),
+        LIAMA(103, CHESTED_HORSE),
+
+
+        RABBIT(101, ENTITY_AGEABLE),
+        POLAR_BEAR(102, ENTITY_AGEABLE),
+        VILLAGER(120, ENTITY_AGEABLE),
+        ENDER_CRYSTAL(200, ENTITY),
+        SPLASH_POTION(-1, ENTITY),
+        LINGERING_POTION(-1, SPLASH_POTION),
+        AREA_EFFECT_CLOUD(-1, ENTITY),
+        EGG(-1, ENTITY),
+        FISHING_HOOK(-1, ENTITY),
+        LIGHTNING(-1, ENTITY),
+        WEATHER(-1, ENTITY),
+        PLAYER(-1, ENTITY_HUMAN),
+        COMPLEX_PART(-1, ENTITY),
+        LIAMA_SPIT(-1, ENTITY);
+
+        private final int id;
+        private final EntityType parent;
+
+        EntityType(int id) {
+            this.id = id;
+            this.parent = null;
+        }
+
+        public static Optional<EntityType> findById(int id) {
+            if (id == -1)  // Check if this is called
+                return Optional.empty();
+
+            for (EntityType ent : EntityType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        @Override
+        public boolean is(AbstractEntityType... types) {
+            for (AbstractEntityType type : types)
+                if (is(type))
+                    return true;
+            return false;
+        }
+
+        @Override
+        public boolean is(AbstractEntityType type) {
+            return this == type;
+        }
+
+        @Override
+        public boolean isOrHasParent(AbstractEntityType type) {
+            EntityType parent = this;
+
+            do {
+                if (parent.equals(type))
+                    return true;
+
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return false;
+        }
+
+        @Override
+        public List<AbstractEntityType> getParents() {
+            List<AbstractEntityType> types = new ArrayList<>();
+            EntityType parent = this;
+
+            do {
+                types.add(parent);
+                parent = parent.getParent();
+            } while (parent != null);
+
+            return types;
+        }
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum ObjectType implements AbstractObjectType {
+        BOAT(1, EntityType.BOAT),
+        ITEM(2, EntityType.DROPPED_ITEM),
+        AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
+        MINECART(10, EntityType.MINECART_ABSTRACT),
+        TNT_PRIMED(50, EntityType.PRIMED_TNT),
+        ENDER_CRYSTAL(51, EntityType.ENDER_CRYSTAL),
+        TIPPED_ARROW(60, EntityType.ARROW),
+        SNOWBALL(61, EntityType.SNOWBALL),
+        EGG(62, EntityType.EGG),
+        FIREBALL(63, EntityType.FIREBALL),
+        SMALL_FIREBALL(64, EntityType.SMALL_FIREBALL),
+        ENDER_PEARL(65, EntityType.ENDER_PEARL),
+        WITHER_SKULL(66, EntityType.WITHER_SKULL),
+        SHULKER_BULLET(67, EntityType.SHULKER_BULLET),
+        LIAMA_SPIT(68, EntityType.LIAMA_SPIT),
+        FALLING_BLOCK(70, EntityType.FALLING_BLOCK),
+        ITEM_FRAME(71, EntityType.ITEM_FRAME),
+        ENDER_SIGNAL(72, EntityType.ENDER_SIGNAL),
+        POTION(73, EntityType.SPLASH_POTION),
+        THROWN_EXP_BOTTLE(75, EntityType.THROWN_EXP_BOTTLE),
+        FIREWORK(76, EntityType.FIREWORK),
+        LEASH(77, EntityType.LEASH_HITCH),
+        ARMOR_STAND(78, EntityType.ARMOR_STAND),
+        EVOCATION_FANGS(79, EntityType.EVOCATION_FANGS),
+        FISHIHNG_HOOK(90, EntityType.FISHING_HOOK),
+        SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
+        DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
+
+        private final int id;
+        private final EntityType type;
+
+        public static Optional<ObjectType> findById(int id) {
+            if (id == -1)
+                return Optional.empty();
+
+            for (ObjectType ent : ObjectType.values())
+                if (ent.getId() == id)
+                    return Optional.of(ent);
+
+            return Optional.empty();
+        }
+
+        public static Optional<EntityType> getPCEntity(int id) {
+            Optional<ObjectType> output = findById(id);
+
+            if (!output.isPresent())
+                return Optional.empty();
+            return Optional.of(output.get().getType());
+        }
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.exceptions;
+
+import java.io.IOException;
+
+public class RemovedValueException extends IOException {
+}

core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java

@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.rewriters;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.blockitem.BlockItemSettings;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.utils.Block;
+import nl.matsv.viabackwards.utils.ItemUtil;
+import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
+import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.viaversion.libs.opennbt.conversion.builtin.CompoundTagConverter;
+import us.myles.viaversion.libs.opennbt.tag.builtin.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class BlockItemRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
+    private static final CompoundTagConverter converter = new CompoundTagConverter();
+    private final Map<Integer, BlockItemSettings> replacementData = new ConcurrentHashMap<>();
+
+    protected BlockItemSettings rewrite(int itemId) {
+        BlockItemSettings settings = new BlockItemSettings(itemId);
+        replacementData.put(itemId, settings);
+        return settings;
+    }
+
+    protected Item handleItemToClient(Item i) {
+        if (i == null)
+            return null;
+        if (!replacementData.containsKey((int) i.getId()))
+            return i;
+        BlockItemSettings data = replacementData.get((int) i.getId());
+
+        Item original = ItemUtil.copyItem(i);
+        if (data.hasRepItem()) {
+            i = ItemUtil.copyItem(data.getRepItem());
+
+            if (i.getTag() == null)
+                i.setTag(new CompoundTag(""));
+            i.getTag().put(createViaNBT(original));
+
+            // Handle colors
+            if (i.getTag().contains("display")) {
+                CompoundTag tag = i.getTag().get("display");
+                if (tag.contains("Name")) {
+                    String value = (String) tag.get("Name").getValue();
+
+                    tag.put(new StringTag("Name",
+                            value.replaceAll("%viabackwards_color%", BlockColors.get((int) original.getData()))));
+                }
+            }
+
+            i.setAmount(original.getAmount());
+            // Keep original data when -1
+            if (i.getData() == -1)
+                i.setData(original.getData());
+        }
+        if (data.hasItemTagHandler()) {
+            if (!i.getTag().contains("ViaBackwards|" + getProtocolName()))
+                i.getTag().put(createViaNBT(original));
+            data.getItemHandler().handle(i);
+        }
+
+        return i;
+    }
+
+    protected Item handleItemToServer(Item item) {
+        if (item == null || item.getTag() == null)
+            return null;
+        CompoundTag tag = item.getTag();
+        if (tag.contains("ViaBackwards|" + getProtocolName())) {
+            CompoundTag via = tag.get("ViaBackwards|" + getProtocolName());
+
+            short id = (short) via.get("id").getValue();
+            short data = (short) via.get("data").getValue();
+            byte amount = (byte) via.get("amount").getValue();
+            CompoundTag extras = via.get("extras");
+
+            item.setId(id);
+            item.setData(data);
+            item.setAmount(amount);
+            item.setTag(converter.convert("", converter.convert(extras)));
+            // Remove data tag
+            tag.remove("ViaBackwards|" + getProtocolName());
+        }
+        return item;
+    }
+
+    public int handleBlockID(int idx) {
+        int type = idx >> 4;
+        int meta = idx & 15;
+
+        if (!containsBlock(type))
+            return idx;
+
+        Block b = handleBlock(type, meta);
+        return (b.getId() << 4 | (b.getData() & 15));
+    }
+
+    public Block handleBlock(int block, int data) {
+        if (!containsBlock(block))
+            return null;
+
+        Block b = replacementData.get(block).getRepBlock().clone();
+        // For some blocks, the data can still be useful (:
+        if (b.getData() == -1)
+            b.setData(data);
+        return b;
+    }
+
+    protected void handleChunk(Chunk chunk) {
+        // Map Block Entities
+        Map<Pos, CompoundTag> tags = new HashMap<>();
+        for (CompoundTag tag : chunk.getBlockEntities()) {
+            if (!(tag.contains("x") && tag.contains("y") && tag.contains("z")))
+                continue;
+            Pos pos = new Pos(
+                    (int) tag.get("x").getValue() % 16,
+                    (int) tag.get("y").getValue(),
+                    (int) tag.get("z").getValue() % 16);
+            tags.put(pos, tag);
+        }
+
+        for (int i = 0; i < chunk.getSections().length; i++) {
+            ChunkSection section = chunk.getSections()[i];
+            if (section == null)
+                continue;
+
+            for (int x = 0; x < 16; x++) {
+                for (int y = 0; y < 16; y++) {
+                    for (int z = 0; z < 16; z++) {
+                        int block = section.getBlock(x, y, z);
+                        int btype = block >> 4;
+                        if (containsBlock(btype)) {
+                            Block b = handleBlock(btype, block & 15); // Type / data
+                            section.setBlock(x, y, z, b.getId(), b.getData());
+                        }
+                        // Entity Tags
+                        if (hasBlockEntityHandler(btype)) {
+                            Pos pos = new Pos(x, (y + (i << 4)), z);
+                            CompoundTag tag = null;
+                            if (tags.containsKey(pos)) {
+                                tag = tags.get(pos);
+                            } else {
+                                tag = new CompoundTag("");
+                                tag.put(new IntTag("x", x + (chunk.getX() << 4)));
+                                tag.put(new IntTag("y", y + (i << 4)));
+                                tag.put(new IntTag("z", z + (chunk.getZ() << 4)));
+                                chunk.getBlockEntities().add(tag);
+                            }
+                            replacementData.get(btype).getBlockEntityHandler().handleOrNewCompoundTag(block, tag);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    protected boolean containsBlock(int block) {
+        return replacementData.containsKey(block) && replacementData.get(block).hasRepBlock();
+    }
+
+    protected boolean hasBlockEntityHandler(int block) {
+        return replacementData.containsKey(block) && replacementData.get(block).hasEntityHandler();
+    }
+
+    protected boolean hasItemTagHandler(int block) {
+        return replacementData.containsKey(block) && replacementData.get(block).hasItemTagHandler();
+    }
+
+    private CompoundTag createViaNBT(Item i) {
+        CompoundTag tag = new CompoundTag("ViaBackwards|" + getProtocolName());
+        tag.put(new ShortTag("id", i.getId()));
+        tag.put(new ShortTag("data", i.getData()));
+        tag.put(new ByteTag("amount", i.getAmount()));
+        if (i.getTag() != null) {
+            tag.put(converter.convert("extras", converter.convert(i.getTag())));
+        } else
+            tag.put(new CompoundTag("extras"));
+        return tag;
+    }
+
+    protected CompoundTag getNamedTag(String text) {
+        CompoundTag tag = new CompoundTag("");
+        tag.put(new CompoundTag("display"));
+        ((CompoundTag) tag.get("display")).put(new StringTag("Name", text));
+        return tag;
+    }
+
+    private String getProtocolName() {
+        return getProtocol().getClass().getSimpleName();
+    }
+
+    @Data
+    @AllArgsConstructor
+    @ToString
+    @EqualsAndHashCode
+    private class Pos {
+        private int x, y, z;
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.rewriters;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.meta.MetaHandlerEvent;
+import nl.matsv.viabackwards.api.entities.meta.MetaHandlerSettings;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.AbstractObjectType;
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.metadata.MetaType;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
+
+@RequiredArgsConstructor
+public abstract class EntityRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
+    private final Map<AbstractEntityType, EntityData> entityTypes = new ConcurrentHashMap<>();
+    private final Map<AbstractObjectType, EntityData> objectTypes = new ConcurrentHashMap<>();
+    private final List<MetaHandlerSettings> metaHandlers = new ArrayList<>();
+
+    @Getter(AccessLevel.PROTECTED)
+    @Setter(AccessLevel.PROTECTED)
+    private MetaType displayNameMetaType = MetaType1_9.String;
+    @Getter(AccessLevel.PROTECTED)
+    @Setter(AccessLevel.PROTECTED)
+    private int displayNameIndex = 2;
+
+    protected AbstractEntityType getEntityType(UserConnection connection, int id) {
+        return getEntityTracker(connection).getEntityType(id);
+    }
+
+    protected void addTrackedEntity(UserConnection connection, int entityId, AbstractEntityType type) {
+        getEntityTracker(connection).trackEntityType(entityId, type);
+    }
+
+    protected Optional<EntityData> getEntityData(AbstractEntityType type) {
+        if (!entityTypes.containsKey(type))
+            return Optional.empty();
+        return Optional.of(entityTypes.get(type));
+    }
+
+    protected Optional<EntityData> getObjectData(AbstractObjectType type) {
+        if (!objectTypes.containsKey(type))
+            return Optional.empty();
+        return Optional.of(objectTypes.get(type));
+    }
+
+    protected EntityData regEntType(AbstractEntityType oldEnt, AbstractEntityType replacement) {
+        return regEntType(oldEnt, (short) replacement.getId());
+    }
+
+    private EntityData regEntType(AbstractEntityType oldEnt, short replacementId) {
+        EntityData data = new EntityData(oldEnt.getId(), false, replacementId, -1);
+        entityTypes.put(oldEnt, data);
+        return data;
+    }
+
+    protected EntityData regObjType(AbstractObjectType oldObj, AbstractObjectType replacement, int data) {
+        return regObjType(oldObj, (short) replacement.getId(), data);
+    }
+
+    private EntityData regObjType(AbstractObjectType oldObj, short replacementId, int data) {
+        EntityData entData = new EntityData(oldObj.getId(), true, replacementId, data);
+        objectTypes.put(oldObj, entData);
+        return entData;
+    }
+
+    public MetaHandlerSettings registerMetaHandler() {
+        MetaHandlerSettings settings = new MetaHandlerSettings();
+        metaHandlers.add(settings);
+        return settings;
+    }
+
+    protected MetaStorage handleMeta(UserConnection user, int entityId, MetaStorage storage) throws Exception {
+        EntityTracker.StoredEntity entity = getEntityTracker(user).getEntity(entityId);
+        AbstractEntityType type = entity.getType();
+
+        List<Metadata> newList = new CopyOnWriteArrayList<>();
+
+        for (MetaHandlerSettings settings : metaHandlers) {
+            for (Metadata md : storage.getMetaDataList()) {
+                Metadata nmd = md;
+                try {
+                    if (settings.isGucci(type, nmd))
+                        nmd = settings.getHandler().handle(new MetaHandlerEvent(user, entity, nmd.getId(), nmd, storage));
+
+                    if (nmd == null)
+                        throw new RemovedValueException();
+                    newList.add(nmd);
+                } catch (RemovedValueException ignored) {
+                } catch (Exception e) {
+                    if (Via.getManager().isDebug()) {
+                        Logger log = ViaBackwards.getPlatform().getLogger();
+                        log.warning("Unable to handle metadata " + nmd);
+                        log.warning("Full metadata list " + storage);
+                        e.printStackTrace();
+                    }
+                }
+            }
+            storage.setMetaDataList(new ArrayList<>(newList));
+            newList.clear();
+        }
+
+        // Handle Entity Name
+        Optional<Metadata> opMd = storage.get(getDisplayNameIndex());
+        if (opMd.isPresent()) {
+            Optional<EntityData> opEd = getEntityData(type);
+            if (opEd.isPresent()) {
+                Metadata data = opMd.get();
+                EntityData entData = opEd.get();
+                if (entData.getMobName() != null &&
+                        (data.getValue() == null || ((String) data.getValue()).isEmpty()) &&
+                        data.getMetaType().getTypeID() == getDisplayNameMetaType().getTypeID())
+                    data.setValue(entData.getMobName());
+            }
+
+        }
+
+        return storage;
+    }
+
+    protected EntityTracker.ProtocolEntityTracker getEntityTracker(UserConnection user) {
+        return user.get(EntityTracker.class).get(getProtocol());
+    }
+}

core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.rewriters;
+
+import lombok.Getter;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+
+public abstract class Rewriter<T extends BackwardsProtocol> {
+    @Getter
+    private T protocol;
+
+    /**
+     * Register everything
+     *
+     * @param protocol Protocol instance
+     */
+    public void register(T protocol) {
+        this.protocol = protocol;
+        registerPackets(protocol);
+        registerRewrites();
+    }
+
+    /**
+     * Register packet listeners
+     *
+     * @param protocol Protocol instance
+     */
+    protected abstract void registerPackets(T protocol);
+
+    /**
+     * Register rewrites
+     */
+    protected abstract void registerRewrites();
+}

core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.api.rewriters;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class SoundRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
+    private Map<Integer, SoundData> soundRewrites = new ConcurrentHashMap<>();
+
+    public SoundData added(int id, int replacement) {
+        return added(id, replacement, -1);
+    }
+
+    public SoundData added(int id, int replacement, float newPitch) {
+        SoundData data = new SoundData(replacement, true, newPitch, true);
+        soundRewrites.put(id, data);
+        return data;
+    }
+
+    public SoundData removed(int id) {
+        SoundData data = new SoundData(-1, false, -1, false);
+        soundRewrites.put(id, data);
+        return data;
+    }
+
+    public int handleSounds(int soundId) {
+        int newSoundId = soundId;
+        if (soundRewrites.containsKey(soundId))
+            return soundRewrites.get(soundId).getReplacementSound();
+        for (Map.Entry<Integer, SoundData> entry : soundRewrites.entrySet()) {
+            if (soundId > entry.getKey()) {
+                if (entry.getValue().isAdded()) {
+                    newSoundId--;
+                } else {
+                    newSoundId++;
+                }
+            }
+        }
+        return newSoundId;
+    }
+
+    public boolean hasPitch(int soundId) {
+        if (soundRewrites.containsKey(soundId))
+            return soundRewrites.get(soundId).isChangePitch();
+        return false;
+    }
+
+    public float handlePitch(int soundId) {
+        if (soundRewrites.containsKey(soundId))
+            return soundRewrites.get(soundId).getNewPitch();
+        return 1f;
+    }
+
+    @Data
+    @AllArgsConstructor
+    public class SoundData {
+        private int replacementSound;
+        private boolean changePitch = false;
+        private float newPitch = 1f;
+        private boolean added;
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/EntityTypeNames.java

@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;
+
+/*
+    Copied from ViaVersion //TODO implement in EntityTypes?
+ */
+public class EntityTypeNames {
+    private static BiMap<String, String> newToOldNames = HashBiMap.create();
+
+    static {
+        add("AreaEffectCloud", "minecraft:area_effect_cloud");
+        add("ArmorStand", "minecraft:armor_stand");
+        add("Arrow", "minecraft:arrow");
+        add("Bat", "minecraft:bat");
+        add("Blaze", "minecraft:blaze");
+        add("Boat", "minecraft:boat");
+        add("CaveSpider", "minecraft:cave_spider");
+        add("Chicken", "minecraft:chicken");
+        add("Cow", "minecraft:cow");
+        add("Creeper", "minecraft:creeper");
+        add("Donkey", "minecraft:donkey");
+        add("DragonFireball", "minecraft:dragon_fireball");
+        add("ElderGuardian", "minecraft:elder_guardian");
+        add("EnderCrystal", "minecraft:ender_crystal");
+        add("EnderDragon", "minecraft:ender_dragon");
+        add("Enderman", "minecraft:enderman");
+        add("Endermite", "minecraft:endermite");
+        add("EntityHorse", "minecraft:horse");
+        add("EyeOfEnderSignal", "minecraft:eye_of_ender_signal");
+        add("FallingSand", "minecraft:falling_block");
+        add("Fireball", "minecraft:fireball");
+        add("FireworksRocketEntity", "minecraft:fireworks_rocket");
+        add("Ghast", "minecraft:ghast");
+        add("Giant", "minecraft:giant");
+        add("Guardian", "minecraft:guardian");
+        add("Husk", "minecraft:husk");
+        add("Item", "minecraft:item");
+        add("ItemFrame", "minecraft:item_frame");
+        add("LavaSlime", "minecraft:magma_cube");
+        add("LeashKnot", "minecraft:leash_knot");
+        add("MinecartChest", "minecraft:chest_minecart");
+        add("MinecartCommandBlock", "minecraft:commandblock_minecart");
+        add("MinecartFurnace", "minecraft:furnace_minecart");
+        add("MinecartHopper", "minecraft:hopper_minecart");
+        add("MinecartRideable", "minecraft:minecart");
+        add("MinecartSpawner", "minecraft:spawner_minecart");
+        add("MinecartTNT", "minecraft:tnt_minecart");
+        add("Mule", "minecraft:mule");
+        add("MushroomCow", "minecraft:mooshroom");
+        add("Ozelot", "minecraft:ocelot");
+        add("Painting", "minecraft:painting");
+        add("Pig", "minecraft:pig");
+        add("PigZombie", "minecraft:zombie_pigman");
+        add("PolarBear", "minecraft:polar_bear");
+        add("PrimedTnt", "minecraft:tnt");
+        add("Rabbit", "minecraft:rabbit");
+        add("Sheep", "minecraft:sheep");
+        add("Shulker", "minecraft:shulker");
+        add("ShulkerBullet", "minecraft:shulker_bullet");
+        add("Silverfish", "minecraft:silverfish");
+        add("Skeleton", "minecraft:skeleton");
+        add("SkeletonHorse", "minecraft:skeleton_horse");
+        add("Slime", "minecraft:slime");
+        add("SmallFireball", "minecraft:small_fireball");
+        add("Snowball", "minecraft:snowball");
+        add("SnowMan", "minecraft:snowman");
+        add("SpectralArrow", "minecraft:spectral_arrow");
+        add("Spider", "minecraft:spider");
+        add("Squid", "minecraft:squid");
+        add("Stray", "minecraft:stray");
+        add("ThrownEgg", "minecraft:egg");
+        add("ThrownEnderpearl", "minecraft:ender_pearl");
+        add("ThrownExpBottle", "minecraft:xp_bottle");
+        add("ThrownPotion", "minecraft:potion");
+        add("Villager", "minecraft:villager");
+        add("VillagerGolem", "minecraft:villager_golem");
+        add("Witch", "minecraft:witch");
+        add("WitherBoss", "minecraft:wither");
+        add("WitherSkeleton", "minecraft:wither_skeleton");
+        add("WitherSkull", "minecraft:wither_skull");
+        add("Wolf", "minecraft:wolf");
+        add("XPOrb", "minecraft:xp_orb");
+        add("Zombie", "minecraft:zombie");
+        add("ZombieHorse", "minecraft:zombie_horse");
+        add("ZombieVillager", "minecraft:zombie_villager");
+    }
+
+    // Other way around (-:
+    private static void add(String oldName, String newName) {
+        newToOldNames.put(newName, oldName);
+    }
+
+    public static void toClient(CompoundTag tag) {
+        if (tag.get("id") instanceof StringTag) {
+            StringTag id = tag.get("id");
+            if (newToOldNames.containsKey(id.getValue())) {
+                id.setValue(newToOldNames.get(id.getValue()));
+            }
+        }
+    }
+
+    public static void toClientSpawner(CompoundTag tag) {
+        if (tag != null && tag.contains("SpawnData")) {
+            CompoundTag spawnData = tag.get("SpawnData");
+            if (spawnData != null && spawnData.contains("id"))
+                toClient(spawnData);
+        }
+    }
+
+    public static void toClientItem(Item item) {
+        if (hasEntityTag(item)) {
+            CompoundTag entityTag = item.getTag().get("EntityTag");
+            toClient(entityTag);
+        }
+    }
+
+    private static boolean hasEntityTag(Item item) {
+        if (item != null && item.getId() == 383) { // Monster Egg
+            CompoundTag tag = item.getTag();
+            if (tag != null && tag.contains("EntityTag") && tag.get("EntityTag") instanceof CompoundTag) {
+                if (((CompoundTag) tag.get("EntityTag")).get("id") instanceof StringTag) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
+

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11;
+
+import lombok.Getter;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.BlockItemPackets1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.EntityPackets1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.SoundPackets1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+public class Protocol1_10To1_11 extends BackwardsProtocol {
+    @Getter
+    private EntityPackets1_11 entityPackets; // Required for the item rewriter
+    @Getter
+    private BlockItemPackets1_11 blockItemPackets;
+
+    @Override
+    protected void registerPackets() {
+        (entityPackets = new EntityPackets1_11()).register(this);
+        new PlayerPackets1_11().register(this);
+        (blockItemPackets = new BlockItemPackets1_11()).register(this);
+        new SoundPackets1_11().register(this);
+    }
+
+    @Override
+    public void init(UserConnection user) {
+        // Register ClientWorld
+        if (!user.has(ClientWorld.class))
+            user.put(new ClientWorld(user));
+
+        // Register EntityTracker if it doesn't exist yet.
+        if (!user.has(EntityTracker.class))
+            user.put(new EntityTracker(user));
+
+        if (!user.has(WindowTracker.class))
+            user.put(new WindowTracker(user));
+
+        // Init protocol in EntityTracker
+        user.get(EntityTracker.class).initProtocol(this);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java

@@ -0,0 +1,487 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
+
+import net.md_5.bungee.api.ChatColor;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_11;
+import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.EntityTypeNames;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public class BlockItemPackets1_11 extends BlockItemRewriter<Protocol1_10To1_11> {
+    @Override
+    protected void registerPackets(Protocol1_10To1_11 protocol) {
+        /* Item packets */
+
+        // Set slot packet
+        protocol.registerOutgoing(State.PLAY, 0x16, 0x16, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Slot Value
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+
+                // Handle Llama
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (isLlama(wrapper.user())) {
+                            Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                            if (!horse.isPresent())
+                                return;
+                            ChestedHorseStorage storage = horse.get();
+                            int currentSlot = wrapper.get(Type.SHORT, 0);
+                            wrapper.set(Type.SHORT, 0, ((Integer) (currentSlot = getNewSlotId(storage, currentSlot))).shortValue());
+                            wrapper.set(Type.ITEM, 0, getNewItem(storage, currentSlot, wrapper.get(Type.ITEM, 0)));
+                        }
+                    }
+                });
+            }
+        });
+
+        // Window items packet
+        protocol.registerOutgoing(State.PLAY, 0x14, 0x14, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.ITEM_ARRAY); // 1 - Window Values
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
+                        for (int i = 0; i < stacks.length; i++)
+                            stacks[i] = handleItemToClient(stacks[i]);
+
+                        if (isLlama(wrapper.user())) {
+                            Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                            if (!horse.isPresent())
+                                return;
+                            ChestedHorseStorage storage = horse.get();
+                            stacks = Arrays.copyOf(stacks, !storage.isChested() ? 38 : 53);
+
+                            for (int i = stacks.length - 1; i >= 0; i--) {
+                                stacks[getNewSlotId(storage, i)] = stacks[i];
+                                stacks[i] = getNewItem(storage, i, stacks[i]);
+                            }
+                            wrapper.set(Type.ITEM_ARRAY, 0, stacks);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Entity Equipment Packet
+        protocol.registerOutgoing(State.PLAY, 0x3C, 0x3C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.VAR_INT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Item
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+            }
+        });
+
+        // Plugin message Packet -> Trading
+        protocol.registerOutgoing(State.PLAY, 0x18, 0x18, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Channel
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
+                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+
+                            int size = wrapper.passthrough(Type.BYTE);
+                            for (int i = 0; i < size; i++) {
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+
+                                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                                if (secondItem)
+                                    wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+
+                                wrapper.passthrough(Type.BOOLEAN); // Trade disabled
+                                wrapper.passthrough(Type.INT); // Number of tools uses
+                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Click window packet
+        protocol.registerIncoming(State.PLAY, 0x07, 0x07, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                        map(Type.SHORT); // 1 - Slot
+                        map(Type.BYTE); // 2 - Button
+                        map(Type.SHORT); // 3 - Action number
+                        map(Type.VAR_INT); // 4 - Mode
+                        map(Type.ITEM); // 5 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+
+                        // Llama slot
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                if (isLlama(wrapper.user())) {
+                                    Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                                    if (!horse.isPresent())
+                                        return;
+                                    ChestedHorseStorage storage = horse.get();
+                                    int clickSlot = wrapper.get(Type.SHORT, 0);
+                                    int correctSlot = getOldSlotId(storage, clickSlot);
+
+                                    wrapper.set(Type.SHORT, 0, ((Integer) correctSlot).shortValue());
+                                }
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Creative Inventory Action
+        protocol.registerIncoming(State.PLAY, 0x18, 0x18, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.SHORT); // 0 - Slot
+                        map(Type.ITEM); // 1 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+                    }
+                }
+        );
+
+        /* Block packets */
+
+        // Chunk packet
+        protocol.registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                                Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld); // Use the 1.10 Chunk type since nothing changed.
+                                Chunk1_9_3_4 chunk = (Chunk1_9_3_4) wrapper.passthrough(type);
+
+                                handleChunk(chunk);
+
+                                // only patch it for signs for now, TODO-> Find all the block entities old/new to replace ids and implement in ViaVersion
+                                chunk.getBlockEntities().stream()
+                                        .filter(tag -> tag.contains("id") && tag.get("id") instanceof StringTag)
+                                        .forEach(tag -> {
+                                            String id = (String) tag.get("id").getValue();
+                                            if (id.equals("minecraft:sign")) {
+                                                ((StringTag) tag.get("id")).setValue("Sign");
+                                            }
+                                        });
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x0B, 0x0B, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.POSITION); // 0 - Block Position
+                        map(Type.VAR_INT); // 1 - Block
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                int idx = wrapper.get(Type.VAR_INT, 0);
+                                wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Multi Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x10, 0x10, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.INT); // 0 - Chunk X
+                        map(Type.INT); // 1 - Chunk Z
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                int count = wrapper.passthrough(Type.VAR_INT); // Array length
+
+                                for (int i = 0; i < count; i++) {
+                                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Horizontal position
+                                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Y coords
+
+                                    int id = wrapper.read(Type.VAR_INT); // Block ID
+                                    wrapper.write(Type.VAR_INT, handleBlockID(id));
+                                }
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Update Block Entity
+        protocol.registerOutgoing(State.PLAY, 0x09, 0x09, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Position
+                map(Type.UNSIGNED_BYTE); // 1 - Action
+                map(Type.NBT); // 2 - NBT
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Remove on shulkerbox decleration
+                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 10) {
+                            wrapper.cancel();
+                        }
+                        // Handler Spawners
+                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
+                            CompoundTag tag = wrapper.get(Type.NBT, 0);
+                            EntityTypeNames.toClientSpawner(tag);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Open window packet
+        protocol.registerOutgoing(State.PLAY, 0x13, 0x13, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.STRING); // 1 - Window Type
+                map(Type.STRING); // 2 - Title
+                map(Type.UNSIGNED_BYTE); // 3 - Slots
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = -1;
+                        // Passthrough Entity ID
+                        if (wrapper.get(Type.STRING, 0).equals("EntityHorse"))
+                            entityId = wrapper.passthrough(Type.INT);
+
+                        // Track Inventory
+                        String inventory = wrapper.get(Type.STRING, 0);
+                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                        windowTracker.setInventory(inventory);
+                        windowTracker.setEntityId(entityId);
+
+                        // Change llama slotcount to the donkey one
+                        if (isLlama(wrapper.user()))
+                            wrapper.set(Type.UNSIGNED_BYTE, 1, (short) 17);
+                    }
+                });
+            }
+        });
+
+        // Close Window Packet
+        protocol.registerOutgoing(State.PLAY, 0x12, 0x12, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                // Inventory tracking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                        windowTracker.setInventory(null);
+                        windowTracker.setEntityId(-1);
+                    }
+                });
+            }
+        });
+
+
+        // Close Window Incoming Packet
+        protocol.registerIncoming(State.PLAY, 0x08, 0x08, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                // Inventory tracking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                        windowTracker.setInventory(null);
+                        windowTracker.setEntityId(-1);
+                    }
+                });
+            }
+        });
+
+        protocol.getEntityPackets().registerMetaHandler().handle(e -> {
+            Metadata data = e.getData();
+
+            if (data.getMetaType().equals(MetaType1_9.Slot)) // Is Item
+                data.setValue(handleItemToClient((Item) data.getValue()));
+
+            return data;
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        // ShulkerBoxes to EnderChest
+        for (int i = 219; i < 235; i++)
+            rewrite(i)
+                    .repItem(new Item((short) 130, (byte) 1, (short) 0, getNamedTag("1.11 " + BlockColors.get(i - 219) + " Shulker Box")))
+                    .repBlock(new Block(130, 1))
+                    .blockEntityHandler((block, tag) -> {
+                        tag.remove("id");
+                        tag.put(new StringTag("id", "minecraft:chest"));
+                        return tag;
+                    });
+
+        // Observer to Dispenser
+        rewrite(218).repItem(new Item((short) 23, (byte) 1, (short) 0, getNamedTag("1.11 Observer"))).repBlock(new Block(23, -1));
+
+        // Handle spawner block entity
+        rewrite(52).blockEntityHandler((b, tag) -> {
+            EntityTypeNames.toClientSpawner(tag);
+            return tag;
+        });
+
+        // Rewrite spawn eggs
+        rewrite(383).itemHandler((i) -> {
+            EntityTypeNames.toClientItem(i);
+            return i;
+        });
+
+        // Totem of Undying to Dead Bush
+        rewrite(449).repItem(new Item((short) 32, (byte) 1, (short) 0, getNamedTag("1.11 Totem of Undying")));
+
+        // Shulker shell to Popped Chorus Fruit
+        rewrite(450).repItem(new Item((short) 433, (byte) 1, (short) 0, getNamedTag("1.11 Shulker Shell")));
+
+    }
+
+    private boolean isLlama(UserConnection user) {
+        WindowTracker tracker = user.get(WindowTracker.class);
+        if (tracker.getInventory() != null && tracker.getInventory().equals("EntityHorse")) {
+            EntityTracker.ProtocolEntityTracker entTracker = user.get(EntityTracker.class).get(getProtocol());
+            if (tracker.getEntityId() != -1 && entTracker.getEntity(tracker.getEntityId()).getType().is(EntityType1_11.EntityType.LIAMA))
+                return true;
+        }
+        return false;
+    }
+
+    private Optional<ChestedHorseStorage> getChestedHorse(UserConnection user) {
+        WindowTracker tracker = user.get(WindowTracker.class);
+        if (tracker.getInventory() != null && tracker.getInventory().equals("EntityHorse")) {
+            EntityTracker.ProtocolEntityTracker entTracker = user.get(EntityTracker.class).get(getProtocol());
+            if (tracker.getEntityId() != -1)
+                return Optional.of(entTracker.getEntity(tracker.getEntityId()).get(ChestedHorseStorage.class));
+        }
+        return Optional.empty();
+    }
+
+    // TODO improve the llama inventory part
+    private int getNewSlotId(ChestedHorseStorage storage, int slotId) {
+        int totalSlots = !storage.isChested() ? 38 : 53;
+        int strength = storage.isChested() ? storage.getLiamaStrength() : 0;
+        int startNonExistingFormula = 2 + 3 * strength;
+        int offsetForm = 15 - (3 * strength);
+
+        if (slotId >= startNonExistingFormula && totalSlots > (slotId + offsetForm))
+            return offsetForm + slotId;
+        if (slotId == 1)
+            return 0;
+        return slotId;
+    }
+
+    private int getOldSlotId(ChestedHorseStorage storage, int slotId) {
+        int strength = storage.isChested() ? storage.getLiamaStrength() : 0;
+        int startNonExistingFormula = 2 + 3 * strength;
+        int endNonExistingFormula = 2 + 3 * (storage.isChested() ? 5 : 0);
+        int offsetForm = endNonExistingFormula - startNonExistingFormula;
+
+        if (slotId == 1 || slotId >= startNonExistingFormula && slotId < endNonExistingFormula)
+            return 0;
+        if (slotId >= endNonExistingFormula)
+            return slotId - offsetForm;
+        if (slotId == 0)
+            return 1;
+        return slotId;
+    }
+
+    private Item getNewItem(ChestedHorseStorage storage, int slotId, Item current) {
+        int strength = storage.isChested() ? storage.getLiamaStrength() : 0;
+        int startNonExistingFormula = 2 + 3 * strength;
+        int endNonExistingFormula = 2 + 3 * (storage.isChested() ? 5 : 0);
+
+        if (slotId >= startNonExistingFormula && slotId < endNonExistingFormula)
+            return new Item((short) 166, (byte) 1, (short) 0, getNamedTag(ChatColor.RED + "SLOT DISABLED"));
+        if (slotId == 1)
+            return null;
+        return current;
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java

@@ -0,0 +1,599 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
+
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_12;
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+import java.util.Optional;
+
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.*;
+
+
+public class EntityPackets1_11 extends EntityRewriter<Protocol1_10To1_11> {
+
+    @Override
+    protected void registerPackets(Protocol1_10To1_11 protocol) {
+        // Spawn Object
+        protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.BYTE); // 2 - Type
+                map(Type.DOUBLE); // 3 - x
+                map(Type.DOUBLE); // 4 - y
+                map(Type.DOUBLE); // 5 - z
+                map(Type.BYTE); // 6 - Pitch
+                map(Type.BYTE); // 7 - Yaw
+                map(Type.INT); // 8 - data
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                getTypeFromId(wrapper.get(Type.BYTE, 0), true)
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<ObjectType> type = ObjectType.findById(wrapper.get(Type.BYTE, 0));
+
+                        if (type.isPresent()) {
+                            Optional<EntityData> optEntDat = getObjectData(type.get());
+                            if (optEntDat.isPresent()) {
+                                EntityData data = optEntDat.get();
+                                wrapper.set(Type.BYTE, 0, ((Integer) data.getReplacementId()).byteValue());
+                                if (data.getObjectData() != -1)
+                                    wrapper.set(Type.INT, 0, data.getObjectData());
+                            }
+                        } else {
+                            if (Via.getManager().isDebug()) {
+                                ViaBackwards.getPlatform().getLogger().warning("Could not find Entity Type" + wrapper.get(Type.BYTE, 0));
+                            }
+                        }
+                    }
+                });
+
+                // Handle FallingBlock blocks
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<EntityType1_12.ObjectType> type = EntityType1_12.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                        if (type.isPresent() && type.get().equals(EntityType1_12.ObjectType.FALLING_BLOCK)) {
+                            int objectData = wrapper.get(Type.INT, 0);
+                            int objType = objectData & 4095;
+                            int data = objectData >> 12 & 15;
+
+                            Block block = getProtocol().getBlockItemPackets().handleBlock(objType, data);
+                            if (block == null)
+                                return;
+
+                            wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Spawn Experience Orb
+        protocol.registerOutgoing(State.PLAY, 0x01, 0x01, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                ObjectType.THROWN_EXP_BOTTLE.getType()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Global Entity
+        protocol.registerOutgoing(State.PLAY, 0x02, 0x02, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Type
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.WEATHER // Always thunder according to wiki.vg
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Mob
+        protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.VAR_INT, Type.UNSIGNED_BYTE); // 2 - Entity Type
+                map(Type.DOUBLE); // 3 - X
+                map(Type.DOUBLE); // 4 - Y
+                map(Type.DOUBLE); // 5 - Z
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+                map(Types1_9.METADATA_LIST); // 12 - Metadata
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                getTypeFromId(wrapper.get(Type.UNSIGNED_BYTE, 0), false)
+                        );
+                    }
+                });
+
+                // Rewrite entity type / metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+                        AbstractEntityType type = getEntityType(wrapper.user(), entityId);
+
+                        MetaStorage storage = new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0));
+                        handleMeta(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                storage
+                        );
+
+                        Optional<EntityData> optEntDat = getEntityData(type);
+                        if (optEntDat.isPresent()) {
+                            EntityData data = optEntDat.get();
+                            wrapper.set(Type.UNSIGNED_BYTE, 0, ((Integer) data.getReplacementId()).shortValue());
+                            if (data.hasBaseMeta())
+                                data.getDefaultMeta().handle(storage);
+                        }
+
+                        // Rewrite Metadata
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                storage.getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Painting
+        protocol.registerOutgoing(State.PLAY, 0x04, 0x04, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PAINTING
+                        );
+                    }
+                });
+            }
+        });
+
+        // Join game
+        protocol.registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.UNSIGNED_BYTE); // 1 - Gamemode
+                map(Type.INT); // 2 - Dimension
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 1);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Respawn Packet (save dimension id)
+        protocol.registerOutgoing(State.PLAY, 0x33, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Dimension ID
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 0);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Spawn Player
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+                map(Type.DOUBLE); // 2 - X
+                map(Type.DOUBLE); // 3 - Y
+                map(Type.DOUBLE); // 4 - Z
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+                map(Types1_9.METADATA_LIST); // 7 - Metadata list
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                // Rewrite Metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Destroy entities
+        protocol.registerOutgoing(State.PLAY, 0x30, 0x30, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT_ARRAY); // 0 - Entity IDS
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0))
+                            getEntityTracker(wrapper.user()).removeEntity(entity);
+                    }
+                });
+            }
+        });
+
+        // Metadata packet
+        protocol.registerOutgoing(State.PLAY, 0x39, 0x39, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Types1_9.METADATA_LIST); // 1 - Metadata list
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Entity Status
+        protocol.registerOutgoing(State.PLAY, 0x1B, 0x1B, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Entity Status
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        byte b = wrapper.get(Type.BYTE, 0);
+
+                        if (b == 35) {
+                            wrapper.clearPacket();
+                            wrapper.setId(0x1E); // Change Game State
+                            wrapper.write(Type.UNSIGNED_BYTE, (short) 10); // Play Elder Guardian animation
+                            wrapper.write(Type.FLOAT, 0F);
+
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        // Guardian
+        regEntType(EntityType.ELDER_GUARDIAN, EntityType.GUARDIAN);
+        // Skeletons
+        regEntType(EntityType.WITHER_SKELETON, EntityType.SKELETON).spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(1)));
+        regEntType(EntityType.STRAY, EntityType.SKELETON).spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(2)));
+        // Zombies
+        regEntType(EntityType.HUSK, EntityType.ZOMBIE).spawnMetadata(storage -> handleZombieType(storage, 6));
+        regEntType(EntityType.ZOMBIE_VILLAGER, EntityType.ZOMBIE).spawnMetadata(storage -> handleZombieType(storage, 1));
+        // Horses
+        regEntType(EntityType.HORSE, EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(0))); // Nob able to ride the horse without having the MetaType sent.
+        regEntType(EntityType.DONKEY, EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
+        regEntType(EntityType.MULE, EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(2)));
+        regEntType(EntityType.SKELETON_HORSE, EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(4)));
+        regEntType(EntityType.ZOMBIE_HORSE, EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(3)));
+        // New mobs
+        regEntType(EntityType.EVOCATION_FANGS, EntityType.SHULKER);
+        regEntType(EntityType.EVOCATION_ILLAGER, EntityType.VILLAGER).mobName("Evoker");
+        regEntType(EntityType.VEX, EntityType.BAT).mobName("Vex");
+        regEntType(EntityType.VINDICATION_ILLAGER, EntityType.VILLAGER).mobName("Vindicator").spawnMetadata(storage -> storage.add(new Metadata(13, MetaType1_9.VarInt, 4))); // Base Profession
+        regEntType(EntityType.LIAMA, EntityType.HORSE).mobName("Llama").spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
+        regEntType(EntityType.LIAMA_SPIT, EntityType.SNOWBALL);
+
+        regObjType(ObjectType.LIAMA_SPIT, ObjectType.SNOWBALL, -1);
+        // Replace with endertorchthingies
+        regObjType(ObjectType.EVOCATION_FANGS, ObjectType.FALLING_BLOCK, 198 | 1 << 12);
+
+        // Handle ElderGuardian & target metadata
+        registerMetaHandler().filter(EntityType.GUARDIAN, true, 12).handle(e -> {
+            Metadata data = e.getData();
+
+            boolean b = (boolean) data.getValue();
+            int bitmask = b ? 0x02 : 0;
+
+            if (e.getEntity().getType().is(EntityType.ELDER_GUARDIAN))
+                bitmask |= 0x04;
+
+            data.setMetaType(MetaType1_9.Byte);
+            data.setValue((byte) bitmask);
+
+            return data;
+        });
+
+        // Handle skeleton swing
+        registerMetaHandler().filter(EntityType.ABSTRACT_SKELETON, true, 12).handleIndexChange(13);
+
+        /*
+            ZOMBIE CHANGES
+         */
+        registerMetaHandler().filter(EntityType.ZOMBIE, true).handle(e -> {
+            Metadata data = e.getData();
+
+            switch (data.getId()) {
+                case 13:
+                    throw new RemovedValueException();
+                case 14:
+                    data.setId(15);
+                    break;
+                case 15:
+                    data.setId(14);
+                    break;
+                // Profession
+                case 16:
+                    data.setId(13);
+                    data.setValue(1 + (int) data.getValue());
+                    break;
+            }
+
+            return data;
+        });
+
+        // Handle Evocation Illager
+        registerMetaHandler().filter(EntityType.EVOCATION_ILLAGER, 12).handle(e -> {
+            Metadata data = e.getData();
+            data.setId(13);
+            data.setMetaType(MetaType1_9.VarInt);
+            data.setValue(((Byte) data.getValue()).intValue()); // Change the profession for the states
+
+            return data;
+        });
+
+        // Handle Vex (Remove this field completely since the position is not updated correctly when idling for bats. Sad ):
+        registerMetaHandler().filter(EntityType.VEX, 12).handle(e -> {
+            Metadata data = e.getData();
+            data.setValue((byte) 0x00);
+            return data;
+        });
+
+        // Handle VindicationIllager
+        registerMetaHandler().filter(EntityType.VINDICATION_ILLAGER, 12).handle(e -> {
+            Metadata data = e.getData();
+            data.setId(13);
+            data.setMetaType(MetaType1_9.VarInt);
+
+            data.setValue((int) data.getValue() == 1 ? 2 : 4);
+
+            return data;
+        });
+
+        /*
+            HORSES
+         */
+
+        // Handle horse flags
+        registerMetaHandler().filter(EntityType.ABSTRACT_HORSE, true, 13).handle(e -> {
+            Metadata data = e.getData();
+            byte b = (byte) data.getValue();
+            if (e.getEntity().has(ChestedHorseStorage.class) &&
+                    e.getEntity().get(ChestedHorseStorage.class).isChested()) {
+                b |= 0x08; // Chested
+                data.setValue(b);
+            }
+            return data;
+        });
+
+        // Create chested horse storage TODO create on mob spawn?
+        registerMetaHandler().filter(EntityType.CHESTED_HORSE, true).handle(e -> {
+            if (!e.getEntity().has(ChestedHorseStorage.class))
+                e.getEntity().put(new ChestedHorseStorage());
+            return e.getData();
+        });
+
+        // Handle Horse (Correct owner)
+        registerMetaHandler().filter(EntityType.ABSTRACT_HORSE, true, 14).handleIndexChange(16);
+
+        // Handle horse armor
+        registerMetaHandler().filter(EntityType.HORSE, 16).handleIndexChange(17);
+
+        // Handle chested horse
+        registerMetaHandler().filter(EntityType.CHESTED_HORSE, true, 15).handle(e -> {
+            ChestedHorseStorage storage = e.getEntity().get(ChestedHorseStorage.class);
+            boolean b = (boolean) e.getData().getValue();
+            storage.setChested(b);
+
+            throw new RemovedValueException();
+        });
+
+        // Get rid of Liama metadata
+        registerMetaHandler().filter(EntityType.LIAMA).handle(e -> {
+            Metadata data = e.getData();
+            ChestedHorseStorage storage = e.getEntity().get(ChestedHorseStorage.class);
+
+            int index = e.getIndex();
+            // Store them for later (:
+            switch (index) {
+                case 16:
+                    storage.setLiamaStrength((int) data.getValue());
+                    throw new RemovedValueException();
+                case 17:
+                    storage.setLiamaCarpetColor((int) data.getValue());
+                    throw new RemovedValueException();
+                case 18:
+                    storage.setLiamaVariant((int) data.getValue());
+                    throw new RemovedValueException();
+            }
+            return e.getData();
+        });
+
+        // Handle villager - Change non-existing profession
+        registerMetaHandler().filter(EntityType.VILLAGER, 13).handle(e -> {
+            Metadata data = e.getData();
+            if ((int) data.getValue() == 5)
+                data.setValue(0);
+
+            return data;
+        });
+
+        // handle new Shulker color meta
+        registerMetaHandler().filter(EntityType.SHULKER, 15).removed();
+
+    }
+
+    /*
+        0 - Skeleton
+        1 - Wither Skeleton
+        2 - Stray
+     */
+
+    private Metadata getSkeletonTypeMeta(int type) {
+        return new Metadata(12, MetaType1_9.VarInt, type);
+    }
+
+    /*
+        0 - Zombie
+        1-5 - Villager with profession
+        6 - Husk
+     */
+    private Metadata getZombieTypeMeta(int type) {
+        return new Metadata(13, MetaType1_9.VarInt, type);
+    }
+
+    private void handleZombieType(MetaStorage storage, int type) {
+        Optional<Metadata> meta = storage.get(13);
+
+        if (!meta.isPresent())
+            storage.add(getZombieTypeMeta(type));
+    }
+
+    /*
+        Horse 0
+        Donkey 1
+        Mule 2
+        Zombie horse 3
+        Skeleton horse 4
+    */
+    private Metadata getHorseMetaType(int type) {
+        return new Metadata(14, MetaType1_9.VarInt, type);
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
+
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.remapper.ValueTransformer;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
+
+public class PlayerPackets1_11 {
+    private static final ValueTransformer<Short, Float> toNewFloat = new ValueTransformer<Short, Float>(Type.FLOAT) {
+        @Override
+        public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
+            return (float) (inputValue / 16);
+        }
+    };
+
+    public void register(Protocol1_10To1_11 protocol) {
+        /* Outgoing packets */
+
+        // Title packet
+        protocol.registerOutgoing(State.PLAY, 0x45, 0x45, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Action
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.VAR_INT, 0);
+
+                        // Handle the new ActionBar
+                        if (action == 2) {
+                            // Convert to the old actionbar way
+                            PacketWrapper actionbar = new PacketWrapper(0x0F, null, wrapper.user()); // Chat Message packet
+                            actionbar.write(Type.STRING, wrapper.read(Type.STRING));
+                            actionbar.write(Type.BYTE, (byte) 2); // Above hotbar
+
+                            actionbar.send(Protocol1_11To1_10.class);
+
+                            wrapper.cancel(); // Cancel the title packet
+                            return;
+                        }
+
+                        if (action > 2)
+                            wrapper.set(Type.VAR_INT, 0, action - 1); // Move everything one position down
+                    }
+                });
+
+
+            }
+        });
+
+        // Collect item packet
+        protocol.registerOutgoing(State.PLAY, 0x48, 0x48, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Collected entity id
+                map(Type.VAR_INT); // 1 - Collector entity id
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper packetWrapper) throws Exception {
+                        packetWrapper.read(Type.VAR_INT); // Ignore pickup item count
+                    }
+                });
+            }
+        });
+
+        /* Incoming packets */
+
+        // Block placement packet
+        protocol.registerIncoming(State.PLAY, 0x1C, 0x1C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Location
+                map(Type.VAR_INT); // 1 - Face
+                map(Type.VAR_INT); // 2 - Hand
+
+                map(Type.UNSIGNED_BYTE, toNewFloat);
+                map(Type.UNSIGNED_BYTE, toNewFloat);
+                map(Type.UNSIGNED_BYTE, toNewFloat);
+            }
+        });
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
+
+import nl.matsv.viabackwards.api.rewriters.SoundRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class SoundPackets1_11 extends SoundRewriter<Protocol1_10To1_11> {
+    @Override
+    protected void registerPackets(Protocol1_10To1_11 protocol) {
+        // Named sound effect
+        protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Sound name
+                map(Type.VAR_INT); // 1 - Sound Category
+                map(Type.INT); // 2 - x
+                map(Type.INT); // 3 - y
+                map(Type.INT); // 4 - z
+                map(Type.FLOAT); // 5 - Volume
+                map(Type.FLOAT); // 6 - Pitch
+            }
+        });
+
+        // Sound effect
+        protocol.registerOutgoing(State.PLAY, 0x46, 0x46, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Sound name
+                map(Type.VAR_INT); // 1 - Sound Category
+                map(Type.INT); // 2 - x
+                map(Type.INT); // 3 - y
+                map(Type.INT); // 4 - z
+                map(Type.FLOAT); // 5 - Volume
+                map(Type.FLOAT); // 6 - Pitch
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int oldId = wrapper.get(Type.VAR_INT, 0);
+                        int newId = handleSounds(oldId);
+                        if (newId == -1)
+                            wrapper.cancel();
+                        else {
+                            if (hasPitch(oldId))
+                                wrapper.set(Type.FLOAT, 1, handlePitch(oldId));
+                            wrapper.set(Type.VAR_INT, 0, newId);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        // Sound replacements, suggestions are always welcome
+        // Automatically generated from PAaaS
+        added(85, 121, 0.5f); // block.shulker_box.close -> block.wooden_trapdoor.close
+        added(86, 122, 0.5f); // block.shulker_box.open -> block.wooden_trapdoor.open
+
+        added(176, 227); // entity.elder_guardian.flop -> entity.guardian.flop
+
+        removed(196); // entity.experience_orb.touch
+
+        added(197, 402, 1.8f); // entity.evocation_fangs.attack -> entity.zombie.attack_iron_door
+        added(198, 370, 0.4f); // entity.evocation_illager.ambient -> entity.villager.ambient
+        added(199, 255, 1.3f); // entity.evocation_illager.cast_spell -> entity.irongolem.hurt
+        added(200, 418, 1.3f); // entity.evocation_illager.death -> entity.zombie_villager.death
+        added(201, 372, 1.3f); // entity.evocation_illager.hurt -> entity.villager.hurt
+        added(202, 137, 0.8f); // entity.evocation_illager.prepare_attack -> entity.elder_guardian.curse
+        added(203, 78, 2f); // entity.evocation_illager.prepare_summon -> block.portal.trigger
+        added(204, 376, 0.6f); // entity.evocation_illager.prepare_wololo -> entity.witch.ambient
+
+        added(279, 230, 1.5f); // entity.llama.ambient -> entity.horse.ambient
+        added(280, 231, 1.6f); // entity.llama.angry -> entity.horse.angry
+        added(281, 164); // entity.llama.chest -> entity.donkey.chest
+        added(282, 165, 1.2f); // entity.llama.death -> entity.donkey.death
+        added(283, 235, 1.1f); // entity.llama.eat -> entity.horse.eat
+        added(284, 166); // entity.llama.hurt -> entity.donkey.hurt
+        added(285, 323, 1.7f); // entity.llama.spit -> entity.shulker.shoot
+        added(286, 241, 0.8f); // entity.llama.step -> entity.horse.step
+        added(287, 423, 0.5f); // entity.llama.swag -> item.armor.equip_generic
+        added(296, 164); // entity.mule.chest -> entity.donkey.chest
+
+        added(390, 233, 0.1f); // entity.vex.ambient -> entity.horse.breathe
+        added(391, 168, 2f); // entity.vex.charge -> entity.elder_guardian.ambient
+        added(392, 144, 0.5f); // entity.vex.death -> entity.cat.death
+        added(393, 146, 2f); // entity.vex.hurt -> entity.cat.hurt
+
+        added(400, 370, 0.7f); // entity.vindication_illager.ambient -> entity.villager.ambient
+        added(401, 371, 0.8f); // entity.vindication_illager.death -> entity.villager.death
+        added(402, 372, 0.7f); // entity.vindication_illager.hurt -> entity.villager.hurt
+
+        added(450, 423, 1.1f); // item.armor.equip_elytra -> item.armor.equip_generic
+        added(455, 427, 1.1f); // item.bottle.empty -> item.bottle.fill
+        added(470, 2, 0.5f); // item.totem.use -> block.anvil.destroy
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/ChestedHorseStorage.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import nl.matsv.viabackwards.api.entities.storage.EntityStorage;
+
+@Getter
+@Setter
+@ToString
+public class ChestedHorseStorage extends EntityStorage {
+    private boolean chested = false;
+
+    private int liamaStrength = 0;
+    private int liamaCarpetColor = -1;
+    private int liamaVariant = 0;
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+
+@Getter
+@ToString
+@Setter
+public class WindowTracker extends StoredObject {
+    private String inventory;
+    private int entityId = -1;
+
+    public WindowTracker(UserConnection user) {
+        super(user);
+    }
+}
+

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1;
+
+import lombok.Getter;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityPackets1_11_1;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets1_11_1;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+@Getter
+public class Protocol1_11To1_11_1 extends BackwardsProtocol {
+    private EntityPackets1_11_1 entityPackets;
+
+    @Override
+    protected void registerPackets() {
+        (entityPackets = new EntityPackets1_11_1()).register(this);
+        new ItemPackets1_11_1().register(this);
+    }
+
+    @Override
+    public void init(UserConnection user) {
+        // Register ClientWorld
+        if (!user.has(ClientWorld.class))
+            user.put(new ClientWorld(user));
+
+        // Register EntityTracker if it doesn't exist yet.
+        if (!user.has(EntityTracker.class))
+            user.put(new EntityTracker(user));
+
+        // Init protocol in EntityTracker
+        user.get(EntityTracker.class).initProtocol(this);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java

@@ -1,41 +1,38 @@
 /*
+ * Copyright (c) 2016 Matsv
  *
- *     Copyright (C) 2016 Matsv
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets;
 
-import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9To1_10;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
 
-public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
+import java.util.Optional;
+
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.*;
+
+public class EntityPackets1_11_1 extends EntityRewriter<Protocol1_11To1_11_1> {
 
     @Override
-    protected void registerPackets(Protocol1_9To1_10 protocol) {
-
+    protected void registerPackets(Protocol1_11To1_11_1 protocol) {
         // Spawn Object
         protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() {
             @Override
@@ -43,6 +40,12 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.BYTE); // 2 - Type
+                map(Type.DOUBLE); // 3 - x
+                map(Type.DOUBLE); // 4 - y
+                map(Type.DOUBLE); // 5 - z
+                map(Type.BYTE); // 6 - Pitch
+                map(Type.BYTE); // 7 - Yaw
+                map(Type.INT); // 8 - data
 
                 // Track Entity
                 handler(new PacketHandler() {
@@ -51,11 +54,31 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                true,
-                                wrapper.get(Type.BYTE, 0)
+                                getTypeFromId(wrapper.get(Type.BYTE, 0), true)
                         );
                     }
                 });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<ObjectType> type = ObjectType.findById(wrapper.get(Type.BYTE, 0));
+
+                        if (type.isPresent()) {
+                            Optional<EntityData> optEntDat = getObjectData(type.get());
+                            if (optEntDat.isPresent()) {
+                                EntityData data = optEntDat.get();
+                                wrapper.set(Type.BYTE, 0, ((Integer) data.getReplacementId()).byteValue());
+                                if (data.getObjectData() != -1)
+                                    wrapper.set(Type.INT, 0, data.getObjectData());
+                            }
+                        } else {
+                            if (Via.getManager().isDebug()) {
+                                ViaBackwards.getPlatform().getLogger().warning("Could not find Entity Type" + wrapper.get(Type.BYTE, 0));
+                            }
+                        }
+                    }
+                });
             }
         });
 
@@ -72,8 +95,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                true,
-                                (short) 2
+                                ObjectType.THROWN_EXP_BOTTLE.getType()
                         );
                     }
                 });
@@ -94,8 +116,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                true,
-                                wrapper.get(Type.BYTE, 0)
+                                EntityType.WEATHER // Always thunder according to wiki.vg
                         );
                     }
                 });
@@ -108,7 +129,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
-                map(Type.UNSIGNED_BYTE); // 2 - Entity Type
+                map(Type.VAR_INT); // 2 - Entity Type
                 map(Type.DOUBLE); // 3 - X
                 map(Type.DOUBLE); // 4 - Y
                 map(Type.DOUBLE); // 5 - Z
@@ -127,38 +148,39 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                false,
-                                wrapper.get(Type.UNSIGNED_BYTE, 0)
+                                getTypeFromId(wrapper.get(Type.VAR_INT, 1), false)
                         );
                     }
                 });
 
-                // Rewrite entity ids
+
+                // Rewrite entity type / metadata
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.set(Type.UNSIGNED_BYTE, 0,
-                                getNewEntityType(
-                                        wrapper.user(),
-                                        wrapper.get(Type.VAR_INT, 0)
-                                ));
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+                        AbstractEntityType type = getEntityType(wrapper.user(), entityId);
 
+                        MetaStorage storage = new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0));
+                        handleMeta(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                storage
+                        );
 
-                    }
-                });
+                        Optional<EntityData> optEntDat = getEntityData(type);
+                        if (optEntDat.isPresent()) {
+                            EntityData data = optEntDat.get();
+                            wrapper.set(Type.VAR_INT, 1, data.getReplacementId());
+                            if (data.hasBaseMeta())
+                                data.getDefaultMeta().handle(storage);
+                        }
 
-                // Rewrite metadata
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Rewrite Metadata
                         wrapper.set(
                                 Types1_9.METADATA_LIST,
                                 0,
-                                handleMeta(
-                                        wrapper.user(),
-                                        wrapper.get(Type.VAR_INT, 0),
-                                        wrapper.get(Types1_9.METADATA_LIST, 0)
-                                )
+                                storage.getMetaDataList()
                         );
                     }
                 });
@@ -178,8 +200,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                true,
-                                (short) 9
+                                EntityType.PAINTING
                         );
                     }
                 });
@@ -200,8 +221,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.INT, 0),
-                                false,
-                                (short) -12
+                                EntityType.PLAYER
                         );
                     }
                 });
@@ -253,8 +273,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                         addTrackedEntity(
                                 wrapper.user(),
                                 wrapper.get(Type.VAR_INT, 0),
-                                false,
-                                (short) -12
+                                EntityType.PLAYER
                         );
                     }
                 });
@@ -269,8 +288,8 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                                 handleMeta(
                                         wrapper.user(),
                                         wrapper.get(Type.VAR_INT, 0),
-                                        wrapper.get(Types1_9.METADATA_LIST, 0)
-                                )
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
                         );
                     }
                 });
@@ -287,7 +306,7 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0))
-                            wrapper.user().get(EntityTracker.class).removeEntity(entity);
+                            getEntityTracker(wrapper.user()).removeEntity(entity);
                     }
                 });
             }
@@ -309,8 +328,8 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
                                 handleMeta(
                                         wrapper.user(),
                                         wrapper.get(Type.VAR_INT, 0),
-                                        wrapper.get(Types1_9.METADATA_LIST, 0)
-                                )
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
                         );
                     }
                 });
@@ -320,47 +339,10 @@ public class EntityPackets extends EntityRewriter<Protocol1_9To1_10> {
 
     @Override
     protected void registerRewrites() {
-        rewriteEntityId(102, 91); // Replace polar bear with sheep
+        // Handle non-existing firework metadata (index 7 entity id for boosting)
+        registerMetaHandler().filter(EntityType.FIREWORK, 7).removed();
 
-        registerMetaRewriter((isObject, entityType, data) -> { // Change the sheep color when the polar bear is stending up
-            if (!isObject && entityType != 102)
-                return data;
-
-            if (data.getId() == 13) { // is boolean
-                boolean b = (boolean) data.getValue();
-
-                data.setId(13);
-                data.setType(Type.BYTE);
-                data.setTypeID(NewType.Byte.getTypeID());
-                data.setValue(b ? (byte) (14 & 0x0F) : 0);
-            }
-            return data;
-        });
-
-        registerMetaRewriter((isObject, entityType, data) -> { // Change husk to normal zombie
-            if (isObject || entityType != 54)
-                return data;
-
-            if (data.getId() == 13 && data.getTypeID() == 1 && (int) data.getValue() == 6)
-                data.setValue(0);
-            return data;
-        });
-
-        registerMetaRewriter((isObject, entityType, data) -> { // Change stray- to normal skeleton
-            if (isObject || entityType != 51)
-                return data;
-
-            if (data.getId() == 12 && data.getTypeID() == 1 && (int) data.getValue() == 2)
-                data.setValue(0);
-            return data;
-        });
-
-        registerMetaRewriter((isObject, entityType, m) -> {
-            if (m.getId() == 5)
-                throw new RemovedValueException();
-            else if (m.getId() >= 5)
-                m.setId(m.getId() - 1);
-            return m;
-        });
+        // Handle non-existing pig metadata (index 14 - boost time)
+        registerMetaHandler().filter(EntityType.PIG, 14).removed();
     }
 }

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java

@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets;
+
+import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class ItemPackets1_11_1 extends BlockItemRewriter<Protocol1_11To1_11_1> {
+
+    @Override
+    protected void registerPackets(Protocol1_11To1_11_1 protocol) {
+        // Set slot packet
+        protocol.registerOutgoing(State.PLAY, 0x16, 0x16, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Slot Value
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+            }
+        });
+
+        // Window items packet
+        protocol.registerOutgoing(State.PLAY, 0x14, 0x14, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.ITEM_ARRAY); // 1 - Window Values
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
+                        for (int i = 0; i < stacks.length; i++)
+                            stacks[i] = handleItemToClient(stacks[i]);
+                    }
+                });
+            }
+        });
+
+        // Entity Equipment Packet
+        protocol.registerOutgoing(State.PLAY, 0x3C, 0x3C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.VAR_INT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Item
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+            }
+        });
+
+        // Plugin message Packet -> Trading
+        protocol.registerOutgoing(State.PLAY, 0x18, 0x18, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Channel
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
+                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+
+                            int size = wrapper.passthrough(Type.BYTE);
+                            for (int i = 0; i < size; i++) {
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+
+                                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                                if (secondItem)
+                                    wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+
+                                wrapper.passthrough(Type.BOOLEAN); // Trade disabled
+                                wrapper.passthrough(Type.INT); // Number of tools uses
+                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Click window packet
+        protocol.registerIncoming(State.PLAY, 0x07, 0x07, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                        map(Type.SHORT); // 1 - Slot
+                        map(Type.BYTE); // 2 - Button
+                        map(Type.SHORT); // 3 - Action number
+                        map(Type.VAR_INT); // 4 - Mode
+                        map(Type.ITEM); // 5 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Creative Inventory Action
+        protocol.registerIncoming(State.PLAY, 0x18, 0x18, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.SHORT); // 0 - Slot
+                        map(Type.ITEM); // 1 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Handle item metadata
+        protocol.getEntityPackets().registerMetaHandler().handle(e -> {
+            Metadata data = e.getData();
+
+            if (data.getMetaType().equals(MetaType1_9.Slot)) // Is Item
+                data.setValue(handleItemToClient((Item) data.getValue()));
+
+            return data;
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        rewrite(452).repItem(new Item((short) 265, (byte) 1, (short) 0, getNamedTag("1.11.2 Iron Nugget")));
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/Protocol1_11_1To1_12.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1;
+
+import lombok.Getter;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ShoulderTracker;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets.*;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+@Getter
+public class Protocol1_11_1To1_12 extends BackwardsProtocol {
+    // TODO store all rewriters and make them easy accessible?
+    private EntityPackets1_12 entityPackets;
+    private BlockItemPackets1_12 blockItemPackets;
+
+    @Override
+    protected void registerPackets() {
+        new ChangedPacketIds1_12().register(this);
+        (entityPackets = new EntityPackets1_12()).register(this);
+        (blockItemPackets = new BlockItemPackets1_12()).register(this);
+        new SoundPackets1_12().register(this);
+        new ChatPackets1_12().register(this);
+    }
+
+    @Override
+    public void init(UserConnection user) {
+        // Register ClientWorld
+        if (!user.has(ClientWorld.class))
+            user.put(new ClientWorld(user));
+
+        // Register EntityTracker if it doesn't exist yet.
+        if (!user.has(EntityTracker.class))
+            user.put(new EntityTracker(user));
+
+        user.put(new ShoulderTracker(user));
+
+        // Init protocol in EntityTracker
+        user.get(EntityTracker.class).initProtocol(this);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/data/AdvancementTranslations.java

@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class AdvancementTranslations {
+    private static final Map<String, String> advancements = new ConcurrentHashMap<>();
+
+    static {
+        add("advancements.nether.get_wither_skull.title", "Spooky Scary Skeleton");
+        add("advancements.husbandry.break_diamond_hoe.description", "Completely use up a diamond hoe, and then reevaluate your life choices");
+        add("advancements.nether.fast_travel.description", "Use the Nether to travel 7km in the Overworld");
+        add("advancements.story.enter_the_end.description", "Enter the End Portal");
+        add("advancements.story.follow_ender_eye.title", "Eye Spy");
+        add("advancements.toast.task", "Advancement Made!");
+        add("advancements.nether.find_fortress.description", "Break your way into a Nether Fortress");
+        add("advancements.story.form_obsidian.description", "Form and mine a block of Obsidian");
+        add("advancements.adventure.sniper_duel.description", "Kill a skeleton with an arrow from more than 50 meters");
+        add("advancements.end.root.description", "Or the beginning?");
+        add("advancements.adventure.kill_a_mob.title", "Monster Hunter");
+        add("advancements.end.elytra.description", "Find an Elytra");
+        add("advancements.end.dragon_breath.description", "Collect dragon's breath in a glass bottle");
+        add("advancements.story.enter_the_nether.title", "We Need to Go Deeper");
+        add("advancements.story.upgrade_tools.title", "Getting an Upgrade");
+        add("advancements.story.lava_bucket.title", "Hot Stuff");
+        add("advancements.story.shiny_gear.title", "Cover Me With Diamonds");
+        add("advancements.story.smelt_iron.description", "Smelt an iron ingot");
+        add("chat.type.advancement.goal", "%s has reached the goal %s");
+        add("advancements.husbandry.break_diamond_hoe.title", "Serious Dedication");
+        add("advancements.story.iron_tools.description", "Upgrade your pickaxe");
+        add("advancements.end.respawn_dragon.title", "The End... Again...");
+        add("advancements.husbandry.tame_an_animal.description", "Tame an animal");
+        add("advancements.end.levitate.description", "Levitate up 50 blocks from the attacks of a Shulker");
+        add("advancements.adventure.shoot_arrow.description", "Shoot something with a bow and arrow");
+        add("advancements.nether.root.description", "Bring summer clothes");
+        add("advancements.story.enchant_item.description", "Enchant an item at an Enchanting Table");
+        add("advancements.adventure.root.title", "Adventure");
+        add("advancements.adventure.trade.title", "What a Deal!");
+        add("advancements.husbandry.breed_all_animals.title", "Two by Two");
+        add("advancements.nether.find_fortress.title", "A Terrible Fortress");
+        add("advancements.nether.create_full_beacon.title", "Beaconator");
+        add("advancements.story.cure_zombie_villager.description", "Weaken and then cure a zombie villager");
+        add("advancements.toast.challenge", "Challenge Complete!");
+        add("advancements.nether.create_full_beacon.description", "Bring a beacon to full power");
+        add("advancements.story.follow_ender_eye.description", "Follow an Ender Eye");
+        add("advancements.end.find_end_city.title", "The City at the End of the Game");
+        add("chat.type.advancement.challenge", "%s has completed the challenge %s");
+        add("advancements.story.deflect_arrow.title", "Not Today, Thank You");
+        add("advancements.adventure.kill_all_mobs.description", "Kill one of every hostile monster");
+        add("advancements.story.smelt_iron.title", "Acquire Hardware");
+        add("advancements.end.levitate.title", "Great View From Up Here");
+        add("advancements.end.kill_dragon.title", "Free the End");
+        add("advancements.end.kill_dragon.description", "Good luck");
+        add("advancements.nether.brew_potion.title", "Local Brewery");
+        add("advancements.story.enchant_item.title", "Enchanter");
+        add("advancements.end.respawn_dragon.description", "Respawn the ender dragon");
+        add("advancements.nether.uneasy_alliance.title", "Uneasy Alliance");
+        add("advancements.nether.root.title", "Nether");
+        add("advancements.nether.brew_potion.description", "Brew a potion");
+        add("advancements.nether.obtain_blaze_rod.title", "Into Fire");
+        add("advancements.nether.summon_wither.title", "Withering Heights");
+        add("advancements.story.root.title", "Minecraft");
+        add("advancements.husbandry.balanced_diet.description", "Eat everything that is edible, even if it's not good for you");
+        add("advancements.nether.uneasy_alliance.description", "Rescue a Ghast from the Nether, bring it safely home to the Overworld... and then kill it.");
+        add("advancements.husbandry.breed_all_animals.description", "Breed all the animals!");
+        add("advancements.adventure.kill_all_mobs.title", "Monsters Hunted");
+        add("advancements.story.cure_zombie_villager.title", "Zombie Doctor");
+        add("advancements.husbandry.plant_seed.title", "A Seedy Place");
+        add("advancements.end.dragon_breath.title", "You Need a Mint");
+        add("advancements.story.mine_stone.title", "Stone Age");
+        add("advancements.end.find_end_city.description", "Go on in, what could happen?");
+        add("advancements.nether.create_beacon.description", "Construct and place a Beacon");
+        add("advancements.adventure.summon_iron_golem.title", "Hired Help");
+        add("advancements.end.elytra.title", "Sky's the Limit");
+        add("chat.type.advancement.task", "%s has made the advancement %s");
+        add("advancements.story.deflect_arrow.description", "Deflect an arrow with a shield");
+        add("advancements.nether.all_effects.description", "Have every effect applied at the same time");
+        add("advancements.story.enter_the_nether.description", "Build, light and enter a Nether Portal");
+        add("advancements.story.mine_diamond.title", "Diamonds!");
+        add("advancements.husbandry.balanced_diet.title", "A Balanced Diet");
+        add("advancements.husbandry.root.title", "Husbandry");
+        add("advancements.story.root.description", "The heart and story of the game");
+        add("advancements.story.upgrade_tools.description", "Construct a better pickaxe");
+        add("advancements.nether.all_effects.title", "How Did We Get Here?");
+        add("advancements.end.enter_end_gateway.title", "Remote Getaway");
+        add("advancements.story.mine_stone.description", "Mine stone with your new pickaxe");
+        add("advancements.husbandry.root.description", "The world is full of friends and food");
+        add("advancements.end.dragon_egg.title", "The Next Generation");
+        add("advancements.toast.goal", "Goal Reached!");
+        add("advancements.empty", "There doesn't seem to be anything here...");
+        add("advancements.husbandry.tame_an_animal.title", "Best Friends Forever");
+        add("advancements.end.root.title", "The End");
+        add("advancements.husbandry.breed_an_animal.title", "The Parrots and the Bats");
+        add("advancements.story.mine_diamond.description", "Acquire diamonds");
+        add("advancements.adventure.sleep_in_bed.title", "Sweet dreams");
+        add("advancements.nether.return_to_sender.title", "Return to Sender");
+        add("advancements.story.obtain_armor.title", "Suit Up");
+        add("advancements.adventure.kill_a_mob.description", "Kill any hostile monster");
+        add("advancements.nether.all_potions.description", "Have every potion effect applied at the same time");
+        add("advancements.story.iron_tools.title", "Isn't It Iron Pick");
+        add("advancements.adventure.sleep_in_bed.description", "Change your respawn point");
+        add("advancements.husbandry.plant_seed.description", "Plant a seed and watch it grow");
+        add("advancements.husbandry.breed_an_animal.description", "Breed two animals together");
+        add("advancements.adventure.shoot_arrow.title", "Take Aim");
+        add("advancements.adventure.adventuring_time.description", "Discover every biome");
+        add("advancements.adventure.adventuring_time.title", "Adventuring Time");
+        add("advancements.nether.get_wither_skull.description", "Obtain a wither skeleton's skull");
+        add("advancements.adventure.summon_iron_golem.description", "Summon an Iron Golem to help defend a village");
+        add("advancements.nether.return_to_sender.description", "Destroy a Ghast with a fireball");
+        add("advancements.adventure.trade.description", "Successfully trade with a Villager");
+        add("advancements.story.obtain_armor.description", "Protect yourself with a piece of iron armor");
+        add("advancements.adventure.root.description", "Adventure, exploration and combat");
+        add("advancements.nether.create_beacon.title", "Bring Home the Beacon");
+        add("advancements.end.dragon_egg.description", "Hold the Dragon Egg");
+        add("advancements.nether.obtain_blaze_rod.description", "Relieve a Blaze of its rod");
+        add("advancements.story.lava_bucket.description", "Fill a bucket with lava");
+        add("advancements.story.form_obsidian.title", "Ice Bucket Challenge");
+        add("advancements.story.enter_the_end.title", "The End?");
+        add("advancements.nether.fast_travel.title", "Subspace Bubble");
+        add("advancements.end.enter_end_gateway.description", "Escape the island");
+        add("advancements.adventure.totem_of_undying.title", "Postmortal");
+        add("advancements.nether.all_potions.title", "A Furious Cocktail");
+        add("advancements.adventure.sniper_duel.title", "Sniper duel");
+        add("advancements.nether.summon_wither.description", "Summon the Wither");
+        add("advancements.adventure.totem_of_undying.description", "Use a Totem of Undying to cheat death");
+        add("advancements.story.shiny_gear.description", "Diamond armor saves lives");
+    }
+
+    private static void add(String key, String value) {
+        advancements.put(key, value);
+    }
+
+    public static boolean has(String key) {
+        return advancements.containsKey(key);
+    }
+
+    public static String get(String key) {
+        return advancements.get(key);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/data/BlockColors.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class BlockColors {
+    private static Map<Integer, String> colors = new ConcurrentHashMap<>();
+    private static int count = 0;
+
+    static {
+        add("White");
+        add("Orange");
+        add("Magenta");
+        add("Light Blue");
+        add("Yellow");
+        add("Lime");
+        add("Pink");
+        add("Gray");
+        add("Light Gray");
+        add("Cyan");
+        add("Purple");
+        add("Blue");
+        add("Brown");
+        add("Green");
+        add("Red");
+        add("Black");
+    }
+
+    private static void add(String value) {
+        colors.put(count++, value);
+    }
+
+    public static boolean has(Integer key) {
+        return colors.containsKey(key);
+    }
+
+    public static String get(Integer key) {
+        return colors.get(key);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/data/ParrotStorage.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+
+import lombok.Data;
+import nl.matsv.viabackwards.api.entities.storage.EntityStorage;
+
+@Data
+public class ParrotStorage extends EntityStorage {
+    private boolean tamed = true;
+    private boolean sitting = true;
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/data/ShoulderTracker.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import net.md_5.bungee.api.ChatColor;
+import nl.matsv.viabackwards.ViaBackwards;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+
+@Getter
+@Setter
+@ToString
+public class ShoulderTracker extends StoredObject {
+    private int entityId;
+    private String leftShoulder;
+    private String rightShoulder;
+
+    public ShoulderTracker(UserConnection user) {
+        super(user);
+    }
+
+    public void update() {
+        PacketWrapper wrapper = new PacketWrapper(0x0F, null, getUser());
+
+        wrapper.write(Type.STRING, Protocol1_9TO1_8.fixJson(generateString()));
+        wrapper.write(Type.BYTE, (byte) 2);
+
+        try {
+            wrapper.send(Protocol1_12To1_11_1.class);
+        } catch (Exception e) {
+            ViaBackwards.getPlatform().getLogger().severe("Failed to send the shoulder indication");
+            e.printStackTrace();
+        }
+    }
+
+    // Does actionbar not support json colors? :(
+    private String generateString() {
+        StringBuilder builder = new StringBuilder();
+
+        // Empty spaces because the non-json formatting is weird
+        builder.append("  ");
+        if (leftShoulder == null)
+            builder.append(ChatColor.RED).append(ChatColor.BOLD).append("Nothing");
+        else
+            builder.append(ChatColor.DARK_GREEN).append(ChatColor.BOLD).append(getName(leftShoulder));
+
+        builder.append(ChatColor.DARK_GRAY).append(ChatColor.BOLD).append(" <- ")
+                .append(ChatColor.GRAY).append(ChatColor.BOLD).append("Shoulders")
+                .append(ChatColor.DARK_GRAY).append(ChatColor.BOLD).append(" -> ");
+
+        if (rightShoulder == null)
+            builder.append(ChatColor.RED).append(ChatColor.BOLD).append("Nothing");
+        else
+            builder.append(ChatColor.DARK_GREEN).append(ChatColor.BOLD).append(getName(rightShoulder));
+
+        return builder.toString();
+    }
+
+    private String getName(String current) {
+        if (current.startsWith("minecraft:"))
+            current = current.substring(10);
+        String[] array = current.split("_");
+        StringBuilder builder = new StringBuilder();
+
+        for (String s : array) {
+            builder.append(s.substring(0, 1).toUpperCase())
+                    .append(s.substring(1))
+                    .append(" ");
+        }
+
+        return builder.toString();
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/BlockItemPackets1_12.java

@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+
+import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_12;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag;
+
+import java.util.Collections;
+
+public class BlockItemPackets1_12 extends BlockItemRewriter<Protocol1_11_1To1_12> {
+    @Override
+    protected void registerPackets(Protocol1_11_1To1_12 protocol) {
+          /* Item packets */
+
+        // Set slot packet
+        protocol.registerOutgoing(State.PLAY, 0x16, 0x16, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Slot Value
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+            }
+        });
+
+        // Window items packet
+        protocol.registerOutgoing(State.PLAY, 0x14, 0x14, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.ITEM_ARRAY); // 1 - Window Values
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
+                        for (int i = 0; i < stacks.length; i++)
+                            stacks[i] = handleItemToClient(stacks[i]);
+                    }
+                });
+            }
+        });
+
+        // Entity Equipment Packet
+        protocol.registerOutgoing(State.PLAY, 0x3E, 0x3C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.VAR_INT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Item
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        wrapper.set(Type.ITEM, 0, handleItemToClient(stack));
+                    }
+                });
+            }
+        });
+
+        // Plugin message Packet -> Trading
+        protocol.registerOutgoing(State.PLAY, 0x18, 0x18, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Channel
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
+                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+
+                            int size = wrapper.passthrough(Type.BYTE);
+                            for (int i = 0; i < size; i++) {
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+
+                                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                                if (secondItem)
+                                    wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+
+                                wrapper.passthrough(Type.BOOLEAN); // Trade disabled
+                                wrapper.passthrough(Type.INT); // Number of tools uses
+                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Click window packet
+        protocol.registerIncoming(State.PLAY, 0x08, 0x07, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                        map(Type.SHORT); // 1 - Slot
+                        map(Type.BYTE); // 2 - Button
+                        map(Type.SHORT); // 3 - Action number
+                        map(Type.VAR_INT); // 4 - Mode
+                        map(Type.ITEM); // 5 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Creative Inventory Action
+        protocol.registerIncoming(State.PLAY, 0x1B, 0x18, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.SHORT); // 0 - Slot
+                        map(Type.ITEM); // 1 - Clicked Item
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                Item item = wrapper.get(Type.ITEM, 0);
+                                handleItemToServer(item);
+                            }
+                        });
+                    }
+                }
+        );
+
+        /* Block packets */
+
+        // Chunk packet
+        protocol.registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                                Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld); // Use the 1.9.4 Chunk type since nothing changed.
+                                Chunk1_9_3_4 chunk = (Chunk1_9_3_4) wrapper.passthrough(type);
+
+                                handleChunk(chunk);
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x0B, 0x0B, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.POSITION); // 0 - Block Position
+                        map(Type.VAR_INT); // 1 - Block
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                int idx = wrapper.get(Type.VAR_INT, 0);
+                                wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Multi Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x10, 0x10, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.INT); // 0 - Chunk X
+                        map(Type.INT); // 1 - Chunk Z
+
+                        handler(new PacketHandler() {
+                            @Override
+                            public void handle(PacketWrapper wrapper) throws Exception {
+                                int count = wrapper.passthrough(Type.VAR_INT); // Array length
+
+                                for (int i = 0; i < count; i++) {
+                                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Horizontal position
+                                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Y coords
+
+                                    int id = wrapper.read(Type.VAR_INT); // Block ID
+                                    wrapper.write(Type.VAR_INT, handleBlockID(id));
+                                }
+                            }
+                        });
+                    }
+                }
+        );
+
+        // Update Block Entity
+        protocol.registerOutgoing(State.PLAY, 0x09, 0x09, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Position
+                map(Type.UNSIGNED_BYTE); // 1 - Action
+                map(Type.NBT); // 2 - NBT
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Remove bed color
+                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 11)
+                            wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        protocol.getEntityPackets().registerMetaHandler().handle(e -> {
+            Metadata data = e.getData();
+
+            if (data.getMetaType().equals(MetaType1_12.Slot)) // Is Item
+                data.setValue(handleItemToClient((Item) data.getValue()));
+
+            return data;
+        });
+
+        // Client Status
+        protocol.registerIncoming(State.PLAY, 0x04, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // Action ID
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Open Inventory
+                        if (wrapper.get(Type.VAR_INT, 0) == 2)
+                            wrapper.cancel(); // TODO is this replaced by something else?
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        // Concrete -> Stained clay? (Also got a new name Terracota?)
+        rewrite(251)
+                .repItem(new Item((short) 159, (byte) 1, (short) -1, getNamedTag("1.12 %viabackwards_color% Concrete")))
+                .repBlock(new Block(159, -1));
+
+        // Concrete Powder -> Wool
+        rewrite(252)
+                .repItem(new Item((short) 35, (byte) 1, (short) -1, getNamedTag("1.12 %viabackwards_color% Concrete Powder")))
+                .repBlock(new Block(35, -1));
+
+        // Knowledge book -> book
+        rewrite(453)
+                .repItem(new Item((short) 340, (byte) 1, (short) 0, getNamedTag("1.12 Knowledge Book")))
+                .itemHandler(i -> {
+                    CompoundTag tag = i.getTag();
+
+                    if (!tag.contains("ench"))
+                        tag.put(new ListTag("ench", Collections.emptyList()));
+
+                    return i;
+                });
+
+        // Glazed Terracotta -> Stained Clay
+        for (int i = 235; i < 251; i++) {
+            rewrite(i).repItem(new Item((short) 159, (byte) 1, (short) (i - 235), getNamedTag("1.12 " + BlockColors.get(i - 235) + " Glazed Terracotta")))
+                    .repBlock(new Block(159, (i - 235)));
+        }
+
+        // Handle beds
+        rewrite(355).repItem(new Item((short) 355, (byte) 1, (short) 0, getNamedTag("1.12 %viabackwards_color% Bed")));
+
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+
+import nl.matsv.viabackwards.api.rewriters.Rewriter;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.packets.State;
+
+public class ChangedPacketIds1_12 extends Rewriter<Protocol1_11_1To1_12> {
+
+    @Override
+    protected void registerPackets(Protocol1_11_1To1_12 p) {
+        p.registerOutgoing(State.PLAY, 0x25, 0x28); // Entity
+        p.registerOutgoing(State.PLAY, 0x26, 0x25); // Entity Relative Move
+        p.registerOutgoing(State.PLAY, 0x27, 0x26); // Entity Look and Relative Move
+        p.registerOutgoing(State.PLAY, 0x28, 0x27); // Entity Look
+        p.registerOutgoing(State.PLAY, 0x30, -1, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        }); // Unlock Recipes TODO does ViaVersion cancel the packet if the new id is -1?
+        // 0x31 -> 0x30 Destroy Entities handled in EntityPackets1_12.java
+        p.registerOutgoing(State.PLAY, 0x32, 0x31); // Remove Entity Effect
+        p.registerOutgoing(State.PLAY, 0x33, 0x32); // Resource Pack Send
+        // 0x34 -> 0x33 Respawn handled in EntityPackets1_12.java
+        p.registerOutgoing(State.PLAY, 0x35, 0x34); // Entity Head Look
+        p.registerOutgoing(State.PLAY, 0x36, -1, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        }); // Advancement Progress
+        p.registerOutgoing(State.PLAY, 0x37, 0x35); // World Border
+        p.registerOutgoing(State.PLAY, 0x38, 0x36); //Camera
+        p.registerOutgoing(State.PLAY, 0x39, 0x37); // Held Item Change (ClientBound)
+        p.registerOutgoing(State.PLAY, 0x3A, 0x38); // Display Scoreboard
+        // 0x3B -> 0x39 Entity Metadata handled in EntityPackets1_12.java
+        p.registerOutgoing(State.PLAY, 0x3C, 0x3A); // Attach Entity
+        p.registerOutgoing(State.PLAY, 0x3D, 0x3B); // Entity Velocity
+        // 0x3E -> 0x3C Entity Equipment handled in BlockItemPackets1_12.java
+        p.registerOutgoing(State.PLAY, 0x3F, 0x3D); // Set Experience
+        p.registerOutgoing(State.PLAY, 0x40, 0x3E); // Update Health
+        p.registerOutgoing(State.PLAY, 0x41, 0x3F); // ScoreBoard Objective
+        p.registerOutgoing(State.PLAY, 0x42, 0x40); // Set Passengers
+        p.registerOutgoing(State.PLAY, 0x43, 0x41); // Teams
+        p.registerOutgoing(State.PLAY, 0x44, 0x42); // Update Score
+        p.registerOutgoing(State.PLAY, 0x45, 0x43); // Spawn Position
+        p.registerOutgoing(State.PLAY, 0x46, 0x44); // Time Update
+        p.registerOutgoing(State.PLAY, 0x47, 0x45); // Title
+        // 0x48 -> 0x46 Sound Effect handled in SoundPackets1_12.java
+        p.registerOutgoing(State.PLAY, 0x49, 0x47); // Player List Header And Footer
+        p.registerOutgoing(State.PLAY, 0x4A, 0x48); // Collect Item
+        p.registerOutgoing(State.PLAY, 0x4B, 0x49); // Entity Teleport
+        p.registerOutgoing(State.PLAY, 0x4C, -1, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        }); // Advancements
+        p.registerOutgoing(State.PLAY, 0x4D, 0x4A); // Entity Properties
+        p.registerOutgoing(State.PLAY, 0x4E, 0x4B); // Entity Effect
+
+        p.registerIncoming(State.PLAY, 0x01, -1); // Prepare Crafting Grid
+        p.registerIncoming(State.PLAY, 0x02, 0x01); // Tab-Complete (Serverbound)
+        p.registerIncoming(State.PLAY, 0x03, 0x02); // Chat Message (Serverbound)
+        // 0x04->0x03 Client Status handled in BlockItemPackets1_12.java
+        p.registerIncoming(State.PLAY, 0x05, 0x04); // Client Settings
+        p.registerIncoming(State.PLAY, 0x06, 0x05); // Confirm Transaction (Serverbound)
+        p.registerIncoming(State.PLAY, 0x07, 0x06); // Enchant Item
+        // 0x08 -> 0x07 Click Window handled in BlockItemPackets1_12.java
+        p.registerIncoming(State.PLAY, 0x09, 0x08); // Close Window (Serverbound)
+        p.registerIncoming(State.PLAY, 0x0A, 0x09); // Plugin message (Serverbound)
+        p.registerIncoming(State.PLAY, 0x0B, 0x0A); // Use Entity
+        p.registerIncoming(State.PLAY, 0x0C, 0x0B); // Keep Alive (Serverbound)
+        p.registerIncoming(State.PLAY, 0x0D, 0x0F); // Player
+        p.registerIncoming(State.PLAY, 0x0E, 0x0C); // Player Position
+        p.registerIncoming(State.PLAY, 0x0F, 0x0D); // Player Position And Look (ServerBound)
+        p.registerIncoming(State.PLAY, 0x10, 0x0E); // Player Look
+        p.registerIncoming(State.PLAY, 0x11, 0x10); // Vehicle Move
+        p.registerIncoming(State.PLAY, 0x12, 0x11); // Steer Boat
+        p.registerIncoming(State.PLAY, 0x13, 0x12); // Player Abilities (Serverbound)
+        p.registerIncoming(State.PLAY, 0x14, 0x13); // Player Digging
+        p.registerIncoming(State.PLAY, 0x15, 0x14); // Entity Action
+        p.registerIncoming(State.PLAY, 0x16, 0x15); // Steer Vehicle
+        p.registerIncoming(State.PLAY, 0x17, -1); // Crafting Book Data
+        p.registerIncoming(State.PLAY, 0x18, 0x16); // Resource Pack Status
+        p.registerIncoming(State.PLAY, 0x19, -1); // Advancement Tab
+        p.registerIncoming(State.PLAY, 0x1A, 0x17); // Held Item Change (Serverbound)
+        // 0x1B -> 0x18 Creative Inventory Action handled in BlockItemPackets.java
+        p.registerIncoming(State.PLAY, 0x1C, 0x19); // Update Sign
+        p.registerIncoming(State.PLAY, 0x1D, 0x1A); // Animatin (Serverbound)
+        p.registerIncoming(State.PLAY, 0x1E, 0x1B); // Spectate
+        p.registerIncoming(State.PLAY, 0x1F, 0x1C); // Player Block Placement
+        p.registerIncoming(State.PLAY, 0x20, 0x1D); // Use Item
+    }
+
+    @Override
+    protected void registerRewrites() {
+
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChatPackets1_12.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.rewriters.Rewriter;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.AdvancementTranslations;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.viaversion.libs.gson.JsonElement;
+import us.myles.viaversion.libs.gson.JsonObject;
+import us.myles.viaversion.libs.gson.JsonParser;
+
+import java.util.Map;
+
+public class ChatPackets1_12 extends Rewriter<Protocol1_11_1To1_12> {
+    @Override
+    protected void registerPackets(Protocol1_11_1To1_12 protocol) {
+        // Chat Message (ClientBound)
+        protocol.registerOutgoing(State.PLAY, 0x0F, 0x0F, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Json Data
+                map(Type.BYTE); // 1 - Position
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        JsonParser parser = new JsonParser();
+                        try {
+                            JsonObject object = parser.parse(wrapper.get(Type.STRING, 0)).getAsJsonObject();
+
+                            // Skip if the root doesn't contain translate
+                            if (object.has("translate"))
+                                handleTranslations(object);
+
+                            wrapper.set(Type.STRING, 0, object.toString());
+                        } catch (Exception e) {
+                            // Only print if ViaVer debug is enabled
+                            if (Via.getManager().isDebug()) {
+                                ViaBackwards.getPlatform().getLogger().severe("Failed to handle translations");
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+    }
+
+    // TODO improve this, not copying will cause ConcurrentModificationException
+    public void handleTranslations(JsonObject object) {
+        JsonObject copiedObj = copy(object);
+
+        if (object.isJsonObject()) {
+            for (Map.Entry<String, JsonElement> entry : copiedObj.entrySet()) {
+                // Get the text that doesn't exist for 1.11 <
+                if (entry.getKey().equalsIgnoreCase("translate") && AdvancementTranslations.has(entry.getValue().getAsString())) {
+                    String trans = entry.getValue().getAsString();
+                    object.remove("translate");
+                    object.addProperty("translate", AdvancementTranslations.get(trans));
+                }
+                // Handle arrays
+                if (entry.getValue().isJsonArray())
+                    for (JsonElement element : object.get(entry.getKey()).getAsJsonArray())
+                        if (element.isJsonObject())
+                            handleTranslations(element.getAsJsonObject());
+
+                // Handle objects
+                if (entry.getValue().isJsonObject())
+                    handleTranslations(object.get(entry.getKey()).getAsJsonObject());
+            }
+        }
+    }
+
+    public JsonObject copy(JsonObject object) {
+        JsonObject result = new JsonObject();
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
+            if (entry.getValue().isJsonObject())
+                result.add(entry.getKey(), copy(entry.getValue().getAsJsonObject()));
+            else
+                result.add(entry.getKey(), entry.getValue());
+        }
+        return result;
+    }
+
+    @Override
+    protected void registerRewrites() {
+
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/EntityPackets1_12.java

@@ -0,0 +1,481 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_12;
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ParrotStorage;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ShoulderTracker;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_12;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_12;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+
+import java.util.Optional;
+
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_12.*;
+
+public class EntityPackets1_12 extends EntityRewriter<Protocol1_11_1To1_12> {
+    @Override
+    protected void registerPackets(Protocol1_11_1To1_12 protocol) {
+        // Spawn Object
+        protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.BYTE); // 2 - Type
+                map(Type.DOUBLE); // 3 - x
+                map(Type.DOUBLE); // 4 - y
+                map(Type.DOUBLE); // 5 - z
+                map(Type.BYTE); // 6 - Pitch
+                map(Type.BYTE); // 7 - Yaw
+                map(Type.INT); // 8 - data
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                getTypeFromId(wrapper.get(Type.BYTE, 0), true)
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<EntityType1_12.ObjectType> type = ObjectType.findById(wrapper.get(Type.BYTE, 0));
+
+                        if (type.isPresent()) {
+                            Optional<EntityData> optEntDat = getObjectData(type.get());
+                            if (optEntDat.isPresent()) {
+                                EntityData data = optEntDat.get();
+                                wrapper.set(Type.BYTE, 0, ((Integer) data.getReplacementId()).byteValue());
+                                if (data.getObjectData() != -1)
+                                    wrapper.set(Type.INT, 0, data.getObjectData());
+                            }
+                        } else {
+                            if (Via.getManager().isDebug()) {
+                                ViaBackwards.getPlatform().getLogger().warning("Could not find Entity Type" + wrapper.get(Type.BYTE, 0));
+                            }
+                        }
+                    }
+                });
+
+                // Handle FallingBlock blocks
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<EntityType1_12.ObjectType> type = ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                        if (type.isPresent() && type.get().equals(ObjectType.FALLING_BLOCK)) {
+                            int objectData = wrapper.get(Type.INT, 0);
+                            int objType = objectData & 4095;
+                            int data = objectData >> 12 & 15;
+
+                            Block block = getProtocol().getBlockItemPackets().handleBlock(objType, data);
+                            if (block == null)
+                                return;
+
+                            wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Spawn Experience Orb
+        protocol.registerOutgoing(State.PLAY, 0x01, 0x01, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                ObjectType.THROWN_EXP_BOTTLE.getType()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Global Entity
+        protocol.registerOutgoing(State.PLAY, 0x02, 0x02, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Type
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.WEATHER // Always thunder according to wiki.vg
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Mob
+        protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.VAR_INT); // 2 - Entity Type
+                map(Type.DOUBLE); // 3 - X
+                map(Type.DOUBLE); // 4 - Y
+                map(Type.DOUBLE); // 5 - Z
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+                map(Types1_12.METADATA_LIST); // 12 - Metadata
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                getTypeFromId(wrapper.get(Type.VAR_INT, 1), false)
+                        );
+                    }
+                });
+
+
+                // Rewrite entity type / metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+                        AbstractEntityType type = getEntityType(wrapper.user(), entityId);
+
+                        MetaStorage storage = new MetaStorage(wrapper.get(Types1_12.METADATA_LIST, 0));
+                        handleMeta(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                storage
+                        );
+
+                        Optional<EntityData> optEntDat = getEntityData(type);
+                        if (optEntDat.isPresent()) {
+                            EntityData data = optEntDat.get();
+                            wrapper.set(Type.VAR_INT, 1, data.getReplacementId());
+                            if (data.hasBaseMeta())
+                                data.getDefaultMeta().handle(storage);
+                        }
+
+                        // Rewrite Metadata
+                        wrapper.set(
+                                Types1_12.METADATA_LIST,
+                                0,
+                                storage.getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Painting
+        protocol.registerOutgoing(State.PLAY, 0x04, 0x04, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PAINTING
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Player
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+                map(Type.DOUBLE); // 2 - X
+                map(Type.DOUBLE); // 3 - Y
+                map(Type.DOUBLE); // 4 - Z
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+                map(Types1_12.METADATA_LIST); // 7 - Metadata list
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                // Rewrite Metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_12.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_12.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Join game
+        protocol.registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.UNSIGNED_BYTE); // 1 - Gamemode
+                map(Type.INT); // 2 - Dimension
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ShoulderTracker tracker = wrapper.user().get(ShoulderTracker.class);
+                        tracker.setEntityId(wrapper.get(Type.INT, 0));
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 1);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+
+                // Send fake inventory achievement
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper packetWrapper) throws Exception {
+                        PacketWrapper wrapper = new PacketWrapper(0x07, null, packetWrapper.user());
+
+                        wrapper.write(Type.VAR_INT, 1);
+                        wrapper.write(Type.STRING, "achievement.openInventory");
+                        wrapper.write(Type.VAR_INT, 1);
+
+                        wrapper.send(Protocol1_11_1To1_12.class);
+                    }
+                });
+            }
+        });
+
+        // Respawn Packet (save dimension id)
+        protocol.registerOutgoing(State.PLAY, 0x34, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Dimension ID
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 0);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Destroy entities
+        protocol.registerOutgoing(State.PLAY, 0x31, 0x30, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT_ARRAY); // 0 - Entity IDS
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0))
+                            getEntityTracker(wrapper.user()).removeEntity(entity);
+                    }
+                });
+            }
+        });
+
+        // Metadata packet
+        protocol.registerOutgoing(State.PLAY, 0x3B, 0x39, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Types1_12.METADATA_LIST); // 1 - Metadata list
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_12.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_12.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        regEntType(EntityType.PARROT, EntityType.BAT).mobName("Parrot").spawnMetadata(storage -> storage.add(new Metadata(12, MetaType1_12.Byte, (byte) 0x00)));
+        regEntType(EntityType.ILLUSION_ILLAGER, EntityType.EVOCATION_ILLAGER).mobName("Illusioner");
+
+        // Handle Illager
+        registerMetaHandler().filter(EntityType.EVOCATION_ILLAGER, true, 12).removed();
+        registerMetaHandler().filter(EntityType.EVOCATION_ILLAGER, true, 13).handleIndexChange(12);
+
+        registerMetaHandler().filter(EntityType.ILLUSION_ILLAGER, 0).handle(e -> {
+            byte mask = (byte) e.getData().getValue();
+
+            if ((mask & 0x20) == 0x20)
+                mask &= ~0x20;
+
+            e.getData().setValue(mask);
+            return e.getData();
+        });
+
+        // Create Parrot storage
+        registerMetaHandler().filter(EntityType.PARROT, true).handle(e -> {
+            if (!e.getEntity().has(ParrotStorage.class))
+                e.getEntity().put(new ParrotStorage());
+            return e.getData();
+        });
+        // Parrot remove animal metadata
+        registerMetaHandler().filter(EntityType.PARROT, 12).removed(); // Is baby
+        registerMetaHandler().filter(EntityType.PARROT, 13).handle(e -> {
+            Metadata data = e.getData();
+            ParrotStorage storage = e.getEntity().get(ParrotStorage.class);
+            boolean isSitting = (((byte) data.getValue()) & 0x01) == 0x01;
+            boolean isTamed = (((byte) data.getValue()) & 0x04) == 0x04;
+
+            if (!storage.isTamed() && isTamed) {
+                // TODO do something to let the user know it's done
+            }
+
+            storage.setTamed(isTamed);
+
+            if (isSitting) {
+                data.setId(12);
+                data.setValue((byte) 0x01);
+                storage.setSitting(true);
+            } else if (storage.isSitting()) {
+                data.setId(12);
+                data.setValue((byte) 0x00);
+                storage.setSitting(false);
+            } else
+                throw new RemovedValueException();
+
+            return data;
+        }); // Flags (Is sitting etc, might be useful in the future
+        registerMetaHandler().filter(EntityType.PARROT, 14).removed(); // Owner
+        registerMetaHandler().filter(EntityType.PARROT, 15).removed(); // Variant
+
+        // Left shoulder entity data
+        registerMetaHandler().filter(EntityType.PLAYER, 15).handle(e -> {
+            CompoundTag tag = (CompoundTag) e.getData().getValue();
+            ShoulderTracker tracker = e.getUser().get(ShoulderTracker.class);
+
+            if (tag.isEmpty() && tracker.getLeftShoulder() != null) {
+                tracker.setLeftShoulder(null);
+                tracker.update();
+            } else if (tag.contains("id") && e.getEntity().getEntityId() == tracker.getEntityId()) {
+                String id = (String) tag.get("id").getValue();
+                if (tracker.getLeftShoulder() == null || !tracker.getLeftShoulder().equals(id)) {
+                    tracker.setLeftShoulder(id);
+                    tracker.update();
+                }
+            }
+
+            throw new RemovedValueException();
+        });
+
+        // Right shoulder entity data
+        registerMetaHandler().filter(EntityType.PLAYER, 16).handle(e -> {
+            CompoundTag tag = (CompoundTag) e.getData().getValue();
+            ShoulderTracker tracker = e.getUser().get(ShoulderTracker.class);
+
+            if (tag.isEmpty() && tracker.getRightShoulder() != null) {
+                tracker.setRightShoulder(null);
+                tracker.update();
+            } else if (tag.contains("id") && e.getEntity().getEntityId() == tracker.getEntityId()) {
+                String id = (String) tag.get("id").getValue();
+                if (tracker.getRightShoulder() == null || !tracker.getRightShoulder().equals(id)) {
+                    tracker.setRightShoulder(id);
+                    tracker.update();
+                }
+            }
+
+            throw new RemovedValueException();
+        });
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/SoundPackets1_12.java

@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+
+import nl.matsv.viabackwards.api.rewriters.SoundRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class SoundPackets1_12 extends SoundRewriter<Protocol1_11_1To1_12> {
+    @Override
+    protected void registerPackets(Protocol1_11_1To1_12 protocol) {
+        // Named sound effect
+        protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Sound name
+                map(Type.VAR_INT); // 1 - Sound Category
+                map(Type.INT); // 2 - x
+                map(Type.INT); // 3 - y
+                map(Type.INT); // 4 - z
+                map(Type.FLOAT); // 5 - Volume
+                map(Type.FLOAT); // 6 - Pitch
+            }
+        });
+
+        // Sound effect
+        protocol.registerOutgoing(State.PLAY, 0x48, 0x46, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Sound name
+                map(Type.VAR_INT); // 1 - Sound Category
+                map(Type.INT); // 2 - x
+                map(Type.INT); // 3 - y
+                map(Type.INT); // 4 - z
+                map(Type.FLOAT); // 5 - Volume
+                map(Type.FLOAT); // 6 - Pitch
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int oldId = wrapper.get(Type.VAR_INT, 0);
+                        int newId = handleSounds(oldId);
+                        if (newId == -1)
+                            wrapper.cancel();
+                        else {
+                            if (hasPitch(oldId))
+                                wrapper.set(Type.FLOAT, 1, handlePitch(oldId));
+                            wrapper.set(Type.VAR_INT, 0, newId);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+
+    @Override
+    protected void registerRewrites() {
+        // Replacement sounds, suggestions are always welcome
+        // Automatically generated from PAaaS
+        added(26, 277, 1.4f); // block.end_portal.spawn -> entity.lightning.thunder
+        added(27, -1); // block.end_portal_frame.fill
+
+        added(72, 70); // block.note.bell -> block.note.harp
+        added(73, 70); // block.note.chime -> block.note.harp
+        added(74, 70); // block.note.flute -> block.note.harp
+        added(75, 70); // block.note.guitar -> block.note.harp
+        added(80, 70); // block.note.xylophone -> block.note.harp
+
+        added(150, -1); // entity.boat.paddle_land
+        added(151, -1); // entity.boat.paddle_water
+
+        added(152, -1); // entity.bobber.retrieve
+
+        added(195, -1); // entity.endereye.death
+
+        added(274, 198, 0.8f); // entity.illusion_illager.ambient -> entity.evocation_illager.ambient
+        added(275, 199, 0.8f); // entity.illusion_illager.cast_spell -> entity.evocation_illager.cast_spell
+        added(276, 200, 0.8f); // entity.illusion_illager.death -> entity.evocation_illager.death
+        added(277, 201, 0.8f); // entity.illusion_illager.hurt -> entity.evocation_illager.hurt
+        added(278, 191, 0.9f); // entity.illusion_illager.mirror_move -> entity.endermen.teleport
+        added(279, 203, 1.5f); // entity.illusion_illager.prepare_blindness -> entity.evocation_illager.prepare_summon
+        added(280, 202, 0.8f); // entity.illusion_illager.prepare_mirror -> entity.evocation_illager.prepare_attack
+
+        added(319, 133, 0.6f); // entity.parrot.ambient -> entity.bat.ambient
+        added(320, 134, 1.7f); // entity.parrot.death -> entity.bat.death
+        added(321, 219, 1.5f); // entity.parrot.eat -> entity.generic.eat
+        added(322, 136, 0.7f); // entity.parrot.fly -> entity.bat.loop
+        added(323, 135, 1.6f); // entity.parrot.hurt -> entity.bat.hurt
+        added(324, 138, 1.5f); // entity.parrot.imitate.blaze -> entity.blaze.ambient
+        added(325, 163, 1.5f); // entity.parrot.imitate.creeper -> entity.creeper.primed
+        added(326, 170, 1.5f); // entity.parrot.imitate.elder_guardian -> entity.elder_guardian.ambient
+        added(327, 178, 1.5f); // entity.parrot.imitate.enderdragon -> entity.enderdragon.ambient
+        added(328, 186, 1.5f); // entity.parrot.imitate.enderman -> entity.endermen.ambient
+        added(329, 192, 1.5f); // entity.parrot.imitate.endermite -> entity.endermite.ambient
+        added(330, 198, 1.5f); // entity.parrot.imitate.evocation_illager -> entity.evocation_illager.ambient
+        added(331, 226, 1.5f); // entity.parrot.imitate.ghast -> entity.ghast.ambient
+        added(332, 259, 1.5f); // entity.parrot.imitate.husk -> entity.husk.ambient
+        added(333, 198, 1.3f); // entity.parrot.imitate.illusion_illager -> entity.evocation_illager.ambient
+        added(334, 291, 1.5f); // entity.parrot.imitate.magmacube -> entity.magmacube.squish
+        added(335, 321, 1.5f); // entity.parrot.imitate.polar_bear -> entity.polar_bear.ambient
+        added(336, 337, 1.5f); // entity.parrot.imitate.shulker -> entity.shulker.ambient
+        added(337, 347, 1.5f); // entity.parrot.imitate.silverfish -> entity.silverfish.ambient
+        added(338, 351, 1.5f); // entity.parrot.imitate.skeleton -> entity.skeleton.ambient
+        added(339, 363, 1.5f); // entity.parrot.imitate.slime -> entity.slime.squish
+        added(340, 376, 1.5f); // entity.parrot.imitate.spider -> entity.spider.ambient
+        added(341, 385, 1.5f); // entity.parrot.imitate.stray -> entity.stray.ambient
+        added(342, 390, 1.5f); // entity.parrot.imitate.vex -> entity.vex.ambient
+        added(343, 400, 1.5f); // entity.parrot.imitate.vindication_illager -> entity.vindication_illager.ambient
+        added(344, 403, 1.5f); // entity.parrot.imitate.witch -> entity.witch.ambient
+        added(345, 408, 1.5f); // entity.parrot.imitate.wither -> entity.wither.ambient
+        added(346, 414, 1.5f); // entity.parrot.imitate.wither_skeleton -> entity.wither_skeleton.ambient
+        added(347, 418, 1.5f); // entity.parrot.imitate.wolf -> entity.wolf.ambient
+        added(348, 427, 1.5f); // entity.parrot.imitate.zombie -> entity.zombie.ambient
+        added(349, 438, 1.5f); // entity.parrot.imitate.zombie_pigman -> entity.zombie_pig.ambient
+        added(350, 442, 1.5f); // entity.parrot.imitate.zombie_villager -> entity.zombie_villager.ambient
+        added(351, 155); // entity.parrot.step -> entity.chicken.step
+
+        added(368, 316); // entity.player.hurt_drown -> entity.player.hurt
+        added(369, 316); // entity.player.hurt_on_fire -> entity.player.hurt
+
+        // No replacement sounds for these, since it could be confusing, the toast doesn't show up
+        added(544, -1); // ui.toast.in
+        added(545, -1); // ui.toast.out
+        added(546, 317, 1.5f); // ui.toast.challenge_complete
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10;
+
+import lombok.Getter;
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets1_10;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.ChangedPackets1_10;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.EntityPackets1_10;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.SoundPackets1_10;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+@Getter
+public class Protocol1_9_4To1_10 extends BackwardsProtocol {
+    private EntityPackets1_10 entityPackets; // Required for the item rewriter
+    private BlockItemPackets1_10 blockItemPackets;
+
+    protected void registerPackets() {
+        new ChangedPackets1_10().register(this);
+        new SoundPackets1_10().register(this);
+        (entityPackets = new EntityPackets1_10()).register(this);
+        (blockItemPackets = new BlockItemPackets1_10()).register(this);
+    }
+
+    public void init(UserConnection user) {
+        // Register ClientWorld
+        if (!user.has(ClientWorld.class))
+            user.put(new ClientWorld(user));
+
+        // Register EntityTracker if it doesn't exist yet.
+        if (!user.has(EntityTracker.class))
+            user.put(new EntityTracker(user));
+
+        // Init protocol in EntityTracker
+        user.get(EntityTracker.class).initProtocol(this);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java

@@ -1,41 +1,33 @@
 /*
+ * Copyright (c) 2016 Matsv
  *
- *     Copyright (C) 2016 Matsv
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
 
 import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9To1_10;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks.Chunk1_10;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks.Chunk1_10Type;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks.ChunkSection1_10;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
 import nl.matsv.viabackwards.utils.Block;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
-// TODO REWRITE PLUGINS MESSAGE ITEMS
-public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
+public class BlockItemPackets1_10 extends BlockItemRewriter<Protocol1_9_4To1_10> {
 
-    protected void registerPackets(Protocol1_9To1_10 protocol) {
+    protected void registerPackets(Protocol1_9_4To1_10 protocol) {
         /* Item packets */
 
         // Set slot packet
@@ -124,9 +116,7 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
         });
 
         // Click window packet
-        protocol.registerIncoming(State.PLAY, 0x07, 0x07, new
-
-                PacketRemapper() {
+        protocol.registerIncoming(State.PLAY, 0x07, 0x07, new PacketRemapper() {
                     @Override
                     public void registerMap() {
                         map(Type.UNSIGNED_BYTE); // 0 - Window ID
@@ -145,13 +135,10 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
                         });
                     }
                 }
-
         );
 
         // Creative Inventory Action
-        protocol.registerIncoming(State.PLAY, 0x18, 0x18, new
-
-                PacketRemapper() {
+        protocol.registerIncoming(State.PLAY, 0x18, 0x18, new PacketRemapper() {
                     @Override
                     public void registerMap() {
                         map(Type.SHORT); // 0 - Slot
@@ -166,15 +153,12 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
                         });
                     }
                 }
-
         );
 
         /* Block packets */
 
         // Chunk packet
-        protocol.registerOutgoing(State.PLAY, 0x20, 0x20, new
-
-                PacketRemapper() {
+        protocol.registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
                     @Override
                     public void registerMap() {
                         handler(new PacketHandler() {
@@ -182,37 +166,18 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
                             public void handle(PacketWrapper wrapper) throws Exception {
                                 ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-                                Chunk1_10Type type = new Chunk1_10Type(clientWorld);
-                                Chunk1_10 chunk = (Chunk1_10) wrapper.passthrough(type);
+                                Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld);
+                                Chunk1_9_3_4 chunk = (Chunk1_9_3_4) wrapper.passthrough(type);
 
-                                for (int i = 0; i < chunk.getSections().length; i++) {
-                                    ChunkSection1_10 section = chunk.getSections()[i];
-                                    if (section == null)
-                                        continue;
-
-                                    for (int x = 0; x < 16; x++) {
-                                        for (int y = 0; y < 16; y++) {
-                                            for (int z = 0; z < 16; z++) {
-                                                int block = section.getBlockId(x, y, z);
-                                                if (containsBlock(block)) {
-                                                    Block b = handleBlock(block);
-                                                    section.setBlock(x, y, z, b.getId(), b.getData());
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
+                                handleChunk(chunk);
                             }
                         });
                     }
                 }
-
         );
 
         // Block Change Packet
-        protocol.registerOutgoing(State.PLAY, 0x0B, 0x0B, new
-
-                PacketRemapper() {
+        protocol.registerOutgoing(State.PLAY, 0x0B, 0x0B, new PacketRemapper() {
                     @Override
                     public void registerMap() {
                         map(Type.POSITION); // 0 - Block Position
@@ -227,13 +192,10 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
                         });
                     }
                 }
-
         );
 
         // Multi Block Change Packet
-        protocol.registerOutgoing(State.PLAY, 0x10, 0x10, new
-
-                PacketRemapper() {
+        protocol.registerOutgoing(State.PLAY, 0x10, 0x10, new PacketRemapper() {
                     @Override
                     public void registerMap() {
                         map(Type.INT); // 0 - Chunk X
@@ -255,35 +217,26 @@ public class BlockItemPackets extends BlockItemRewriter<Protocol1_9To1_10> {
                         });
                     }
                 }
-
         );
 
-        /* Register Metadata */
-        protocol.getEntityPackets().registerMetaRewriter((isObject, entityType, data) -> {
-            if (data.getTypeID() == 5) // Is Item
+
+        protocol.getEntityPackets().registerMetaHandler().handle(e -> {
+            Metadata data = e.getData();
+
+            if (data.getMetaType().equals(MetaType1_9.Slot)) // Is Item
                 data.setValue(handleItemToClient((Item) data.getValue()));
 
             return data;
         });
     }
 
-    protected int handleBlockID(int idx) {
-        int type = idx >> 4;
-
-        if (!containsBlock(type))
-            return idx;
-
-        Block b = handleBlock(type);
-        return (b.getId() << 4 | (b.getData() & 15));
-    }
-
     @Override
     protected void registerRewrites() {
-        rewriteItem(255, new Item((short) 166, (byte) 1, (short) 0, getNamedTag("1.10 Structure Block"))); // Structure block only item since the structure block is in 1.9
-        rewriteBlockItem(217, new Item((short) 287, (byte) 1, (short) 0, getNamedTag("1.10 Structure Void")), new Block(287, 0)); // Structure void to string
-        rewriteBlockItem(213, new Item((short) 159, (byte) 1, (short) 1, getNamedTag("1.10 Magma Block")), new Block(159, 1)); // Magma block to orange clay
-        rewriteBlockItem(214, new Item((short) 159, (byte) 1, (short) 14, getNamedTag("1.10 Nether Ward Block")), new Block(159, 14)); // Nether wart block to red clay
-        rewriteBlockItem(215, new Item((short) 112, (byte) 1, (short) 0, getNamedTag("1.10 Red Nether Bricks")), new Block(112, 0)); // Red nether brick to nether brick
-        rewriteBlockItem(216, new Item((short) 155, (byte) 1, (short) 0, getNamedTag("1.10 Bone Block")), new Block(155, 0)); // Bone block to quartz
+        rewrite(255).repItem(new Item((short) 166, (byte) 1, (short) 0, getNamedTag("1.10 Structure Block"))); // Structure block only item since the structure block is in 1.9
+        rewrite(217).repItem(new Item((short) 287, (byte) 1, (short) 0, getNamedTag("1.10 Structure Void"))).repBlock(new Block(287, 0)); // Structure void to string
+        rewrite(213).repItem(new Item((short) 159, (byte) 1, (short) 1, getNamedTag("1.10 Magma Block"))).repBlock(new Block(159, 1)); // Magma block to orange clay
+        rewrite(214).repItem(new Item((short) 159, (byte) 1, (short) 14, getNamedTag("1.10 Nether Ward Block"))).repBlock(new Block(159, 14)); // Nether wart block to red clay
+        rewrite(215).repItem(new Item((short) 112, (byte) 1, (short) 0, getNamedTag("1.10 Red Nether Bricks"))).repBlock(new Block(112, 0)); // Red nether brick to nether brick
+        rewrite(216).repItem(new Item((short) 155, (byte) 1, (short) 0, getNamedTag("1.10 Bone Block"))).repBlock(new Block(155, 0)); // Bone block to quartz
     }
 }

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets1_10.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
+
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class ChangedPackets1_10 {
+
+    public void register(BackwardsProtocol protocol) {
+        /* ServerBound packets */
+
+        // ResourcePack status
+        protocol.registerIncoming(State.PLAY, 0x16, 0x16, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING, Type.NOTHING); // 0 - Hash
+                map(Type.VAR_INT); // 1 - Result
+            }
+        });
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java

@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
+
+import nl.matsv.viabackwards.ViaBackwards;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_10;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_11;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_12;
+import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
+import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
+import nl.matsv.viabackwards.utils.Block;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+import java.util.Optional;
+
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_10.EntityType;
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.getTypeFromId;
+
+public class EntityPackets1_10 extends EntityRewriter<Protocol1_9_4To1_10> {
+
+    @Override
+    protected void registerPackets(Protocol1_9_4To1_10 protocol) {
+
+        // Spawn Object
+        protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.BYTE); // 2 - Type
+                map(Type.DOUBLE); // 3 - x
+                map(Type.DOUBLE); // 4 - y
+                map(Type.DOUBLE); // 5 - z
+                map(Type.BYTE); // 6 - Pitch
+                map(Type.BYTE); // 7 - Yaw
+                map(Type.INT); // 8 - data
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                getTypeFromId(wrapper.get(Type.BYTE, 0), true)
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<EntityType1_11.ObjectType> type = EntityType1_11.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+
+                        if (type.isPresent()) {
+                            Optional<EntityData> optEntDat = getObjectData(type.get());
+                            if (optEntDat.isPresent()) {
+                                EntityData data = optEntDat.get();
+                                wrapper.set(Type.BYTE, 0, ((Integer) data.getReplacementId()).byteValue());
+                                if (data.getObjectData() != -1)
+                                    wrapper.set(Type.INT, 0, data.getObjectData());
+                            }
+                        } else {
+                            if (Via.getManager().isDebug()) {
+                                ViaBackwards.getPlatform().getLogger().warning("Could not find Entity Type" + wrapper.get(Type.BYTE, 0));
+                            }
+                        }
+                    }
+                });
+
+                // Handle FallingBlock blocks
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Optional<EntityType1_12.ObjectType> type = EntityType1_12.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                        if (type.isPresent() && type.get().equals(EntityType1_12.ObjectType.FALLING_BLOCK)) {
+                            int objectData = wrapper.get(Type.INT, 0);
+                            int objType = objectData & 4095;
+                            int data = objectData >> 12 & 15;
+
+                            Block block = getProtocol().getBlockItemPackets().handleBlock(objType, data);
+                            if (block == null)
+                                return;
+                            
+                            wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Spawn Experience Orb
+        protocol.registerOutgoing(State.PLAY, 0x01, 0x01, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType1_10.ObjectType.THROWN_EXP_BOTTLE.getType()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Global Entity
+        protocol.registerOutgoing(State.PLAY, 0x02, 0x02, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Type
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.WEATHER // Always thunder according to wiki.vg
+                        );
+                    }
+                });
+            }
+        });
+
+        // Spawn Mob
+        protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity id
+                map(Type.UUID); // 1 - UUID
+                map(Type.UNSIGNED_BYTE); // 2 - Entity Type
+                map(Type.DOUBLE); // 3 - X
+                map(Type.DOUBLE); // 4 - Y
+                map(Type.DOUBLE); // 5 - Z
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+                map(Types1_9.METADATA_LIST); // 12 - Metadata
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType1_10.getTypeFromId(wrapper.get(Type.UNSIGNED_BYTE, 0), false)
+                        );
+                    }
+                });
+
+                // Rewrite entity type / metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+                        AbstractEntityType type = getEntityType(wrapper.user(), entityId);
+
+                        MetaStorage storage = new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0));
+                        handleMeta(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                storage
+                        );
+
+                        Optional<EntityData> optEntDat = getEntityData(type);
+                        if (optEntDat.isPresent()) {
+                            EntityData data = optEntDat.get();
+                            wrapper.set(Type.UNSIGNED_BYTE, 0, ((Integer) data.getReplacementId()).shortValue());
+                            if (data.hasBaseMeta())
+                                data.getDefaultMeta().handle(storage);
+                        }
+
+                        // Rewrite Metadata
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                storage.getMetaDataList()
+                        );
+                    }
+                });
+
+            }
+        });
+
+        // Spawn Painting
+        protocol.registerOutgoing(State.PLAY, 0x04, 0x04, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                // Track entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PAINTING
+                        );
+                    }
+                });
+            }
+        });
+
+        // Join game
+        protocol.registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.UNSIGNED_BYTE); // 1 - Gamemode
+                map(Type.INT); // 2 - Dimension
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 1);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Respawn Packet (save dimension id)
+        protocol.registerOutgoing(State.PLAY, 0x33, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Dimension ID
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+                        int dimensionId = wrapper.get(Type.INT, 0);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Spawn Player
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+                map(Type.DOUBLE); // 2 - X
+                map(Type.DOUBLE); // 3 - Y
+                map(Type.DOUBLE); // 4 - Z
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+                map(Types1_9.METADATA_LIST); // 7 - Metadata list
+
+                // Track Entity
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        addTrackedEntity(
+                                wrapper.user(),
+                                wrapper.get(Type.VAR_INT, 0),
+                                EntityType.PLAYER
+                        );
+                    }
+                });
+
+                // Rewrite Metadata
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+
+        // Destroy entities
+        protocol.registerOutgoing(State.PLAY, 0x30, 0x30, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT_ARRAY); // 0 - Entity IDS
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0))
+                            getEntityTracker(wrapper.user()).removeEntity(entity);
+                    }
+                });
+            }
+        });
+
+        // Metadata packet
+        protocol.registerOutgoing(State.PLAY, 0x39, 0x39, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Types1_9.METADATA_LIST); // 1 - Metadata list
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.set(
+                                Types1_9.METADATA_LIST,
+                                0,
+                                handleMeta(
+                                        wrapper.user(),
+                                        wrapper.get(Type.VAR_INT, 0),
+                                        new MetaStorage(wrapper.get(Types1_9.METADATA_LIST, 0))
+                                ).getMetaDataList()
+                        );
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        regEntType(EntityType.POLAR_BEAR, EntityType.SHEEP).mobName("Polar Bear");
+
+        // Change the sheep color when the polar bear is standing up (index 13 -> Standing up)
+        registerMetaHandler().filter(EntityType.POLAR_BEAR, 13).handle((e -> {
+            Metadata data = e.getData();
+            boolean b = (boolean) data.getValue();
+
+            data.setMetaType(MetaType1_9.Byte);
+            data.setValue(b ? (byte) (14 & 0x0F) : (byte) (0));
+
+            return data;
+        }));
+
+
+        // Handle husk (index 13 -> Zombie Type)
+        registerMetaHandler().filter(EntityType.ZOMBIE, 13).handle(e -> {
+            Metadata data = e.getData();
+
+            if ((int) data.getValue() == 6) // Is type Husk
+                data.setValue(0);
+
+            return data;
+        });
+
+        // Handle Stray (index 12 -> Skeleton Type)
+        registerMetaHandler().filter(EntityType.SKELETON, 12).handle(e -> {
+            Metadata data = e.getData();
+
+            if ((int) data.getValue() == 2)
+                data.setValue(0); // Change to default skeleton
+
+            return data;
+        });
+
+        // Handle the missing NoGravity tag for every metadata
+        registerMetaHandler().handle(e -> {
+            Metadata data = e.getData();
+
+            if (data.getId() == 5)
+                throw new RemovedValueException();
+            else if (data.getId() >= 5)
+                data.setId(data.getId() - 1);
+
+            return data;
+        });
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java

@@ -1,25 +1,17 @@
 /*
+ * Copyright (c) 2016 Matsv
  *
- *     Copyright (C) 2016 Matsv
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
 
-import nl.matsv.viabackwards.api.rewriters.SoundIdRewriter;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9To1_10;
+import nl.matsv.viabackwards.api.rewriters.SoundRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
@@ -27,7 +19,7 @@ import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class SoundPackets extends SoundIdRewriter<Protocol1_9To1_10> {
+public class SoundPackets1_10 extends SoundRewriter<Protocol1_9_4To1_10> {
     protected static ValueTransformer<Float, Short> toOldPitch = new ValueTransformer<Float, Short>(Type.UNSIGNED_BYTE) {
         public Short transform(PacketWrapper packetWrapper, Float inputValue) throws Exception {
             return (short) Math.round(inputValue * 63.5F);
@@ -35,7 +27,7 @@ public class SoundPackets extends SoundIdRewriter<Protocol1_9To1_10> {
     };
 
     @Override
-    protected void registerPackets(Protocol1_9To1_10 protocol) {
+    protected void registerPackets(Protocol1_9_4To1_10 protocol) {
         // Named sound effect
         protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() {
             @Override
@@ -82,32 +74,33 @@ public class SoundPackets extends SoundIdRewriter<Protocol1_9To1_10> {
 
     @Override
     protected void registerRewrites() {
-        rewriteSound(24, -1); // Enchantment table sound
-
+        added(24, -1); // Enchantment table sound
+        
         // Husk
-        rewriteSound(249, 400); // Husk -> Zombie ambient
-        rewriteSound(250, 404); // Husk -> Zombie death
-        rewriteSound(251, 405); // Husk -> Zombie hurt
-        rewriteSound(252, 407); // Husk -> Zombie step
+        added(249, 381); // Husk -> Zombie ambient
+        added(250, 385); // Husk -> Zombie death
+        added(251, 386); // Husk -> Zombie hurt
+        added(252, 388); // Husk -> Zombie step
 
         // Polar bear
-        rewriteSound(301, 400, .6F); // Polar bear ambient
-        rewriteSound(302, 400, 1.9F); // Polar baby bear ambient
-        rewriteSound(303, 404, .7F); // Polar bear death
-        rewriteSound(304, 320, .6F); // Polar bear hurt
-        rewriteSound(305, 241, .6F); // Polar bear step
-        rewriteSound(306, 393, 1.2F); // Polar bear warning
+        added(301, 381, .6F); // Polar bear ambient -> Zombie ambient
+        added(302, 381, 1.9F); // Polar baby bear ambient -> Zombie ambient
+        added(303, 385, .7F); // Polar bear death -> Zombie death
+        added(304, 309, .6F); // Polar bear hurt -> Shulker hurt
+        added(305, 240, .6F); // Polar bear step -> Horse step
+        added(306, 374, 1.2F); // Polar bear warning -> Wolf growl
 
         // Stray
-        rewriteSound(365, 331); // Stray -> Skeleton ambient
-        rewriteSound(366, 332); // Stray -> Skeleton death
-        rewriteSound(367, 333); // Stray -> Skeleton hurt
-        rewriteSound(368, 335); // Stray -> Skeleton step
+        added(365, 320); // Stray -> Skeleton ambient
+        added(366, 321); // Stray -> Skeleton death
+        added(367, 322); // Stray -> Skeleton hurt
+        added(368, 324); // Stray -> Skeleton step
 
         // Wither skeleton
-        rewriteSound(387, 331); // Wither skeleton -> Skeleton ambient
-        rewriteSound(388, 332); // Wither skeleton -> Skeleton death
-        rewriteSound(389, 333); // Wither skeleton -> Skeleton hurt
-        rewriteSound(390, 335); // Wither skeleton -> Skeleton step
+        added(387, 320); // Wither skeleton -> Skeleton ambient
+        added(388, 321); // Wither skeleton -> Skeleton death
+        added(389, 322); // Wither skeleton -> Skeleton hurt
+        added(390, 324); // Wither skeleton -> Skeleton step
     }
+
 }

core/src/main/java/nl/matsv/viabackwards/utils/Block.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.utils;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@AllArgsConstructor
+@EqualsAndHashCode
+@Data
+public class Block {
+    private int id;
+    private int data;
+
+    public Block clone() {
+        return new Block(id, data);
+    }
+}

core/src/main/java/nl/matsv/viabackwards/utils/ItemUtil.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.utils;
+
+import us.myles.ViaVersion.api.minecraft.item.Item;
+
+public class ItemUtil {
+
+    public static Item copyItem(Item item) {
+        if (item == null) return null;
+        return new Item(item.getId(), item.getAmount(), item.getData(), item.getTag() != null ? item.getTag().clone() : null);
+    }
+}

pom.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ Copyright (c) 2016 Matsv
   ~
-  ~     Copyright (C) 2016 Matsv
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
   ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
   ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -23,40 +15,39 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>nl.matsv</groupId>
-    <artifactId>viabackwards</artifactId>
-    <version>1.0</version>
+    <artifactId>viabackwards-parent</artifactId>
+    <version>2.1</version>
+    <packaging>pom</packaging>
+
+    <description>Allow newer clients to join older server versions.</description>
+    <inceptionYear>2016</inceptionYear>
+    <url>https://www.spigotmc.org/resources/viaversion.19254/</url>
+
+    <modules>
+        <module>core</module>
+        <module>bukkit</module>
+        <module>bungee</module>
+        <module>sponge</module>
+        <module>all</module>
+    </modules>
+
+    <properties>
+        <!-- Project Properties -->
+        <projectEncoding>UTF-8</projectEncoding>
+        <project.build.sourceEncoding>${projectEncoding}</project.build.sourceEncoding>
+        <project.build.outputEncoding>${projectEncoding}</project.build.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
     <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>viaversion-repo</id>
-            <url>https://repo.viaversion.com/</url>
+            <url>https://repo.viaversion.com</url>
         </repository>
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.10.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>us.myles</groupId>
-            <artifactId>viaversion</artifactId>
-            <version>0.9.8-SNAPSHOT</version>
-        </dependency>
-        <!-- Netty (Network Library) -->
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.0.20.Final</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -64,43 +55,18 @@
             <version>1.16.6</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>19.0</version>
+        </dependency>
+        <!--ViaVersion -->
+        <dependency>
+            <groupId>us.myles</groupId>
+            <artifactId>viaversion</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-
-    <build>
-        <finalName>${project.name}-${project.version}</finalName>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <defaultGoal>clean install</defaultGoal>
-
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>false</filtering>
-                <directory>.</directory>
-                <includes>
-                    <include>LICENSE</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>src/main/resources/</directory>
-                <includes>
-                    <include>*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <showWarnings>false</showWarnings>
-                    <showDeprecation>false</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

sponge/pom.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016 Matsv
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viabackwards-parent</artifactId>
+        <groupId>nl.matsv</groupId>
+        <version>2.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viabackwards-sponge</artifactId>
+
+    <build>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>*</include>
+                </includes>
+            </resource>
+        </resources>
+        <!-- Stolen from ViaVersion ;) -->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>filter-src</id>
+                        <goals>
+                            <goal>filter-sources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>sponge-maven-repo</id>
+            <name>Sponge maven repo</name>
+            <url>http://repo.spongepowered.org/maven</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- Common Module -->
+        <dependency>
+            <groupId>nl.matsv</groupId>
+            <artifactId>viabackwards-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <!-- Sponge API -->
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>spongeapi</artifactId>
+            <version>LATEST</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

sponge/src/main/java-templates/nl/matsv/viabackwards/sponge/VersionInfo.java

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards.sponge;
+
+public class VersionInfo {
+    public static final String VERSION = "${project.version}";
+}

sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016 Matsv
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.matsv.viabackwards;
+
+import com.google.inject.Inject;
+import nl.matsv.viabackwards.api.ViaBackwardsPlatform;
+import nl.matsv.viabackwards.sponge.VersionInfo;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.game.state.GameAboutToStartServerEvent;
+import org.spongepowered.api.plugin.Dependency;
+import org.spongepowered.api.plugin.Plugin;
+import org.spongepowered.api.plugin.PluginContainer;
+import us.myles.ViaVersion.sponge.util.LoggerWrapper;
+
+import java.util.logging.Logger;
+
+@Plugin(id = "viabackwards",
+        name = "ViaBackwards",
+        version = VersionInfo.VERSION,
+        authors = {"Matsv"},
+        description = "Allow older Minecraft versions to connect to an newer server version.",
+        dependencies = {@Dependency(id = "viaversion")}
+)
+public class SpongePlugin implements ViaBackwardsPlatform {
+    private Logger logger;
+    @Inject
+    private PluginContainer container;
+
+    @Listener
+    public void onServerStart(GameAboutToStartServerEvent e) {
+        // Setup Logger
+        this.logger = new LoggerWrapper(container.getLogger());
+        // Init!
+        this.init();
+    }
+
+    @Override
+    public Logger getLogger() {
+        return logger;
+    }
+
+    // TODO check how to for sponge, site was offline
+    @Override
+    public void disable() {
+
+    }
+}

src/main/java/nl/matsv/viabackwards/ViaBackwards.java

@@ -1,35 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards;
-
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9To1_10;
-import org.bukkit.plugin.java.JavaPlugin;
-import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
-import us.myles.ViaVersion.api.protocol.ProtocolVersion;
-
-import java.util.Collections;
-
-public class ViaBackwards extends JavaPlugin {
-
-    @Override
-    public void onEnable() {
-        // Register the protocol
-        ProtocolRegistry.registerProtocol(new Protocol1_9To1_10(), Collections.singletonList(ProtocolVersion.v1_9_3.getId()), ProtocolVersion.v1_10.getId());
-    }
-}

src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java

@@ -1,25 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api;
-
-import us.myles.ViaVersion.api.protocol.Protocol;
-
-public abstract class BackwardsProtocol extends Protocol {
-
-}

src/main/java/nl/matsv/viabackwards/api/MetaRewriter.java

@@ -1,26 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api;
-
-import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
-import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
-
-public interface MetaRewriter {
-    Metadata handleMetadata(boolean isObject, int entityType, Metadata data) throws RemovedValueException;
-}

src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java

@@ -1,24 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.exceptions;
-
-import java.io.IOException;
-
-public class RemovedValueException extends IOException {
-}

src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java

@@ -1,115 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.rewriters;
-
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.utils.Block;
-import nl.matsv.viabackwards.utils.ItemUtil;
-import us.myles.ViaVersion.api.minecraft.item.Item;
-import us.myles.viaversion.libs.opennbt.conversion.builtin.CompoundTagConverter;
-import us.myles.viaversion.libs.opennbt.tag.builtin.*;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public abstract class BlockItemRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
-    private static final CompoundTagConverter converter = new CompoundTagConverter();
-    private final Map<Short, Item> itemRewriter = new ConcurrentHashMap<>();
-    private final Map<Integer, Block> blockRewriter = new ConcurrentHashMap<>();
-
-    protected void rewriteItem(int oldItem, Item newItem) {
-        itemRewriter.put((short) oldItem, newItem);
-    }
-
-    protected void rewriteBlockItem(int oldId, Item newItem, Block newBlock) {
-        itemRewriter.put((short) oldId, newItem);
-        blockRewriter.put(oldId, newBlock);
-    }
-
-    protected Item handleItemToClient(Item item) {
-        if (item == null)
-            return null;
-        if (!itemRewriter.containsKey(item.getId()))
-            return item;
-        Item i = ItemUtil.copyItem(itemRewriter.get(item.getId()));
-
-        if (i.getTag() == null)
-            i.setTag(new CompoundTag(""));
-        i.getTag().put(createViaNBT(item));
-
-        if (item.getTag() != null)
-            for (Tag ai : item.getTag())
-                i.getTag().put(ai);
-
-        i.setAmount(item.getAmount());
-        return i;
-    }
-
-    protected Item handleItemToServer(Item item) {
-        if (item == null || item.getTag() == null)
-            return null;
-        CompoundTag tag = item.getTag();
-        if (tag.contains("ViaBackwards")) {
-            CompoundTag via = tag.get("ViaBackwards");
-
-            short id = (short) via.get("id").getValue();
-            short data = (short) via.get("data").getValue();
-            byte amount = (byte) via.get("amount").getValue();
-            CompoundTag extras = via.get("extras");
-
-            item.setId(id);
-            item.setData(data);
-            item.setAmount(amount);
-            item.setTag(converter.convert("", converter.convert(extras)));
-            // Remove data tag
-            tag.remove("ViaBackwards");
-        }
-        return item;
-    }
-
-    protected Block handleBlock(int block) {
-        if (!containsBlock(block))
-            return null;
-
-        return blockRewriter.get(block);
-    }
-
-    protected boolean containsBlock(int block) {
-        return blockRewriter.containsKey(block);
-    }
-
-    private CompoundTag createViaNBT(Item i) {
-        CompoundTag tag = new CompoundTag("ViaBackwards");
-        tag.put(new ShortTag("id", i.getId()));
-        tag.put(new ShortTag("data", i.getData()));
-        tag.put(new ByteTag("amount", i.getAmount()));
-        if (i.getTag() != null) {
-            tag.put(converter.convert("extras", converter.convert(i.getTag())));
-        } else
-            tag.put(new CompoundTag("extras"));
-        return tag;
-    }
-
-    protected CompoundTag getNamedTag(String text) {
-        CompoundTag tag = new CompoundTag("");
-        tag.put(new CompoundTag("display"));
-        ((CompoundTag) tag.get("display")).put(new StringTag("Name", text));
-        return tag;
-    }
-}

src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java

@@ -1,115 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.rewriters;
-
-import lombok.RequiredArgsConstructor;
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.MetaRewriter;
-import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
-import nl.matsv.viabackwards.api.storage.EntityType;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-@RequiredArgsConstructor
-public abstract class EntityRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
-    private final Map<Short, Short> entityTypes = new ConcurrentHashMap<>();
-    private final Map<Short, Short> objectTypes = new ConcurrentHashMap<>();
-
-    private final List<MetaRewriter> metaRewriters = new ArrayList<>();
-
-    protected short getNewEntityType(UserConnection connection, int id) {
-        EntityType type = getEntityType(connection, id);
-        if (type.isObject()) {
-            return getNewObjectId(type.getEntityType());
-        } else {
-            return getNewEntityId(type.getEntityType());
-        }
-    }
-
-    protected EntityType getEntityType(UserConnection connection, int id) {
-        return connection.get(EntityTracker.class).getEntityType(id);
-    }
-
-    protected void addTrackedEntity(UserConnection connection, int entityId, boolean isObject, short typeId) {
-        connection.get(EntityTracker.class).trackEntityType(entityId, new EntityType(isObject, typeId));
-    }
-
-    protected void rewriteEntityId(int oldId, int newId) {
-        entityTypes.put((short) oldId, (short) newId);
-    }
-
-    protected boolean isRewriteEntityId(short id) {
-        return entityTypes.containsKey(id);
-    }
-
-    protected short getNewEntityId(short oldId) {
-        if (!isRewriteEntityId(oldId))
-            return oldId;
-        return entityTypes.get(oldId);
-    }
-
-    protected void rewriteObjectId(int oldId, int newId) {
-        objectTypes.put((short) oldId, (short) newId);
-    }
-
-    protected boolean isRewriteObjectId(short id) {
-        return objectTypes.containsKey(id);
-    }
-
-    protected short getNewObjectId(short oldId) {
-        if (!isRewriteObjectId(oldId))
-            return oldId;
-        return objectTypes.get(oldId);
-    }
-
-    public void registerMetaRewriter(MetaRewriter rewriter) {
-        metaRewriters.add(rewriter);
-    }
-
-    protected List<Metadata> handleMeta(UserConnection userConnection, int entityId, List<Metadata> metaData) {
-        EntityTracker tracker = userConnection.get(EntityTracker.class);
-        EntityType type = tracker.getEntityType(entityId);
-
-        List<Metadata> newMeta = new CopyOnWriteArrayList<>();
-        for (Metadata md : metaData) {
-            Metadata nmd = md;
-            try {
-                for (MetaRewriter rewriter : metaRewriters) {
-                    if (type != null)
-                        nmd = rewriter.handleMetadata(type.isObject(), type.getEntityType(), nmd);
-                    else
-                        nmd = rewriter.handleMetadata(false, -1, nmd);
-                    if (nmd == null)
-                        throw new RemovedValueException();
-                }
-                newMeta.add(nmd);
-            } catch (RemovedValueException ignored) {
-            }
-        }
-
-        return newMeta;
-    }
-}

src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java

@@ -1,44 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.rewriters;
-
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-
-public abstract class Rewriter<T extends BackwardsProtocol> {
-
-    /**
-     * Register everything
-     */
-    public void register(T protocol) {
-        registerPackets(protocol);
-        registerRewrites();
-    }
-
-    /**
-     * Register packet listeners
-     *
-     * @param protocol Protocol instance
-     */
-    protected abstract void registerPackets(T protocol);
-
-    /**
-     * Register rewrites
-     */
-    protected abstract void registerRewrites();
-}

src/main/java/nl/matsv/viabackwards/api/rewriters/SoundIdRewriter.java

@@ -1,59 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.rewriters;
-
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public abstract class SoundIdRewriter<T extends BackwardsProtocol> extends Rewriter<T> {
-    private Map<Integer, Integer> soundRewriter = new ConcurrentHashMap<>();
-    private Map<Integer, Float> pitchRewriter = new ConcurrentHashMap<>();
-
-    protected void rewriteSound(int newId, int oldId) {
-        soundRewriter.put(newId, oldId);
-    }
-
-    protected void rewriteSound(int newId, int oldId, float newPitch) {
-        rewriteSound(newId, oldId);
-        pitchRewriter.put(newId, newPitch);
-    }
-
-    public int handleSounds(int soundId) {
-        int newSoundId = soundId;
-        if (soundRewriter.containsKey(soundId))
-            newSoundId = soundId = soundRewriter.get(soundId);
-        for (Integer i : soundRewriter.keySet()) {
-            if (soundId > i)
-                newSoundId--;
-        }
-        return newSoundId;
-    }
-
-    public boolean hasPitch(int soundId) {
-        return pitchRewriter.containsKey(soundId);
-    }
-
-    public float handlePitch(int soundId) {
-        if (pitchRewriter.containsKey(soundId))
-            return pitchRewriter.get(soundId);
-        return -1;
-    }
-}

src/main/java/nl/matsv/viabackwards/api/storage/EntityTracker.java

@@ -1,51 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.storage;
-
-import us.myles.ViaVersion.api.data.StoredObject;
-import us.myles.ViaVersion.api.data.UserConnection;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class EntityTracker extends StoredObject {
-    private Map<Integer, EntityType> entityMap = new ConcurrentHashMap<>();
-
-    public EntityTracker(UserConnection user) {
-        super(user);
-    }
-
-    public void trackEntityType(int id, EntityType type) {
-        if (entityMap.containsKey(id))
-            return;
-        entityMap.put(id, type);
-    }
-
-    public void removeEntity(int id) {
-        entityMap.remove(id);
-    }
-
-    public EntityType getEntityType(int id) {
-        return entityMap.get(id);
-    }
-
-    public boolean containsEntity(int id) {
-        return entityMap.containsKey(id);
-    }
-}

src/main/java/nl/matsv/viabackwards/api/storage/EntityType.java

@@ -1,31 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.api.storage;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@AllArgsConstructor
-@EqualsAndHashCode
-public class EntityType {
-    private boolean object;
-    private short entityType;
-}

src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9To1_10.java

@@ -1,49 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10;
-
-import lombok.Getter;
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.ChangedPackets;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.EntityPackets;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.SoundPackets;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
-
-@Getter
-public class Protocol1_9To1_10 extends BackwardsProtocol {
-    private EntityPackets entityPackets; // Required for the item rewriter
-
-    protected void registerPackets() {
-        new ChangedPackets().register(this);
-        new SoundPackets().register(this);
-        (entityPackets = new EntityPackets()).register(this);
-        new BlockItemPackets().register(this);
-    }
-
-    public void init(UserConnection user) {
-        user.put(new ClientWorld(user));
-
-        // Register EntityTracker if it doesn't exist yet.
-        if (!user.has(EntityTracker.class))
-            user.put(new EntityTracker(user));
-    }
-}

src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/chunks/Chunk1_10.java

@@ -1,43 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
-import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-public class Chunk1_10 implements Chunk {
-    private int x;
-    private int z;
-    private boolean groundUp;
-    private int bitmask;
-    private ChunkSection1_10[] sections;
-    private byte[] biomeData;
-    List<CompoundTag> blockEntities;
-
-    @Override
-    public boolean isBiomeData() {
-        return biomeData != null;
-    }
-}

src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/chunks/Chunk1_10Type.java

@@ -1,122 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.bukkit.World;
-import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
-import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
-import us.myles.ViaVersion.api.type.PartialType;
-import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
-import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
-import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.List;
-
-public class Chunk1_10Type extends PartialType<Chunk, ClientWorld> {
-
-    public Chunk1_10Type(ClientWorld param) {
-        super(param, Chunk.class);
-    }
-
-    @Override
-    public Chunk read(ByteBuf input, ClientWorld world) throws Exception {
-        int chunkX = input.readInt();
-        int chunkZ = input.readInt();
-
-        boolean groundUp = input.readBoolean();
-        int primaryBitmask = Type.VAR_INT.read(input);
-        int size = Type.VAR_INT.read(input);
-
-        BitSet usedSections = new BitSet(16);
-        ChunkSection1_10[] sections = new ChunkSection1_10[16];
-        // Calculate section count from bitmask
-        for (int i = 0; i < 16; i++) {
-            if ((primaryBitmask & (1 << i)) != 0) {
-                usedSections.set(i);
-            }
-        }
-
-        // Read sections
-        for (int i = 0; i < 16; i++) {
-            if (!usedSections.get(i)) continue; // Section not set
-            ChunkSection1_10 section = new ChunkSection1_10();
-            sections[i] = section;
-            section.readBlocks(input);
-            section.readBlockLight(input);
-            if (world.getEnvironment() == World.Environment.NORMAL) {
-                section.readSkyLight(input);
-            }
-        }
-
-        byte[] biomeData = groundUp ? new byte[256] : null;
-        if (groundUp) {
-            input.readBytes(biomeData);
-        }
-
-        List<CompoundTag> nbtData = Arrays.asList(Type.NBT_ARRAY.read(input));
-
-        return new Chunk1_10(chunkX, chunkZ, groundUp, primaryBitmask, sections, biomeData, nbtData);
-    }
-
-    @Override
-    public void write(ByteBuf output, ClientWorld world, Chunk input) throws Exception {
-        if (!(input instanceof Chunk1_10))
-            throw new Exception("Tried to send the wrong chunk type from 1.9.3-4 chunk: " + input.getClass());
-        Chunk1_10 chunk = (Chunk1_10) input;
-
-        output.writeInt(chunk.getX());
-        output.writeInt(chunk.getZ());
-
-        output.writeBoolean(chunk.isGroundUp());
-        Type.VAR_INT.write(output, chunk.getBitmask());
-
-        ByteBuf buf = Unpooled.buffer();
-        for (int i = 0; i < 16; i++) {
-            ChunkSection section = chunk.getSections()[i];
-            if (section == null) continue; // Section not set
-            section.writeBlocks(buf);
-            section.writeBlockLight(buf);
-
-            if (!section.hasSkyLight()) continue; // No sky light, we're done here.
-            section.writeSkyLight(buf);
-
-        }
-        buf.readerIndex(0);
-        Type.VAR_INT.write(output, buf.readableBytes() + (chunk.isBiomeData() ? 256 : 0));
-        output.writeBytes(buf);
-        buf.release(); // release buffer
-
-        // Write biome data
-        if (chunk.isBiomeData()) {
-            output.writeBytes(chunk.getBiomeData());
-        }
-
-        Type.NBT_ARRAY.write(output, chunk.getBlockEntities().toArray(new CompoundTag[0]));
-    }
-
-    @Override
-    public Class<? extends Type> getBaseClass() {
-        return BaseChunkType.class;
-    }
-}

src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/chunks/ChunkSection1_10.java

@@ -1,314 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.chunks;
-
-import com.google.common.collect.Lists;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import lombok.Getter;
-import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
-import us.myles.ViaVersion.api.minecraft.chunks.NibbleArray;
-import us.myles.ViaVersion.api.type.Type;
-
-import java.util.List;
-
-/**
- * From the ViaVersion code {@link us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.ChunkSection1_9_1_2}
- */
-public class ChunkSection1_10 implements ChunkSection {
-    /**
-     * Size (dimensions) of blocks in a chunks section.
-     */
-    public static final int SIZE = 16 * 16 * 16; // width * depth * height
-    /**
-     * Length of the sky and block light nibble arrays.
-     */
-    public static final int LIGHT_LENGTH = 16 * 16 * 16 / 2; // size * size * size / 2 (nibble bit count)
-    /**
-     * Length of the block data array.
-     */
-    @Getter
-    private final List<Integer> palette = Lists.newArrayList();
-    private final int[] blocks;
-    private final NibbleArray blockLight;
-    private NibbleArray skyLight;
-
-    public ChunkSection1_10() {
-        this.blocks = new int[SIZE];
-        this.blockLight = new NibbleArray(SIZE);
-        palette.add(0); // AIR
-    }
-
-    /**
-     * Set a block in the chunks
-     *
-     * @param x    Block X
-     * @param y    Block Y
-     * @param z    Block Z
-     * @param type The type of the block
-     * @param data The data value of the block
-     */
-    public void setBlock(int x, int y, int z, int type, int data) {
-        setBlock(index(x, y, z), type, data);
-    }
-
-    public int getBlockId(int x, int y, int z) {
-        int index = blocks[index(x, y, z)];
-        return palette.get(index) >> 4;
-    }
-
-    /**
-     * Set a block in the chunks based on the index
-     *
-     * @param idx  Index
-     * @param type The type of the block
-     * @param data The data value of the block
-     */
-    public void setBlock(int idx, int type, int data) {
-        int hash = type << 4 | (data & 0xF);
-        int index = palette.indexOf(hash);
-        if (index == -1) {
-            index = palette.size();
-            palette.add(hash);
-        }
-
-        blocks[idx] = index;
-    }
-
-    /**
-     * Set the block light array
-     *
-     * @param data The value to set the block light to
-     */
-    public void setBlockLight(byte[] data) {
-        blockLight.setHandle(data);
-    }
-
-    /**
-     * Set the sky light array
-     *
-     * @param data The value to set the sky light to
-     */
-    public void setSkyLight(byte[] data) {
-        if (data.length != LIGHT_LENGTH) throw new IllegalArgumentException("Data length != " + LIGHT_LENGTH);
-        this.skyLight = new NibbleArray(data);
-    }
-
-    private int index(int x, int y, int z) {
-        return y << 8 | z << 4 | x;
-    }
-
-    /**
-     * Read blocks from input stream.
-     * This reads all the block related data:
-     * <ul>
-     * <li>Block length/palette type</li>
-     * <li>Palette</li>
-     * <li>Block hashes/palette reference</li>
-     * </ul>
-     *
-     * @param input The buffer to read from.
-     * @throws Exception
-     */
-    public void readBlocks(ByteBuf input) throws Exception {
-        palette.clear();
-
-        // Reaad bits per block
-        int bitsPerBlock = input.readUnsignedByte();
-        long maxEntryValue = (1L << bitsPerBlock) - 1;
-
-        if (bitsPerBlock == 0) {
-            bitsPerBlock = 13;
-        }
-        if (bitsPerBlock < 4) {
-            bitsPerBlock = 4;
-        }
-        if (bitsPerBlock > 8) {
-            bitsPerBlock = 13;
-        }
-        int paletteLength = Type.VAR_INT.read(input);
-        // Read palette
-        for (int i = 0; i < paletteLength; i++) {
-            if (bitsPerBlock != 13) {
-                palette.add(Type.VAR_INT.read(input));
-            } else {
-                Type.VAR_INT.read(input);
-            }
-        }
-
-        // Read blocks
-        Long[] blockData = Type.LONG_ARRAY.read(input);
-        if (blockData.length > 0) {
-            for (int i = 0; i < blocks.length; i++) {
-                int bitIndex = i * bitsPerBlock;
-                int startIndex = bitIndex / 64;
-                int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
-                int startBitSubIndex = bitIndex % 64;
-                int val;
-                if (startIndex == endIndex) {
-                    val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
-                } else {
-                    int endBitSubIndex = 64 - startBitSubIndex;
-                    val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
-                }
-
-                if (bitsPerBlock == 13) {
-                    int type = val >> 4;
-                    int data = val & 0xF;
-
-                    setBlock(i, type, data);
-                } else {
-                    blocks[i] = val;
-                }
-            }
-        }
-    }
-
-    /**
-     * Read block light from buffer.
-     *
-     * @param input The buffer to read from
-     */
-    public void readBlockLight(ByteBuf input) {
-        byte[] handle = new byte[LIGHT_LENGTH];
-        input.readBytes(handle);
-        blockLight.setHandle(handle);
-    }
-
-    /**
-     * Read sky light from buffer.
-     * Note: Only sent in overworld!
-     *
-     * @param input The buffer to read from
-     */
-    public void readSkyLight(ByteBuf input) {
-        byte[] handle = new byte[LIGHT_LENGTH];
-        input.readBytes(handle);
-        if (skyLight != null) {
-            skyLight.setHandle(handle);
-            return;
-        }
-
-        this.skyLight = new NibbleArray(handle);
-    }
-
-    /**
-     * Write the blocks to a buffer.
-     *
-     * @param output The buffer to write to.
-     * @throws Exception Throws if it failed to write.
-     */
-    public void writeBlocks(ByteBuf output) throws Exception {
-        // Write bits per block
-        int bitsPerBlock = 4;
-        while (palette.size() > 1 << bitsPerBlock) {
-            bitsPerBlock += 1;
-        }
-        long maxEntryValue = (1L << bitsPerBlock) - 1;
-        output.writeByte(bitsPerBlock);
-
-        // Write pallet (or not)
-        Type.VAR_INT.write(output, palette.size());
-        for (int mappedId : palette) {
-            Type.VAR_INT.write(output, mappedId);
-        }
-
-        int length = (int) Math.ceil(SIZE * bitsPerBlock / 64.0);
-        Type.VAR_INT.write(output, length);
-        long[] data = new long[length];
-        for (int index = 0; index < blocks.length; index++) {
-            int value = blocks[index];
-            int bitIndex = index * bitsPerBlock;
-            int startIndex = bitIndex / 64;
-            int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
-            int startBitSubIndex = bitIndex % 64;
-            data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
-            if (startIndex != endIndex) {
-                int endBitSubIndex = 64 - startBitSubIndex;
-                data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
-            }
-        }
-        for (long l : data) {
-            Type.LONG.write(output, l);
-        }
-    }
-
-    /**
-     * Write the block light to a buffer
-     *
-     * @param output The buffer to write to
-     */
-    public void writeBlockLight(ByteBuf output) {
-        output.writeBytes(blockLight.getHandle());
-    }
-
-    /**
-     * Write the sky light to a buffer
-     *
-     * @param output The buffer to write to
-     */
-    public void writeSkyLight(ByteBuf output) {
-        output.writeBytes(skyLight.getHandle());
-    }
-
-    /**
-     * Check if sky light is present
-     *
-     * @return True if skylight is present
-     */
-    public boolean hasSkyLight() {
-        return skyLight != null;
-    }
-
-    /**
-     * Get expected size of this chunks section.
-     *
-     * @return Amount of bytes sent by this section
-     * @throws Exception If it failed to calculate bits properly
-     */
-    public int getExpectedSize() throws Exception {
-        int bitsPerBlock = palette.size() > 255 ? 16 : 8;
-        int bytes = 1; // bits per block
-        bytes += paletteBytes(); // palette
-        bytes += countBytes(bitsPerBlock == 16 ? SIZE * 2 : SIZE); // block data length
-        bytes += (palette.size() > 255 ? 2 : 1) * SIZE; // block data
-        bytes += LIGHT_LENGTH; // block light
-        bytes += hasSkyLight() ? LIGHT_LENGTH : 0; // sky light
-        return bytes;
-    }
-
-    private int paletteBytes() throws Exception {
-        // Count bytes used by pallet
-        int bytes = countBytes(palette.size());
-        for (int mappedId : palette) {
-            bytes += countBytes(mappedId);
-        }
-        return bytes;
-    }
-
-    private int countBytes(int value) throws Exception {
-        // Count amount of bytes that would be sent if the value were sent as a VarInt
-        ByteBuf buf = Unpooled.buffer();
-        Type.VAR_INT.write(buf, value);
-        buf.readerIndex(0);
-        int bitCount = buf.readableBytes();
-        buf.release();
-        return bitCount;
-    }
-}

src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets.java

@@ -1,40 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
-
-import nl.matsv.viabackwards.api.BackwardsProtocol;
-import us.myles.ViaVersion.api.remapper.PacketRemapper;
-import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.packets.State;
-
-public class ChangedPackets {
-
-    public void register(BackwardsProtocol protocol) {
-        /* ServerBound packets */
-
-        // ResourcePack status
-        protocol.registerIncoming(State.PLAY, 0x16, 0x16, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.STRING, Type.NOTHING); // 0 - Hash
-                map(Type.VAR_INT); // 1 - Result
-            }
-        });
-    }
-}

src/main/java/nl/matsv/viabackwards/utils/Block.java

@@ -1,31 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.utils;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@AllArgsConstructor
-@EqualsAndHashCode
-@Data
-public class Block {
-    private int id;
-    private int data;
-}

src/main/java/nl/matsv/viabackwards/utils/ItemUtil.java

@@ -1,29 +0,0 @@
-/*
- *
- *     Copyright (C) 2016 Matsv
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package nl.matsv.viabackwards.utils;
-
-import us.myles.ViaVersion.api.minecraft.item.Item;
-
-public class ItemUtil {
-
-    public static Item copyItem(Item item) {
-        if (item == null) return null;
-        return new Item(item.getId(), item.getAmount(), item.getData(), item.getTag() != null ? item.getTag().clone() : null);
-    }
-}