1.5.3 Stable release!!!!

Changed from int to byte

LICENSE

@@ -1,281 +1,622 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  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
-this service 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.
+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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  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 give the recipients all the rights that
-you have.  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.
+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.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  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.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  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.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  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.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  "This License" refers to version 3 of the GNU General Public License.
 
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "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.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  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.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  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.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  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.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  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.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  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.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  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.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  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.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  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.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  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.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  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.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+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.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  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.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  14. Revised Versions of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  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.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  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.
 
-                            NO WARRANTY
+  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.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
+  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
 
@@ -287,15 +628,15 @@ 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
-convey the exclusion of warranty; and each file should have at least
+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
+    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 2 of the License, or
+    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,
@@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
     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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+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 your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  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
+<https://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -2,27 +2,22 @@
 
 A lightweight spigot packetlistener & packetsender coded by retrooper.
 
-## Credit:
-
-PacketEvents uses a modified version of [TinyProtocol](http://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java) by [@DeprecatedLuke](https://github.com/DeprecatedLuke) to support 1.7.10 & 1.8.
-I modified DeprecatedLuke's version of TinyProtocol and added support for 1.9+ versions.
-
-PacketEvents also took Atlas' Packet class.(all the packet names)
-
 ## About
 
 This packetlistener is **only** supported on spigot servers and has been tested to work on these spigot forks: PaperSpigot, Tuinity
 
 * No dependencies
 
-* Licensed under the GPL2 license.
+* Licensed under the GPL3 license.
 
-[![](https://img.shields.io/badge/License-GPLv2-blue.svg)](https://www.gnu.org/licenses/gpl-2.0)
+[![](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 Join my discord server(to talk to me): https://discord.gg/ZWTkg4v
 
 [![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)
 
+[![](https://jitci.com/gh/retrooper/packetevents/svg)](https://jitci.com/gh/retrooper/packetevents)
+
 To learn how to setup this API please click on the link below
 [Setup Guide](https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)
 (or just paste this into your browser: https://github.com/retrooper/packetevents/wiki/PacketEvents-Setup-Guide)

packetevents.iml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.7.10:1.7.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.spigot:1.8.8:1.8.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-common:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.18" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bukkit-legacy:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-bungee:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-fabric:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-sponge-legacy:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: us.myles:viaversion-velocity:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ProtocolSupport:ProtocolSupport:4fdd683" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.2.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+  </component>
+</module>

pom.xml

@@ -6,43 +6,37 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.3.2</version>
+    <version>1.5.3</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
+
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+
+    <!-- You can build the project with this: "mvn clean compile assembly:single" -->
     <build>
-        <defaultGoal>clean package</defaultGoal>
         <plugins>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
-
     <repositories>
         <repository>
             <id>spigot-repo</id>
@@ -56,129 +50,68 @@
             <id>funkemunky-releases</id>
             <url>https://nexus.funkemunky.cc/content/repositories/releases/</url>
         </repository>
+        <repository>
+            <id>viaversion-repo</id>
+            <url>https://repo.viaversion.com</url>
+        </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
     </repositories>
 
 
     <dependencies>
+
         <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.1</artifactId>
-            <version>1.14.1</version>
+        <groupId>org.github.spigot</groupId>
+        <artifactId>1.8.8</artifactId>
+        <version>1.8.8</version>
+        <scope>provided</scope>
+    </dependency>
+        <dependency>
+        <groupId>org.github.spigot</groupId>
+        <artifactId>1.7.10</artifactId>
+        <version>1.7.10</version>
+        <scope>provided</scope>
+    </dependency>
+
+
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.5.0</version>
+            <scope>provided</scope>
+          </dependency>
+        <!-- ViaVersion API-->
+        <dependency>
+            <groupId>us.myles</groupId>
+            <artifactId>viaversion</artifactId>
+            <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- ProtocolSupport API-->
         <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15.1</artifactId>
-            <version>1.15.1</version>
+            <groupId>com.github.ProtocolSupport</groupId>
+            <artifactId>ProtocolSupport</artifactId>
+            <version>4fdd683</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.3</artifactId>
-            <version>1.14.3</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14.2</artifactId>
-            <version>1.14.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15</artifactId>
-            <version>1.15</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.15.2</artifactId>
-            <version>1.15.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.13.2</artifactId>
-            <version>1.13.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.7.10</artifactId>
-            <version>1.7.10</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8</artifactId>
-            <version>1.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8.3</artifactId>
-            <version>1.8.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.8.8</artifactId>
-            <version>1.8.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.9</artifactId>
-            <version>1.9</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.9.4</artifactId>
-            <version>1.9.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.10.2</artifactId>
-            <version>1.10.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.11.1</artifactId>
-            <version>1.11.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.11.2</artifactId>
-            <version>1.11.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.12.1</artifactId>
-            <version>1.12.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.12.2</artifactId>
-            <version>1.12.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.13</artifactId>
-            <version>1.13</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.github.spigot</groupId>
-            <artifactId>1.14</artifactId>
-            <version>1.14</version>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
     </dependencies>
 </project>

src/main/java/io/github/retrooper/packetevents/PacketEvents.java

@@ -1,271 +1,104 @@
 package io.github.retrooper.packetevents;
 
+import io.github.retrooper.packetevents.api.PacketEventsAPI;
 import io.github.retrooper.packetevents.enums.ClientVersion;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.annotations.PacketHandler;
 import io.github.retrooper.packetevents.event.PacketListener;
-import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PostPlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.ServerTickEvent;
-import io.github.retrooper.packetevents.event.manager.EventManager;
-import io.github.retrooper.packetevents.handler.TinyProtocolHandler;
-import io.github.retrooper.packetevents.packet.Packet;
-import io.github.retrooper.packetevents.packetwrappers.Sendable;
-import io.github.retrooper.packetevents.packetwrappers.login.WrappedPacketLoginHandshake;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packet.PacketTypeClasses;
+import io.github.retrooper.packetevents.settings.Settings;
+import io.github.retrooper.packetevents.utils.onlineplayers.OnlinePlayerUtilities;
+import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitTask;
-
-import io.github.retrooper.packetevents.annotations.Nullable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-
-public final class PacketEvents implements PacketListener{
-
-
-    /*
-     * Login wrappers TODO
-     * PacketLoginInStart
-     * PacketLoginInEncryptionBegin
-     */
-
-    private static boolean hasRegistered;
-
-    private static final ServerVersion version = ServerVersion.getVersion();
-    private static PacketEvents instance;
-    private static final EventManager eventManager = new EventManager();
-
-    private static int currentTick;
-
-    private static BukkitTask serverTickTask;
-
-    private static final HashMap<Object, ClientVersion> clientVersionLookup = new HashMap<Object, ClientVersion>();
-
-    public static EventManager getEventManager() {
-        return eventManager;
-    }
 
+public final class PacketEvents implements PacketListener, Listener {
+    private static Plugin plugin;
+    private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
+    private static final PacketEvents instance = new PacketEvents();
+    private static boolean hasLoaded;
+    private static final Settings settings = new Settings();
 
     /**
-     * Starts the server tick task and initiates the TinyProtocolHandler
-     *
-     * @param plugin
+     * Call this before start()
      */
-    public static void start(final Plugin plugin) {
-        if (!hasRegistered) {
-            //Register Bukkit and PacketListener
-            getEventManager().registerListener(getInstance());
+    public static void load() {
+        PacketTypeClasses.Client.load();
+        PacketTypeClasses.Server.load();
+        hasLoaded = true;
+    }
 
-            //Initialize the TinyProtocolHandler
-            TinyProtocolHandler.initTinyProtocol(plugin);
+    /**
+     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
+     */
+    public static void start(final Plugin pl) {
+        if (!hasLoaded) {
+            load();
+        }
+        plugin = pl;
+        //Register Bukkit and PacketListener
+        getAPI().getEventManager().registerListener(instance);
 
-            //Start the server tick task
-            final Runnable tickRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.currentCalculatedMS()));
-                }
-            };
-            serverTickTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, tickRunnable, 0L, 1L);
-            hasRegistered = true;
+        Bukkit.getPluginManager().registerEvents(instance, plugin);
+
+        for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) {
+            getAPI().getPlayerUtilities().injectPlayer(p);
         }
     }
 
     /**
-     * Stop all tasks and unregisters all packetevent listeners
+     * Stop all tasks and unregisters all PacketEvents' listeners
      */
     public static void stop() {
-        if (serverTickTask != null) {
-            serverTickTask.cancel();
+
+        for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) {
+            getAPI().getPlayerUtils().uninjectPlayerNow(p);
         }
-        getEventManager().unregisterAllListeners();
+        getAPI().getEventManager().unregisterAllListeners();
+
+        PacketType.Client.packetIds.clear();
+        PacketType.Server.packetIds.clear();
     }
 
-    /**
-     * Get the server's version
-     *
-     * @return version
-     */
-    public static ServerVersion getServerVersion() {
-        return version;
+    public static PacketEventsAPI getAPI() {
+        return packetEventsAPI;
     }
 
-    /**
-     * Returns the server tick task, you may cancel it if you wish.
-     * To cancel it do PacketEvents.getServerTickTask().cancel();
-     * <p>
-     * This bukkit task runs asynchronously every tick and is started in the start(plugin) function
-     *
-     * @return serverTickTask
-     */
-    public static BukkitTask getServerTickTask() {
-        return serverTickTask;
+    public static Plugin getPlugin() {
+        return plugin;
     }
 
-    /**
-     * Get an instance of the PacketEvents API class
-     *
-     * @return instance
-     */
-    public static PacketEvents getInstance() {
-        return instance == null ? instance = new PacketEvents() : instance;
+    public static String getHandlerName(final String name) {
+        return "pe-" + getSettings().getIdentifier() + "-" + name;
+    }
+
+    public static Settings getSettings() {
+        return settings;
     }
 
 
-    /**
-     * Get the server's recent TPS values
-     * TPS stands for ticks per second.
-     * Learn more about ticks <a href="https://apexminecrafthosting.com/what-is-minecraft-tps/">"https://apexminecrafthosting.com/what-is-minecraft-tps/"</a>
-     *
-     * @return recentTPS[]
-     */
-    public static double[] getRecentServerTPS() {
-        double[] tpsArray = new double[0];
-        try {
-            tpsArray = NMSUtils.recentTPS();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return tpsArray;
-    }
-
-    /**
-     * Get the server's current TPS
-     * TPS stands for ticks per second.
-     * Learn more about ticks <a href="https://apexminecrafthosting.com/what-is-minecraft-tps/">"https://apexminecrafthosting.com/what-is-minecraft-tps/"</a>
-     *
-     * @return currentTPS / recentTPS[0]
-     */
-    public static double getCurrentServerTPS() {
-        return getRecentServerTPS()[0];
-    }
-
-    /**
-     * Get the player's ping.
-     * Learn more about ping <a href="https://en.wikipedia.org/wiki/Ping_(networking_utility)">https://en.wikipedia.org/wiki/Ping_(networking_utility)</a>
-     *
-     * @param player
-     * @return ping
-     */
-    public static int getPing(final Player player) {
-        return NMSUtils.getPlayerPing(player);
-    }
-
-    /**
-     * Should I use this over System.currentTimeMillis()?
-     * <p>
-     * 1. System.currentTimeMillis() isn't supported on all machines
-     * 2. This is way more accurate than System.currentTimeMillis()
-     * 3. System.currentTimeMillis() can be up to 50ms off, depending on the operating system.
-     *
-     * @return nanoTime / 1 million
-     */
-    public static long currentCalculatedMS() {
-        return System.nanoTime() / 1000000;
-    }
-
-    /**
-     * Get the player's version.
-     * Do not call this method in the PlayerInjectEvent, it is safe to call it in the PostPlayerInjectEvent.
-     * The EntityPlayer object is null at that time, resulting in the version lookup to fail.
-     *
-     * @param player
-     * @return ClientVersion
-     */
-    @Nullable
-    public static ClientVersion getClientVersion(final Player player) {
-        final Object channel = TinyProtocolHandler.getPlayerChannel(player);
-        return clientVersionLookup.get(channel);
-    }
-
-    /**
-     * Get the players' client version
-     * Do not call this method in the PlayerInjectEvent, it is safe to call it in the PostPlayerInjectEvent.
-     * The EntityPlayer object is null at that time, resulting in the version lookup to fail.
-     *
-     * @param channel
-     * @return ClientVersion
-     */
-    @Nullable
-    public static ClientVersion getClientVersion(final Object channel) {
-        return clientVersionLookup.get(channel);
-    }
-
-    @PacketHandler
-    public void onLogin(final PacketLoginEvent e) {
-        if (e.getPacketName().equals(Packet.Login.HANDSHAKE)) {
-            final WrappedPacketLoginHandshake handshake = new WrappedPacketLoginHandshake(e.getPacket());
-            final ClientVersion clientVersion = ClientVersion.fromProtocolVersion(handshake.getProtocolVersion());
-            clientVersionLookup.put(e.getNettyChannel(), clientVersion);
-        }
-    }
-
-    /**
-     * Do not check the client version in or before the PlayerInjectEvent, use the PostPlayerInjectEvent.
-     * It is not recommended to do much in the PlayerInjectEvent, as some fields in the Player object are be null.
-     * Use the PostPlayerInjectEvent which is only called after the PlayerJoinEvent if the player was injected.
-     *
-     * @param e
-     */
-    @PacketHandler
-    public void onInject(final PlayerInjectEvent e) {
-        final String username = e.getPlayer().getName();
-    }
-
-    /**
-     * Called after the PlayerJoinEvent ONLY if the player has been injected!
-     * @param e
-     */
-    @PacketHandler
-    public void onPostInject(final PostPlayerInjectEvent e) {
-        //It is safe to get his client version in here.
-        final ClientVersion clientVersion = PacketEvents.getClientVersion(e.getPlayer());
+    @EventHandler
+    public void onJoin(final PlayerJoinEvent e) {
+        getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
+        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer())));
     }
 
     @EventHandler
-    public void onJoin(PlayerJoinEvent e) {
-        if (hasInjected(e.getPlayer())) {
-            PacketEvents.getEventManager().callEvent(new PostPlayerInjectEvent(e.getPlayer()));
-        }
+    public void onQuit(final PlayerQuitEvent e) {
+        getAPI().getPlayerUtils().clearClientVersion(e.getPlayer());
+        getAPI().getPlayerUtils().uninjectPlayer(e.getPlayer());
     }
 
-    /**
-     * Version independant player injection
-     * @param player
-     */
-    public static void injectPlayer(final Player player) {
-        TinyProtocolHandler.inject(player);
-    }
-
-    /**
-     * Version independant player injection
-     * @param player
-     */
-    public static void uninjectPlayer(final Player player) {
-        TinyProtocolHandler.uninject(player);
-    }
-
-    /**
-     * Returns whether we have injected the player
-     * @param player
-     * @return hasInjected
-     */
-    public static boolean hasInjected(final Player player) {
-        return TinyProtocolHandler.hasInjected(player);
-    }
-
-    /**
-     * Send a wrapped sendable packet to a player
-     *
-     * @param player
-     * @param sendable
-     */
-    public static void sendPacket(final Player player, final Sendable sendable) {
-        NMSUtils.sendSendableWrapper(player, sendable);
+    @EventHandler
+    public void onMove(final PlayerMoveEvent e) {
+        BukkitMoveEvent moveEvent = new BukkitMoveEvent(e);
+        getAPI().getEventManager().callEvent(moveEvent);
+        e.setCancelled(moveEvent.isCancelled());
     }
 }

src/main/java/io/github/retrooper/packetevents/annotations/NotNull.java

@@ -1,9 +1,12 @@
 package io.github.retrooper.packetevents.annotations;
 
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
- *  Is for sure not null.
+ * Is for sure not null.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/io/github/retrooper/packetevents/annotations/Nullable.java

@@ -6,7 +6,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- *  Could be null.
+ * Could be null.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java

@@ -1,5 +1,7 @@
 package io.github.retrooper.packetevents.annotations;
 
+import io.github.retrooper.packetevents.annotations.data.EventSynchronization;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -8,10 +10,9 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 /**
- * Just like Bukkit's @EventHandler, but for packets.
- * Make sure your class implements the PacketListener interface, and is registered!
+ * Just like Bukkit's @EventHandler, but for PacketEvents' custom event system.
+ * Make sure your class implements the PacketListener interface, and is registered when annotating your method with this annotation!
  */
 public @interface PacketHandler {
-
-
+    EventSynchronization synchronization() default EventSynchronization.NORMAL;
 }

src/main/java/io/github/retrooper/packetevents/annotations/data/EventSynchronization.java

@@ -0,0 +1,5 @@
+package io.github.retrooper.packetevents.annotations.data;
+
+public enum EventSynchronization {
+    FORCE_SYNC, FORCE_ASYNC, NORMAL
+}

src/main/java/io/github/retrooper/packetevents/api/PacketEventsAPI.java

@@ -0,0 +1,85 @@
+package io.github.retrooper.packetevents.api;
+
+import io.github.retrooper.packetevents.event.manager.EventManager;
+import io.github.retrooper.packetevents.utils.api.PlayerUtils;
+import io.github.retrooper.packetevents.utils.api.ServerUtils;
+
+public final class PacketEventsAPI {
+    private final EventManager eventManager = new EventManager();
+    private final PlayerUtils playerUtils = new PlayerUtils();
+    private final ServerUtils serverUtils = new ServerUtils();
+
+    /**
+     * Not thread safe
+     * Preciser than #currentMillis()
+     * Expensive
+     * Returns crazy values when you change system time
+     *
+     * @return {@link System#nanoTime()} / 1000000(1 million)
+     */
+    public long currentPreciseMillis() {
+        return System.nanoTime() / 1000000;
+    }
+
+    /**
+     * Thread safe
+     * Less precise compared to #currentPreciseMillis()
+     * Cheap
+     * Doesn't break when system time is changed
+     *
+     * @return {@link System#currentTimeMillis()}
+     */
+    public long currentMillis() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * Get all utilities to do with the player
+     *
+     * @return Player Utilities
+     */
+    public PlayerUtils getPlayerUtils() {
+        return playerUtils;
+    }
+
+    /**
+     * Use {@link #getPlayerUtils()}
+     *
+     * @return
+     */
+    @Deprecated
+    public PlayerUtils getPlayerUtilities() {
+        return playerUtils;
+    }
+
+    /**
+     * Get all utilities to do with the server
+     *
+     * @return Server Utilities
+     */
+    public ServerUtils getServerUtils() {
+        return serverUtils;
+    }
+
+    /**
+     * Please use {@link #getServerUtils()}
+     *
+     * @return
+     */
+    @Deprecated
+    public ServerUtils getServerUtilities() {
+        return serverUtils;
+    }
+
+    /**
+     * Get the event manager
+     * Used to call events, register and unregister listeners
+     *
+     * @return PacketEvents' event manager
+     */
+    public EventManager getEventManager() {
+        return eventManager;
+    }
+
+
+}

src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java

@@ -2,11 +2,13 @@ package io.github.retrooper.packetevents.enums;
 
 public enum ClientVersion {
     LESS_THAN_V_1_7_10, v_1_7_10, v_1_8, v_1_9, v_1_9_1, v_1_9_2, v_1_9_3, v_1_10, v_1_11, v_1_11_1, v_1_12, v_1_12_1, v_1_12_2,
-    v_1_13, v_1_13_1, v_1_13_2, v_1_14, v_1_14_1, v_1_14_2, v_1_14_3, v_1_14_4, v_1_15, v_1_15_1, v_1_15_2, HIGHER_THAN_V_1_15_2, INVALID;
+    v_1_13, v_1_13_1, v_1_13_2, v_1_14, v_1_14_1, v_1_14_2, v_1_14_3, v_1_14_4, v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_1, HIGHER_THAN_V_1_16_1, INVALID, ACCESS_FAILURE;
 
     public static ClientVersion fromProtocolVersion(final int protocolVersion) {
         int remainder = -1;
         switch (protocolVersion) {
+            case -1:
+                return ACCESS_FAILURE;
             case 1:
             case 2:
             case 3:
@@ -56,11 +58,15 @@ public enum ClientVersion {
                 return v_1_15_1;
             case 578:
                 return v_1_15_2;
+            case 735:
+                return v_1_16;
+            case 736:
+                return v_1_16_1;
             default:
                 remainder = protocolVersion;
         }
-        if(remainder > 578) {
-            return HIGHER_THAN_V_1_15_2;
+        if (remainder > 578) {
+            return HIGHER_THAN_V_1_16_1;
         }
         return INVALID;
     }
@@ -78,18 +84,18 @@ public enum ClientVersion {
 
     /**
      * Returns if the client's version is more outdated than the argument passed version
+     *
      * @param version
      * @return
      */
     public boolean isLowerThan(final ClientVersion version) {
-        if(version == this) return false;
-        byte len = (byte) values().length;
+        if (version == this) return false;
+        final int len = values().length;
         for (byte i = 0; i < len; i++) {
             final ClientVersion v = values()[i];
-            if(v == this) {
+            if (v == this) {
                 return true;
-            }
-            else if(v == version) {
+            } else if (v == version) {
                 return false;
             }
         }

src/main/java/io/github/retrooper/packetevents/enums/Direction.java

@@ -1,9 +1,7 @@
 package io.github.retrooper.packetevents.enums;
 
 public enum Direction {
-    DOWN, UP, NORTH, SOUTH, WEST, EAST
-
-    ,NORTH_EAST,
+    DOWN, UP, NORTH, SOUTH, WEST, EAST, NORTH_EAST,
     NORTH_WEST, SOUTH_EAST,
     SOUTH_WEST, WEST_NORTH_WEST,
     NORTH_NORTH_WEST, NORTH_NORTH_EAST,
@@ -11,7 +9,7 @@ public enum Direction {
     SOUTH_SOUTH_EAST, SOUTH_SOUTH_WEST,
     WEST_SOUTH_WEST, SELF, NULL;
 
-    public static Direction get(final byte i) {
+    public static Direction get(final int i) {
         return values()[i];
     }
 }

src/main/java/io/github/retrooper/packetevents/enums/Hand.java

@@ -1,6 +0,0 @@
-package io.github.retrooper.packetevents.enums;
-
-public enum Hand {
-    MAIN_HAND,
-    OFF_HAND;
-}

src/main/java/io/github/retrooper/packetevents/enums/PlayerAction.java

@@ -1,25 +0,0 @@
-package io.github.retrooper.packetevents.enums;
-
-public enum PlayerAction {
-    START_SNEAKING,
-
-    STOP_SNEAKING,
-
-    STOP_SLEEPING,
-
-    START_SPRINTING,
-
-    STOP_SPRINTING,
-
-    START_RIDING_JUMP,
-
-    STOP_RIDING_JUMP,
-
-    OPEN_INVENTORY,
-
-    START_FALL_FLYING;
-
-    public static PlayerAction get(final byte i) {
-        return values()[i];
-    }
-}

src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java

@@ -1,34 +1,67 @@
 package io.github.retrooper.packetevents.enums;
 
-import org.apache.commons.lang.ArrayUtils;
+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;
 
-
+/**
+ * @author retrooper
+ */
 public enum ServerVersion {
-    v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15,
-    ERROR;
+    v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15, v_1_16_1,
+    ERROR, EMPTY;
 
+    private static final ServerVersion[] reversedValues;
+    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+    private static ServerVersion cachedVersion;
 
-    public static ServerVersion getVersion() {
-        ServerVersion[] vals = values();
-        ArrayUtils.reverse(vals);
-        for (ServerVersion val : vals) {
+    static {
+        reversedValues = reverse(values());
+    }
+
+    private static ServerVersion getVers() {
+        for (final ServerVersion val : reversedValues) {
             String valName = val.name().substring(2).replace("_", ".");
             if (Bukkit.getBukkitVersion().contains(valName)) {
                 return val;
+            } else if (PacketEvents.getSettings().getDefaultServerVersion() != null) {
+                return PacketEvents.getSettings().getDefaultServerVersion();
             }
         }
         return ERROR;
     }
 
-    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+    public static ServerVersion getVersion() {
+        if (cachedVersion == null) {
+            cachedVersion = getVers();
+        }
+        return cachedVersion;
+    }
+
+
+    private static ServerVersion[] reverse(final ServerVersion[] arr) {
+        ServerVersion[] array = arr.clone();
+        if (array == null) {
+            return null;
+        }
+        int i = 0;
+        int j = array.length - 1;
+        ServerVersion tmp;
+        while (j > i) {
+            tmp = array[j];
+            array[j] = array[i];
+            array[i] = tmp;
+            j--;
+            i++;
+        }
+        return array;
+    }
 
     public static String getNmsSuffix() {
         return nmsVersionSuffix;
     }
 
     public static String getNMSDirectory() {
-        return "net.minecraft.server." + nmsVersionSuffix;
+        return "net.minecraft.server." + getNmsSuffix();
     }
 
     public static String getOBCDirectory() {
@@ -53,14 +86,13 @@ public enum ServerVersion {
      * @return
      */
     public boolean isLowerThan(final ServerVersion version) {
-        if(version == this) return false;
-        byte len = (byte) values().length;
+        if (version == this) return false;
+        final int len = values().length;
         for (byte i = 0; i < len; i++) {
             final ServerVersion v = values()[i];
-            if(v == this) {
+            if (v == this) {
                 return true;
-            }
-            else if(v == version) {
+            } else if (v == version) {
                 return false;
             }
         }
@@ -68,4 +100,3 @@ public enum ServerVersion {
     }
 
 }
-

src/main/java/io/github/retrooper/packetevents/enums/SystemOS.java

@@ -0,0 +1,32 @@
+package io.github.retrooper.packetevents.enums;
+
+public enum SystemOS {
+    WINDOWS, MACOS, LINUX, OTHER;
+
+    private static SystemOS value;
+
+    private static SystemOS getOS() {
+        final String os = System.getProperty("os.name");
+        for (final String osName : getOperatingSystemNames()) {
+            if (os.toLowerCase().contains(osName.toLowerCase())) {
+                return SystemOS.valueOf(osName);
+            }
+        }
+        return OTHER;
+    }
+
+    public static SystemOS getOperatingSystem() {
+        if (value == null) {
+            value = getOS();
+        }
+        return value;
+    }
+
+    public static String[] getOperatingSystemNames() {
+        final String[] arr = new String[values().length - 1];
+        for (int i = 0; i < values().length - 1; i++) {
+            arr[i] = values()[i].name();
+        }
+        return arr;
+    }
+}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/EntityAnimationType.java

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.enums;
+package io.github.retrooper.packetevents.enums.minecraft;
 
 public enum EntityAnimationType {
     SWING_MAIN_ARM, DAMAGE, LEAVE_BED, SWING_OFFHAND, CRITICAL_EFFECT, MAGIC_CRITICAL_EFFECT;
@@ -8,9 +8,9 @@ public enum EntityAnimationType {
     }
 
     public final int getIndex() {
-        for(int i = 0; i < values().length; i++) {
+        for (int i = 0; i < values().length; i++) {
             final EntityAnimationType curType = values()[0];
-            if(curType == this) {
+            if (curType == this) {
                 return i;
             }
         }

src/main/java/io/github/retrooper/packetevents/enums/minecraft/EntityUseAction.java

@@ -1,9 +1,9 @@
-package io.github.retrooper.packetevents.enums;
+package io.github.retrooper.packetevents.enums.minecraft;
 
 public enum EntityUseAction {
     INTERACT, INTERACT_AT, ATTACK, INVALID;
 
-    public static EntityUseAction get(final byte i) {
+    public static EntityUseAction get(final int i) {
         return values()[i];
     }
 }

src/main/java/io/github/retrooper/packetevents/enums/minecraft/Gamemode.java

@@ -0,0 +1,25 @@
+package io.github.retrooper.packetevents.enums.minecraft;
+
+public enum Gamemode {
+    NOT_SET(-1, ""),
+    SURVIVAL(0, "survival"),
+    CREATIVE(1, "creative"),
+    ADVENTURE(2, "adventure"),
+    SPECTATOR(3, "spectator");
+
+    int f;
+    String g;
+
+    Gamemode(int var3, String var4) {
+        this.f = var3;
+        this.g = var4;
+    }
+
+    public int getId() {
+        return this.f;
+    }
+
+    public String b() {
+        return this.g;
+    }
+}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/Hand.java

@@ -0,0 +1,6 @@
+package io.github.retrooper.packetevents.enums.minecraft;
+
+public enum Hand {
+    MAIN_HAND,
+    OFF_HAND
+}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerAction.java

@@ -0,0 +1,59 @@
+package io.github.retrooper.packetevents.enums.minecraft;
+
+public enum PlayerAction {
+    START_SNEAKING,
+
+    STOP_SNEAKING,
+
+    STOP_SLEEPING,
+
+    START_SPRINTING,
+
+    STOP_SPRINTING,
+
+    START_RIDING_JUMP,
+
+    STOP_RIDING_JUMP,
+
+    OPEN_INVENTORY,
+
+    START_FALL_FLYING;
+
+    public static PlayerAction get(final int i) {
+        return values()[i];
+    }
+
+    public int getIndex() {
+        for (int i = 0; i < values().length; i++) {
+            final PlayerAction action = values()[i];
+            if (action == this) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public enum UpdatedPlayerAction {
+        PRESS_SHIFT_KEY, RELEASE_SHIFT_KEY, STOP_SLEEPING, START_SPRINTING, STOP_SPRINTING, START_RIDING_JUMP, STOP_RIDING_JUMP, OPEN_INVENTORY, START_FALL_FLYING;
+
+        public static UpdatedPlayerAction get(final int index) {
+            for (int i = 0; i < index + 1; i++) {
+                final UpdatedPlayerAction action = values()[i];
+                if (i == index) {
+                    return action;
+                }
+            }
+            return null;
+        }
+
+        public int getIndex() {
+            for (int i = 0; i < values().length; i++) {
+                final UpdatedPlayerAction action = values()[i];
+                if (action == this) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerDigType.java

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.enums;
+package io.github.retrooper.packetevents.enums.minecraft;
 
 public enum PlayerDigType {
 
@@ -16,9 +16,11 @@ public enum PlayerDigType {
 
     SWAP_HELD_ITEMS,
 
+    SWAP_ITEM_WITH_OFFHAND,
+
     WRONG_PACKET;
 
-    public static PlayerDigType get(final byte i) {
+    public static PlayerDigType get(final int i) {
         return values()[i];
     }
 }

src/main/java/io/github/retrooper/packetevents/enums/minecraft/PlayerInfoAction.java

@@ -0,0 +1,8 @@
+package io.github.retrooper.packetevents.enums.minecraft;
+
+public enum PlayerInfoAction {
+    ADD_PLAYER, UPDATE_GAME_MODE, UPDATE_LATENCY, UPDATE_DISPLAY_NAME, REMOVE_PLAYER;
+
+    PlayerInfoAction() {
+    }
+}

src/main/java/io/github/retrooper/packetevents/event/PacketEvent.java

@@ -1,22 +1,22 @@
 package io.github.retrooper.packetevents.event;
 
 
-import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 
-/**
- * Incoming and sent packets are called asynchronously,
- * recommended to avoid non thread safe bukkit operations
- */
 public class PacketEvent {
-    protected long timestamp = PacketEvents.currentCalculatedMS();
-    protected static ServerVersion version = PacketEvents.getServerVersion();
+    protected static ServerVersion version = ServerVersion.getVersion();
+    private long timestamp = System.currentTimeMillis();
 
     /**
      * Timestamp of the packet
+     *
      * @return
      */
     public long getTimestamp() {
         return timestamp;
     }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
 }

src/main/java/io/github/retrooper/packetevents/event/PacketListener.java

@@ -1,4 +1,4 @@
 package io.github.retrooper.packetevents.event;
 
-public interface PacketListener  {
+public interface PacketListener {
 }

src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java

@@ -0,0 +1,48 @@
+package io.github.retrooper.packetevents.event.impl;
+
+import io.github.retrooper.packetevents.event.PacketEvent;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+public final class BukkitMoveEvent extends PacketEvent {
+    private final Player player;
+    private final Location to, from;
+    private boolean cancelled;
+
+    public BukkitMoveEvent(final Player player, final Location to, final Location from) {
+        this.player = player;
+        this.to = to;
+        this.from = from;
+    }
+
+    public BukkitMoveEvent(final PlayerMoveEvent e) {
+        this.player = e.getPlayer();
+        this.to = e.getTo();
+        this.from = e.getFrom();
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public Location getFrom() {
+        return from;
+    }
+
+    public Location getTo() {
+        return to;
+    }
+
+    public void setCancelled(final boolean val) {
+        this.cancelled = val;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void cancel() {
+        setCancelled(true);
+    }
+}

src/main/java/io/github/retrooper/packetevents/event/impl/PacketLoginEvent.java

@@ -1,26 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-
-public final class PacketLoginEvent extends PacketEvent {
-    private final Object channel;
-    private final String name;
-    private final Object packet;
-    public PacketLoginEvent(final Object channel, final String packetName, final Object packet) {
-        this.channel =channel;
-        this.name = packetName;
-        this.packet = packet;
-    }
-
-    public Object getNettyChannel() {
-        return channel;
-    }
-
-    public String getPacketName() {
-        return name;
-    }
-
-    public Object getPacket() {
-        return packet;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java

@@ -1,6 +1,7 @@
 package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
 import org.bukkit.entity.Player;
 
 public final class PacketReceiveEvent extends PacketEvent {
@@ -34,21 +35,34 @@ public final class PacketReceiveEvent extends PacketEvent {
     }
 
     /**
-     * Get the raw packet object
+     * Get the NMS packet object
      *
-     * @return packet
+     * @return packet object
      */
-    public Object getPacket() {
+    public Object getNMSPacket() {
         return this.packet;
     }
 
     /**
-     * Cancel the packet
+     * Get the class of the NMS packet object
      *
-     * @param cancelled
+     * @return packet object class
      */
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public Class<?> getNMSPacketClass() {
+        return getNMSPacket().getClass();
+    }
+
+    /**
+     * Get the ID of the packet
+     *
+     * @return packet id
+     */
+    public byte getPacketId() {
+        Byte id = PacketType.Client.packetIds.get(getNMSPacketClass());
+        if (id == null) {
+            return -1;
+        }
+        return id;
     }
 
     /**
@@ -59,4 +73,13 @@ public final class PacketReceiveEvent extends PacketEvent {
     public boolean isCancelled() {
         return cancelled;
     }
+
+    /**
+     * Cancel the packet
+     *
+     * @param cancelled
+     */
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
 }

src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java

@@ -1,6 +1,7 @@
 package io.github.retrooper.packetevents.event.impl;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
 import org.bukkit.entity.Player;
 
 
@@ -27,21 +28,43 @@ public final class PacketSendEvent extends PacketEvent {
     }
 
     /**
-     * Get the raw packet object
+     * Get the ID of the packet
      *
-     * @return nmsPacket
+     * @return packet id
      */
-    public Object getPacket() {
+    public byte getPacketId() {
+        Byte id =
+                PacketType.Server.packetIds.get(getNMSPacketClass());
+        if (id == null) {
+            return -1;
+        }
+        return id;
+    }
+
+    /**
+     * Get the NMS packet object
+     *
+     * @return packet object
+     */
+    public Object getNMSPacket() {
         return this.packet;
     }
 
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    /**
+     * Get the class of the NMS packet object
+     *
+     * @return packet object class
+     */
+    public Class<?> getNMSPacketClass() {
+        return getNMSPacket().getClass();
     }
 
     public boolean isCancelled() {
         return cancelled;
     }
+
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
 }
 

src/main/java/io/github/retrooper/packetevents/event/impl/PlayerInjectEvent.java

@@ -6,6 +6,7 @@ import org.bukkit.entity.Player;
 public final class PlayerInjectEvent extends PacketEvent {
     private final Player player;
     private boolean cancelled;
+
     public PlayerInjectEvent(final Player player) {
         this.player = player;
     }

src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java

@@ -5,9 +5,28 @@ import org.bukkit.entity.Player;
 
 public final class PlayerUninjectEvent extends PacketEvent {
     private final Player player;
+    private boolean cancelled;
+    private final boolean sync;
 
-    public PlayerUninjectEvent(final Player player) {
-        this.player =player;
+    public PlayerUninjectEvent(final Player player, final boolean sync) {
+        this.player = player;
+        this.sync = sync;
+    }
+
+    public void cancel() {
+        setCancelled(true);
+    }
+
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    public void setCancelled(final boolean val) {
+        this.cancelled = val;
+    }
+
+    public boolean isSync() {
+        return sync;
     }
 
     public Player getPlayer() {

src/main/java/io/github/retrooper/packetevents/event/impl/PostPlayerInjectEvent.java

@@ -1,16 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.event.PacketEvent;
-import org.bukkit.entity.Player;
-
-public final class PostPlayerInjectEvent extends PacketEvent {
-    private final Player player;
-
-    public PostPlayerInjectEvent(final Player player) {
-        this.player = player;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/impl/ServerTickEvent.java

@@ -1,32 +0,0 @@
-package io.github.retrooper.packetevents.event.impl;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.PacketEvent;
-
-public final class ServerTickEvent extends PacketEvent {
-    private final int tick;
-    private final double tps;
-    public ServerTickEvent(final int tick, final long timestamp) {
-        this.tick = tick;
-        this.timestamp = timestamp;
-        this.tps = PacketEvents.getCurrentServerTPS();
-    }
-
-    public ServerTickEvent(final int tick) {
-        this.tick = tick;
-        this.tps = PacketEvents.getCurrentServerTPS();
-    }
-
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public int getCurrentTick() {
-        return tick;
-    }
-
-    public double getCurrentServerTPS() {
-        return tps;
-    }
-}

src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java

@@ -1,56 +1,97 @@
 package io.github.retrooper.packetevents.event.manager;
 
-import io.github.retrooper.packetevents.event.PacketEvent;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.annotations.PacketHandler;
+import io.github.retrooper.packetevents.annotations.data.EventSynchronization;
+import io.github.retrooper.packetevents.event.PacketEvent;
 import io.github.retrooper.packetevents.event.PacketListener;
+import org.bukkit.Bukkit;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public final class EventManager {
+    private final ExecutorService executorService;
+    private final HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();
 
-    private HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();
+    public EventManager(final int threadCount) {
+        executorService = Executors.newFixedThreadPool(threadCount);
+    }
+
+    public EventManager() {
+        this(Runtime.getRuntime().availableProcessors());
+    }
 
     public void callEvent(final PacketEvent e) {
         for (final PacketListener listener : registeredMethods.keySet()) {
             //Annotated methods
             final List<Method> methods = registeredMethods.get(listener);
             for (final Method method : methods) {
-                if (method.getParameterTypes()[0].equals(PacketEvent.class)
-                        || method.getParameterTypes()[0].getSimpleName().equals(e.getClass().getSimpleName())) {
-                    try {
-                        method.invoke(listener, e);
-                    } catch (IllegalAccessException | InvocationTargetException ex) {
-                        ex.printStackTrace();
+                final Class<?> parameterType = method.getParameterTypes()[0];
+                if (parameterType.equals(PacketEvent.class)
+                        || parameterType.isInstance(e)) {
+                    final PacketHandler annotation = method.getAnnotation(PacketHandler.class);
+                    final Runnable invokeMethod = new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                method.invoke(listener, e);
+                            } catch (IllegalAccessException | InvocationTargetException ex) {
+                                ex.printStackTrace();
+                            }
+                        }
+                    };
+                    if (annotation.synchronization() == EventSynchronization.FORCE_ASYNC) {
+                        executorService.execute(invokeMethod);
+                    } else if (annotation.synchronization() == EventSynchronization.FORCE_SYNC) {
+                        Bukkit.getScheduler().runTask(PacketEvents.getPlugin(), invokeMethod);
+                    } else {
+                        invokeMethod.run();
                     }
                 }
             }
         }
     }
 
-
     public void registerListener(final PacketListener e) {
         final List<Method> methods = new ArrayList<Method>();
         for (final Method m : e.getClass().getMethods()) {
-            if (m.isAnnotationPresent(PacketHandler.class)) {
+            if (m.isAnnotationPresent(PacketHandler.class)
+                    && m.getParameterTypes().length == 1) {
                 methods.add(m);
             }
         }
-        registeredMethods.put(e, methods);
+        if (!methods.isEmpty()) {
+            registeredMethods.put(e, methods);
+        }
+    }
+
+    public void registerListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            registerListener(listener);
+        }
     }
 
     public void unregisterListener(final PacketListener e) {
         registeredMethods.remove(e);
     }
 
+    public void unregisterListeners(final PacketListener... listeners) {
+        for (final PacketListener listener : listeners) {
+            unregisterListener(listener);
+        }
+    }
+
     public void unregisterAllListeners() {
         registeredMethods.clear();
     }
 
-    public boolean hasRegistered(final PacketListener listener) {
+    public boolean isRegistered(final PacketListener listener) {
         return registeredMethods.containsKey(listener);
     }
 }

src/main/java/io/github/retrooper/packetevents/example/MainExample.java

@@ -0,0 +1,37 @@
+package io.github.retrooper.packetevents.example;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.annotations.PacketHandler;
+import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.out.keepalive.WrappedPacketOutKeepAlive;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class MainExample extends JavaPlugin implements PacketListener {
+
+    @Override
+    public void onLoad() {
+        PacketEvents.load();
+    }
+
+    @Override
+    public void onEnable() {
+        //Make sure you set a unique identifier, if another present plugin has the same identifier, you could run into issues
+        PacketEvents.getSettings().setIdentifier("official_api");
+
+        PacketEvents.start(this);
+        //If packetevents cannot detect your server version, it will use the default you specify version
+        // getAPI().getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);
+
+
+        PacketEvents.getAPI().getEventManager().registerListeners(this);
+    }
+
+    @Override
+    public void onDisable() {
+        PacketEvents.stop();
+    }
+
+}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java

@@ -0,0 +1,81 @@
+package io.github.retrooper.packetevents.handler;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
+import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
+import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
+import org.bukkit.entity.Player;
+
+import java.util.concurrent.Future;
+
+public class NettyPacketHandler {
+    private static boolean v1_7_nettyMode = false;
+
+    static {
+        try {
+            Class.forName("io.netty.channel.Channel");
+        } catch (ClassNotFoundException e) {
+            v1_7_nettyMode = true;
+        }
+    }
+
+    public static void injectPlayer(final Player player) {
+        final PlayerInjectEvent injectEvent = new PlayerInjectEvent(player);
+        PacketEvents.getAPI().getEventManager().callEvent(injectEvent);
+        if (!injectEvent.isCancelled()) {
+            if (v1_7_nettyMode) {
+                NettyPacketHandler_7.injectPlayer(player);
+            } else {
+                NettyPacketHandler_8.injectPlayer(player);
+            }
+        }
+    }
+
+    public static Future<?> uninjectPlayer(final Player player) {
+        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, false);
+        PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
+        if (!uninjectEvent.isCancelled()) {
+            if (v1_7_nettyMode) {
+                return NettyPacketHandler_7.uninjectPlayer(player);
+            } else {
+                return NettyPacketHandler_8.uninjectPlayer(player);
+            }
+        }
+        return null;
+    }
+
+    public static void uninjectPlayerNow(final Player player) {
+        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, true);
+        PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
+        if (!uninjectEvent.isCancelled()) {
+            if (v1_7_nettyMode) {
+                NettyPacketHandler_7.uninjectPlayerNow(player);
+            } else {
+                NettyPacketHandler_8.uninjectPlayerNow(player);
+            }
+        }
+    }
+
+    public static Object write(final Player sender, final Object packet) {
+        final String packetName = packet.getClass().getSimpleName();
+        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packetName, packet);
+        PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
+        if (!packetSendEvent.isCancelled()) {
+            return packet;
+        }
+        return null;
+    }
+
+    public static Object read(final Player receiver, final Object packet) {
+        final String packetName = packet.getClass().getSimpleName();
+        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packetName, packet);
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
+        if (!packetReceiveEvent.isCancelled()) {
+            return packet;
+        }
+        return null;
+    }
+
+
+}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java

@@ -0,0 +1,50 @@
+package io.github.retrooper.packetevents.handler;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import net.minecraft.util.io.netty.channel.*;
+import org.bukkit.entity.Player;
+
+import java.util.concurrent.Future;
+
+final class NettyPacketHandler_7 {
+
+    public static void injectPlayer(final Player player) {
+        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Object packet = NettyPacketHandler.read(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.channelRead(ctx, msg);
+            }
+
+            @Override
+            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+                Object packet = NettyPacketHandler.write(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.write(ctx, msg, promise);
+            }
+        };
+        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
+        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
+    }
+
+    public static Future<?> uninjectPlayer(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        return channel.eventLoop().submit(new Runnable() {
+            @Override
+            public void run() {
+                channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+            }
+        });
+    }
+
+    public static void uninjectPlayerNow(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java

@@ -0,0 +1,50 @@
+package io.github.retrooper.packetevents.handler;
+
+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.netty.channel.*;
+import org.bukkit.entity.Player;
+
+import java.util.concurrent.Future;
+
+final class NettyPacketHandler_8 {
+
+    public static void injectPlayer(final Player player) {
+        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Object packet = NettyPacketHandler.read(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.channelRead(ctx, msg);
+            }
+
+            @Override
+            public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+                Object packet = NettyPacketHandler.write(player, msg);
+                if (packet == null) {
+                    return;
+                }
+                super.write(ctx, msg, promise);
+            }
+        };
+        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
+        pipeline.addBefore("packet_handler", PacketEvents.getHandlerName(player.getName()), channelDuplexHandler);
+    }
+
+    public static Future<?> uninjectPlayer(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        return channel.eventLoop().submit(new Runnable() {
+            @Override
+            public void run() {
+                channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+            }
+        });
+    }
+
+    public static void uninjectPlayerNow(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+    }
+}

src/main/java/io/github/retrooper/packetevents/handler/TinyProtocolHandler.java

@@ -1,92 +0,0 @@
-package io.github.retrooper.packetevents.handler;
-
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-public final class TinyProtocolHandler {
-    private static final ServerVersion version = PacketEvents.getServerVersion();
-
-    private static Object tinyProtocol;
-
-    public static void initTinyProtocol(final Plugin plugin) {
-        if (version.isLowerThan(ServerVersion.v_1_8)) {
-            TinyProtocolHandler_1_7 tiny = new TinyProtocolHandler_1_7(plugin);
-            tiny.initTinyProtocol();
-            tinyProtocol = tiny;
-        } else {
-            TinyProtocolHandler_1_8 tiny = new TinyProtocolHandler_1_8(plugin);
-            tiny.initTinyProtocol();
-            tinyProtocol = tiny;
-        }
-    }
-
-    public static boolean hasInjected(final Player player) {
-        if (version.isLowerThan(ServerVersion.v_1_8)) {
-            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            return tiny.tinyProtocol.hasInjected(player);
-        } else {
-            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            return tiny.tinyProtocol.hasInjected(player);
-        }
-    }
-
-    public static void inject(final Player player) {
-        if (version.isLowerThan(ServerVersion.v_1_8)) {
-            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            tiny.tinyProtocol.injectPlayer(player);
-        } else {
-            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            tiny.tinyProtocol.injectPlayer(player);
-        }
-    }
-
-    public static void uninject(final Player player) {
-        if (version.isLowerThan(ServerVersion.v_1_8)) {
-            TinyProtocolHandler_1_7 tiny = (TinyProtocolHandler_1_7) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            tiny.tinyProtocol.uninjectPlayer(player);
-        } else {
-            TinyProtocolHandler_1_8 tiny = (TinyProtocolHandler_1_8) tinyProtocol;
-            assert tiny.tinyProtocol != null;
-            tiny.tinyProtocol.uninjectPlayer(player);
-        }
-    }
-
-
-    public static Object getPlayerChannel(final Player player) {
-        final Object entityPlayer = NMSUtils.getEntityPlayer(player);
-        final Object playerConnection = playerConnectionAccessor.get(entityPlayer);
-        final Object networkManager = networkManagerAccessor.get(playerConnection);
-        return nettyChannelAccessor.get(networkManager);
-    }
-
-
-    private static Class<?> networkManagerClass;
-
-    private static final FieldAccessor<?> playerConnectionAccessor, networkManagerAccessor, nettyChannelAccessor;
-
-    private static Class<?> channelClass;
-
-    static {
-        try {
-            networkManagerClass = NMSUtils.getNMSClass("NetworkManager");
-            channelClass = NMSUtils.getNettyClass("channel.Channel");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        playerConnectionAccessor = Reflection.getField(NMSUtils.entityPlayerClass, NMSUtils.playerConnectionClass, 0);
-        networkManagerAccessor = Reflection.getField(NMSUtils.playerConnectionClass, networkManagerClass, 0);
-        nettyChannelAccessor = Reflection.getField(networkManagerClass, channelClass, 0);
-    }
-}

src/main/java/io/github/retrooper/packetevents/handler/TinyProtocolHandler_1_7.java

@@ -1,60 +0,0 @@
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.packet.Packet;
-import io.github.retrooper.packetevents.tinyprotocol.TinyProtocol7;
-import net.minecraft.util.io.netty.channel.Channel;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import io.github.retrooper.packetevents.annotations.Nullable;
-
-public final class TinyProtocolHandler_1_7 {
-    private final Plugin plugin;
-
-    public TinyProtocolHandler_1_7(final Plugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Nullable
-    public TinyProtocol7 tinyProtocol;
-
-    public void initTinyProtocol() {
-        tinyProtocol = new TinyProtocol7(getPlugin()) {
-            @Override
-            public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-                final String packetName = packet.getClass().getSimpleName();
-                final PacketSendEvent packetSendEvent = new PacketSendEvent(receiver, packetName, packet);
-                PacketEvents.getEventManager().callEvent(packetSendEvent);
-                if (!packetSendEvent.isCancelled()) {
-                    return packet;
-                }
-                return null;
-            }
-
-            @Override
-            public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-                final String packetName = packet.getClass().getSimpleName();
-                for(final String loginPacket : Packet.Login.LOGIN_PACKETS) {
-                    if(packetName.equals(loginPacket)) {
-                        PacketEvents.getEventManager().callEvent(new PacketLoginEvent(channel, packetName, packet));
-                        return packet;
-                    }
-                }
-                final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(sender, packetName, packet);
-                PacketEvents.getEventManager().callEvent(packetReceiveEvent);
-                if (!packetReceiveEvent.isCancelled()) {
-                    return packet;
-                }
-                return null;
-            }
-        };
-    }
-
-    public Plugin getPlugin() {
-        return plugin;
-    }
-}

src/main/java/io/github/retrooper/packetevents/handler/TinyProtocolHandler_1_8.java

@@ -1,85 +0,0 @@
-package io.github.retrooper.packetevents.handler;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.packet.Packet;
-import io.github.retrooper.packetevents.tinyprotocol.TinyProtocol8;
-import io.netty.channel.Channel;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import io.github.retrooper.packetevents.annotations.Nullable;
-
-public final class TinyProtocolHandler_1_8 {
-    private static final ServerVersion version = PacketEvents.getServerVersion();
-    private final Plugin plugin;
-
-    public TinyProtocolHandler_1_8(final Plugin plugin) {
-        this.plugin = plugin;
-    }
-
-
-
-    @Nullable
-    public TinyProtocol8 tinyProtocol;
-
-
-    public void initTinyProtocol() {
-        tinyProtocol = new TinyProtocol8(getPlugin()) {
-            @Override
-            public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-                final String packetName = packet.getClass().getSimpleName();
-                final PacketSendEvent packetSendEvent = new PacketSendEvent(receiver, packetName, packet);
-                PacketEvents.getEventManager().callEvent(packetSendEvent);
-                if (!packetSendEvent.isCancelled()) {
-                    return packet;
-                }
-                return null;
-            }
-
-            @Override
-            public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-                final String packetName = packet.getClass().getSimpleName();
-                for (final String loginPacket : Packet.Login.LOGIN_PACKETS) {
-                    if (packetName.equals(loginPacket)) {
-                        PacketEvents.getEventManager().callEvent(new PacketLoginEvent(channel, packetName, packet));
-                        return packet;
-                    }
-                }
-                final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(sender, packetName, packet);
-                PacketEvents.getEventManager().callEvent(packetReceiveEvent);
-                if (!packetReceiveEvent.isCancelled()) {
-                    return packet;
-                }
-
-                return null;
-            }
-        };
-    }
-
-    public static String getNetworkManagersFieldName() {
-        //1.8
-        if (version.equals(ServerVersion.v_1_8)) {
-            return "g";
-        }
-        //1.8.3->1.12
-        else if (version.isLowerThan(ServerVersion.v_1_13)) {
-            return "h";
-        }
-        //1.13->1.14
-        else if (version.isLowerThan(ServerVersion.v_1_15)) {
-            return "g";
-        }
-        //1.15
-        else {
-            return "listeningChannels";
-        }
-    }
-
-    public Plugin getPlugin() {
-        return plugin;
-    }
-}

src/main/java/io/github/retrooper/packetevents/packet/Packet.java

@@ -1,134 +0,0 @@
-package io.github.retrooper.packetevents.packet;
-
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-public abstract class Packet {
-
-    public static class Client {
-        private static final String c = "PacketPlayIn";
-
-        @Deprecated
-        public static final String FLYING = c + "Flying";
-
-
-        public static final String POSITION = c + "Position";
-
-        public static final String POSITION_LOOK = c + "PositionLook";
-
-        public static final String LOOK = c + "Look";
-        public static final String CLIENT_COMMAND = c + "ClientCommand";
-
-        public static final String TRANSACTION = c + "Transaction";
-        public static final String BLOCK_DIG = c + "BlockDig";
-        public static final String ENTITY_ACTION = c + "EntityAction";
-        public static final String USE_ENTITY = c + "UseEntity";
-        public static final String WINDOW_CLICK = c + "WindowClick";
-        public static final String STEER_VEHICLE = c + "SteerVehicle";
-        public static final String CUSTOM_PAYLOAD = c + "CustomPayload";
-        public static final String ARM_ANIMATION = c + "ArmAnimation";
-        /**
-         * The packet name of the block place depending on your server version, "PacketPlayInBlockPlace" or "PacketPlayInUseItem"
-         */
-        public static final String BLOCK_PLACE = c + ((ServerVersion.getVersion().isHigherThan(ServerVersion.v_1_8_8)) ? "UseItem" : "BlockPlace");
-
-        public static final String ABILITIES = c + "Abilities";
-        public static final String HELD_ITEM_SLOT = c + "HeldItemSlot";
-        public static final String CLOSE_WINDOW = c + "CloseWindow";
-        public static final String TAB_COMPLETE = c + "TabComplete";
-        public static final String CHAT = c + "Chat";
-        public static final String SET_CREATIVE_SLOT = c + "SetCreativeSlot";
-
-        public static final String KEEP_ALIVE = c + "KeepAlive";
-
-    }
-
-    public static class Server {
-        private static final String s = "PacketPlayOut";
-
-        public static final String ANIMATION = s + "Animation";
-        public static final String KEEP_ALIVE = s + "KeepAlive";
-        public static final String CHAT = s + "Chat";
-        public static final String POSITION = s + "Position";
-        public static final String TRANSACTION = s + "Transaction";
-        public static final String NAMED_ENTITY_SPAWN = s + "NamedEntitySpawn";
-        public static final String SPAWN_ENTITY_LIVING = s + "SpawnEntityLiving";
-        public static final String SPAWN_ENTITY = s + "SpawnEntity";
-        public static final String CUSTOM_PAYLOAD = s + "CustomPayload";
-        public static final String ABILITIES = s + "Abilities";
-        public static final String ENTITY_METADATA = s + "EntityMetadata";
-        public static final String ENTITY_VELOCITY = s + "EntityVelocity";
-        public static final String ENTITY_DESTROY = s + "EntityDestroy";
-        public static final String ENTITY_HEAD_ROTATION = s + "EntityHeadRotation";
-        public static final String BLOCK_CHANGE = s + "BlockChange";
-        public static final String CLOSE_WINDOW = s + "CloseWindow";
-        public static final String HELD_ITEM_SLOT = s + "HeldItemSlot";
-        public static final String TAB_COMPLETE = s + "TabComplete";
-        public static final String RESPAWN = s + "Respawn";
-        public static final String WORLD_PARTICLES = s + "WorldParticles";
-        public static final String COMMANDS = s + "Commands";
-        public static final String OPEN_WINDOW = s + "OpenWindow";
-        public static final String LOGIN = s + "Login";
-        public static final String SERVER_DIFFICULTY = s + "ServerDifficulty";
-    }
-
-    public static class Login {
-        public static final String HANDSHAKE = "PacketHandshakingInSetProtocol";
-        public static final String PING = "PacketStatusInPing";
-        public static final String START = "PacketStatusInStart";
-        public static final String SUCCESS = "PacketLoginOutSuccess";
-
-        public static final String[] LOGIN_PACKETS = new String[]{"PacketHandshakingInSetProtocol", "PacketLoginInStart", "PacketLoginInEncryptionBegin"};
-    }
-
-    /**
-     * Is this NMS packet an instanceof the "PacketPlayInFlying" packet in the 1.8 protocol?
-     * Supports 1.9->1.15.2 too!
-     * @param nmsPacket
-     * @return If the nms packet provided is an instanceof the "PacketPlayInFlying" packet in the 1.8 protocol!
-     */
-    public static boolean isInstanceOfFlyingPacket(Object nmsPacket) {
-        //1.7->1.8.8
-        if (packetPlayInFlying != null) {
-            return packetPlayInFlying.isInstance(nmsPacket);
-        } else {
-            //1.9->1.15.2
-            return packetPlayInPosition.isInstance(nmsPacket)
-                    || packetPlayInPositionLook.isInstance(nmsPacket)
-                    || packetPlayInLook.isInstance(nmsPacket);
-        }
-    }
-
-    /**
-     * Use isInstanceOfFlyingPacket(nmsPacketObject) instead of this, as the flying packet is the only packet that has subclasses (in 1.8 atleast).
-     * Will be removed in newer versions of PacketEvents!
-     * @param fatherPacket
-     * @param childPacket
-     * @return isInstanceOf
-     */
-    @Deprecated
-    public static boolean isInstanceOf(String fatherPacket, String childPacket) {
-        if (fatherPacket.equals(Client.FLYING) && childPacket.equals(Client.POSITION) || childPacket.equals(Client.POSITION_LOOK) || childPacket.equals(Client.LOOK)) {
-            return true;
-        }
-        return fatherPacket.equals(childPacket);
-    }
-
-    private static Class<?> packetPlayInFlying, packetPlayInPosition, packetPlayInPositionLook, packetPlayInLook;
-
-    static {
-        try {
-            packetPlayInFlying = NMSUtils.getNMSClass(Client.FLYING);
-        } catch (ClassNotFoundException e) {
-            //That is fine, they are on 1.9+ so we just initiate the rest of the variables
-            try {
-                packetPlayInPosition = NMSUtils.getNMSClass(Client.POSITION);
-                packetPlayInPositionLook = NMSUtils.getNMSClass(Client.POSITION_LOOK);
-                packetPlayInLook = NMSUtils.getNMSClass(Client.LOOK);
-            } catch (ClassNotFoundException e2) {
-                e2.printStackTrace();
-            }
-        }
-    }
-
-}

src/main/java/io/github/retrooper/packetevents/packet/PacketType.java

@@ -0,0 +1,211 @@
+package io.github.retrooper.packetevents.packet;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PacketType {
+
+
+    public static class Client {
+        public static class Util {
+            public static boolean isInstanceOfFlying(final byte packetId) {
+                return packetId == FLYING
+                        || packetId == POSITION
+                        || packetId == POSITION_LOOK
+                        || packetId == LOOK;
+            }
+        }
+
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
+
+        public static final byte TELEPORT_ACCEPT = 0,
+                TILE_NBT_QUERY = 1, DIFFICULTY_CHANGE = 2, CHAT = 3, CLIENT_COMMAND = 4,
+                SETTINGS = 5, TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM = 8,
+                WINDOW_CLICK = 9, CLOSE_WINDOW = 10, CUSTOM_PAYLOAD = 11, B_EDIT = 12,
+                ENTITY_NBT_QUERY = 13, USE_ENTITY = 14, JIGSAW_GENERATE = 15, KEEP_ALIVE = 16,
+                DIFFICULTY_LOCK = 17, POSITION = 18, POSITION_LOOK = 19, LOOK = 20,
+                FLYING = 21, VEHICLE_MOVE = 22, BOAT_MOVE = 23, PICK_ITEM = 24,
+                AUTO_RECIPE = 25, ABILITIES = 26, BLOCK_DIG = 27, ENTITY_ACTION = 28,
+                STEER_VEHICLE = 29, RECIPE_DISPLAYED = 30, ITEM_NAME = 31, RESOURCE_PACK_STATUS = 32,
+                ADVANCEMENTS = 33, TR_SEL = 34, BEACON = 35, HELD_ITEM_SLOT = 36,
+                SET_COMMAND_BLOCK = 37, SET_COMMAND_MINECART = 38, SET_CREATIVE_SLOT = 39, SET_JIGSAW = 40,
+                STRUCT = 41, UPDATE_SIGN = 42, ARM_ANIMATION = 43, SPECTATE = 44,
+                USE_ITEM = 45, BLOCK_PLACE = 46;
+
+        public static void init() {
+            packetIds.put(PacketTypeClasses.Client.TELEPORT_ACCEPT, TELEPORT_ACCEPT);
+            packetIds.put(PacketTypeClasses.Client.TILE_NBT_QUERY, TILE_NBT_QUERY);
+            packetIds.put(PacketTypeClasses.Client.DIFFICULTY_CHANGE, DIFFICULTY_CHANGE);
+            packetIds.put(PacketTypeClasses.Client.CHAT, CHAT);
+            packetIds.put(PacketTypeClasses.Client.CLIENT_COMMAND, CLIENT_COMMAND);
+            packetIds.put(PacketTypeClasses.Client.SETTINGS, SETTINGS);
+            packetIds.put(PacketTypeClasses.Client.TAB_COMPLETE, TAB_COMPLETE);
+            packetIds.put(PacketTypeClasses.Client.TRANSACTION, TRANSACTION);
+            packetIds.put(PacketTypeClasses.Client.ENCHANT_ITEM, ENCHANT_ITEM);
+            packetIds.put(PacketTypeClasses.Client.WINDOW_CLICK, WINDOW_CLICK);
+            packetIds.put(PacketTypeClasses.Client.CLOSE_WINDOW, CLOSE_WINDOW);
+            packetIds.put(PacketTypeClasses.Client.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Client.B_EDIT, B_EDIT);
+            packetIds.put(PacketTypeClasses.Client.ENTITY_NBT_QUERY, ENTITY_NBT_QUERY);
+            packetIds.put(PacketTypeClasses.Client.USE_ENTITY, USE_ENTITY);
+            packetIds.put(PacketTypeClasses.Client.JIGSAW_GENERATE, JIGSAW_GENERATE);
+            packetIds.put(PacketTypeClasses.Client.KEEP_ALIVE, KEEP_ALIVE);
+            packetIds.put(PacketTypeClasses.Client.DIFFICULTY_LOCK, DIFFICULTY_LOCK);
+            packetIds.put(PacketTypeClasses.Client.POSITION, POSITION);
+            packetIds.put(PacketTypeClasses.Client.POSITION_LOOK, POSITION_LOOK);
+            packetIds.put(PacketTypeClasses.Client.LOOK, LOOK);
+            packetIds.put(PacketTypeClasses.Client.FLYING, FLYING);
+            packetIds.put(PacketTypeClasses.Client.VEHICLE_MOVE, VEHICLE_MOVE);
+            packetIds.put(PacketTypeClasses.Client.BOAT_MOVE, BOAT_MOVE);
+            packetIds.put(PacketTypeClasses.Client.PICK_ITEM, PICK_ITEM);
+            packetIds.put(PacketTypeClasses.Client.AUTO_RECIPE, AUTO_RECIPE);
+            packetIds.put(PacketTypeClasses.Client.ABILITIES, ABILITIES);
+            packetIds.put(PacketTypeClasses.Client.BLOCK_DIG, BLOCK_DIG);
+            packetIds.put(PacketTypeClasses.Client.ENTITY_ACTION, ENTITY_ACTION);
+            packetIds.put(PacketTypeClasses.Client.STEER_VEHICLE, STEER_VEHICLE);
+            packetIds.put(PacketTypeClasses.Client.RECIPE_DISPLAYED, RECIPE_DISPLAYED);
+            packetIds.put(PacketTypeClasses.Client.ITEM_NAME, ITEM_NAME);
+            packetIds.put(PacketTypeClasses.Client.RESOURCE_PACK_STATUS, RESOURCE_PACK_STATUS);
+            packetIds.put(PacketTypeClasses.Client.ADVANCEMENTS, ADVANCEMENTS);
+            packetIds.put(PacketTypeClasses.Client.TR_SEL, TR_SEL);
+            packetIds.put(PacketTypeClasses.Client.BEACON, BEACON);
+            packetIds.put(PacketTypeClasses.Client.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_BLOCK, SET_COMMAND_BLOCK);
+            packetIds.put(PacketTypeClasses.Client.SET_COMMAND_MINECART, SET_COMMAND_MINECART);
+            packetIds.put(PacketTypeClasses.Client.SET_CREATIVE_SLOT, SET_CREATIVE_SLOT);
+            packetIds.put(PacketTypeClasses.Client.SET_JIGSAW, SET_JIGSAW);
+            packetIds.put(PacketTypeClasses.Client.STRUCT, STRUCT);
+            packetIds.put(PacketTypeClasses.Client.UPDATE_SIGN, UPDATE_SIGN);
+            packetIds.put(PacketTypeClasses.Client.ARM_ANIMATION, ARM_ANIMATION);
+            packetIds.put(PacketTypeClasses.Client.SPECTATE, SPECTATE);
+            packetIds.put(PacketTypeClasses.Client.USE_ITEM, USE_ITEM);
+            packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE);
+        }
+    }
+
+    public static class Server {
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();
+        public static byte SPAWN_ENTITY = 0, SPAWN_ENTITY_EXPERIENCE_ORB = 1, SPAWN_ENTITY_WEATHER = 2, SPAWN_ENTITY_LIVING = 3,
+                SPAWN_ENTITY_PAINTING = 4, SPAWN_ENTITY_SPAWN = 5, ANIMATION = 6, STATISTIC = 7,
+                BLOCK_BREAK = 8, BLOCK_BREAK_ANIMATION = 9, TILE_ENTITY_DATA = 10, BLOCK_ACTION = 11,
+                BLOCK_CHANGE = 12, BOSS = 13, SERVER_DIFFICULTY = 14, CHAT = 15, MULTI_BLOCK_CHANGE = 16,
+                TAB_COMPLETE = 17, COMMANDS = 18, TRANSACTION = 19, CLOSE_WINDOW = 20,
+                WINDOW_ITEMS = 21, WINDOW_DATA = 22, SET_SLOT = 23, SET_COOLDOWN = 24,
+                CUSTOM_PAYLOAD = 25, CUSTOM_SOUND_EFFECT = 26, KICK_DISCONNECT = 27, ENTITY_STATUS = 28,
+                EXPLOSION = 29, UNLOAD_CHUNK = 30, GAME_STATE_CHANGE = 31, OPEN_WINDOW_HORSE = 32,
+                KEEP_ALIVE = 33, MAP_CHUNK = 34, WORLD_EVENT = 35, WORLD_PARTICLES = 36,
+                LIGHT_UPDATE = 37, LOGIN = 38, MAP = 39, OPEN_WINDOW_MERCHANT = 40,
+                REL_ENTITY_MOVE = 41, REL_ENTITY_MOVE_LOOK = 42, ENTITY_LOOK = 43, ENTITY = 44,
+                VEHICLE_MOVE = 45, OPEN_BOOK = 46, OPEN_WINDOW = 47, OPEN_SIGN_EDITOR = 48,
+                AUTO_RECIPE = 49, ABILITIES = 50, COMBAT_EVENT = 51, PLAYER_INFO = 52,
+                LOOK_AT = 53, POSITION = 54, RECIPES = 55, ENTITY_DESTROY = 56,
+                REMOVE_ENTITY_EFFECT = 57, RESOURCE_PACK_SEND = 58, RESPAWN = 59, ENTITY_HEAD_ROTATION = 60,
+                SELECT_ADVANCEMENT_TAB = 61, WORLD_BORDER = 62, CAMERA = 63, HELD_ITEM_SLOT = 64,
+                VIEW_CENTRE = 65, VIEW_DISTANCE = 66, SCOREBOARD_DISPLAY_OBJECTIVE = 67, ENTITY_METADATA = 68,
+                ATTACH_ENTITY = 69, ENTITY_VELOCITY = 70, ENTITY_EQUIPMENT = 71, EXPERIENCE = 72,
+                UPDATE_HEALTH = 73, SCOREBOARD_OBJECTIVE = 74, MOUNT = 75, SCOREBOARD_TEAM = 76,
+                SCOREBOARD_SCORE = 77, SPAWN_POSITION = 78, UPDATE_TIME = 79, TITLE = 80,
+                ENTITY_SOUND = 81, NAMED_SOUND_EFFECT = 82, STOP_SOUND = 83, PLAYER_LIST_HEADER_FOOTER = 84,
+                NBT_QUERY = 85, COLLECT = 86, ENTITY_TELEPORT = 87, ADVANCEMENTS = 88, UPDATE_ATTRIBUTES = 89,
+                ENTITY_EFFECT = 90, RECIPE_UPDATE = 91, TAGS = 92, MAP_CHUNK_BULK = 93;
+
+        public static void init() {
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_EXPERIENCE_ORB);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_WEATHER);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_LIVING, SPAWN_ENTITY_LIVING);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_PAINTING);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY_SPAWN, SPAWN_ENTITY_SPAWN);
+            packetIds.put(PacketTypeClasses.Server.ANIMATION, ANIMATION);
+            packetIds.put(PacketTypeClasses.Server.STATISTIC, STATISTIC);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK, BLOCK_BREAK);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_BREAK_ANIMATION, BLOCK_BREAK_ANIMATION);
+            packetIds.put(PacketTypeClasses.Server.TILE_ENTITY_DATA, TILE_ENTITY_DATA);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_ACTION, BLOCK_ACTION);
+            packetIds.put(PacketTypeClasses.Server.BLOCK_CHANGE, BLOCK_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.BOSS, BOSS);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_ENTITY, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.SERVER_DIFFICULTY, SERVER_DIFFICULTY);
+            packetIds.put(PacketTypeClasses.Server.CHAT, CHAT);
+            packetIds.put(PacketTypeClasses.Server.MULTI_BLOCK_CHANGE, MULTI_BLOCK_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.TAB_COMPLETE, TAB_COMPLETE);
+            packetIds.put(PacketTypeClasses.Server.COMMANDS, COMMANDS);
+            packetIds.put(PacketTypeClasses.Server.TRANSACTION, TRANSACTION);
+            packetIds.put(PacketTypeClasses.Server.CLOSE_WINDOW, CLOSE_WINDOW);
+            packetIds.put(PacketTypeClasses.Server.WINDOW_ITEMS, WINDOW_ITEMS);
+            packetIds.put(PacketTypeClasses.Server.WINDOW_DATA, WINDOW_DATA);
+            packetIds.put(PacketTypeClasses.Server.SET_SLOT, SET_SLOT);
+            packetIds.put(PacketTypeClasses.Server.CUSTOM_PAYLOAD, CUSTOM_PAYLOAD);
+            packetIds.put(PacketTypeClasses.Server.CUSTOM_SOUND_EFFECT, CUSTOM_SOUND_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.KICK_DISCONNECT, KICK_DISCONNECT);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_STATUS, ENTITY_STATUS);
+            packetIds.put(PacketTypeClasses.Server.EXPLOSION, EXPLOSION);
+            packetIds.put(PacketTypeClasses.Server.UNLOAD_CHUNK, UNLOAD_CHUNK);
+            packetIds.put(PacketTypeClasses.Server.GAME_STATE_CHANGE, GAME_STATE_CHANGE);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_HORSE, OPEN_WINDOW_HORSE);
+            packetIds.put(PacketTypeClasses.Server.KEEP_ALIVE, KEEP_ALIVE);
+            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK, MAP_CHUNK);
+            packetIds.put(PacketTypeClasses.Server.WORLD_EVENT, SPAWN_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.WORLD_PARTICLES, WORLD_PARTICLES);
+            packetIds.put(PacketTypeClasses.Server.LIGHT_UPDATE, LIGHT_UPDATE);
+            packetIds.put(PacketTypeClasses.Server.LOGIN, LOGIN);
+            packetIds.put(PacketTypeClasses.Server.MAP, MAP);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW_MERCHANT, OPEN_WINDOW_MERCHANT);
+            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE, REL_ENTITY_MOVE);
+            packetIds.put(PacketTypeClasses.Server.REL_ENTITY_MOVE_LOOK, REL_ENTITY_MOVE_LOOK);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_LOOK, ENTITY_LOOK);
+            packetIds.put(PacketTypeClasses.Server.ENTITY, ENTITY);
+            packetIds.put(PacketTypeClasses.Server.VEHICLE_MOVE, VEHICLE_MOVE);
+            packetIds.put(PacketTypeClasses.Server.OPEN_BOOK, OPEN_BOOK);
+            packetIds.put(PacketTypeClasses.Server.OPEN_WINDOW, OPEN_WINDOW);
+            packetIds.put(PacketTypeClasses.Server.OPEN_SIGN_EDITOR, OPEN_SIGN_EDITOR);
+            packetIds.put(PacketTypeClasses.Server.AUTO_RECIPE, AUTO_RECIPE);
+            packetIds.put(PacketTypeClasses.Server.ABILITIES, ABILITIES);
+            packetIds.put(PacketTypeClasses.Server.COMBAT_EVENT, COMBAT_EVENT);
+            packetIds.put(PacketTypeClasses.Server.PLAYER_INFO, PLAYER_INFO);
+            packetIds.put(PacketTypeClasses.Server.LOOK_AT, LOOK_AT);
+            packetIds.put(PacketTypeClasses.Server.POSITION, POSITION);
+            packetIds.put(PacketTypeClasses.Server.RECIPES, RECIPES);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_DESTROY, ENTITY_DESTROY);
+            packetIds.put(PacketTypeClasses.Server.REMOVE_ENTITY_EFFECT, REMOVE_ENTITY_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.RESOURCE_PACK_SEND, RESOURCE_PACK_SEND);
+            packetIds.put(PacketTypeClasses.Server.RESPAWN, RESPAWN);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_HEAD_ROTATION, ENTITY_HEAD_ROTATION);
+            packetIds.put(PacketTypeClasses.Server.SELECT_ADVANCEMENT_TAB, SELECT_ADVANCEMENT_TAB);
+            packetIds.put(PacketTypeClasses.Server.WORLD_BORDER, WORLD_BORDER);
+            packetIds.put(PacketTypeClasses.Server.CAMERA, CAMERA);
+            packetIds.put(PacketTypeClasses.Server.HELD_ITEM_SLOT, HELD_ITEM_SLOT);
+            packetIds.put(PacketTypeClasses.Server.VIEW_CENTRE, VIEW_CENTRE);
+            packetIds.put(PacketTypeClasses.Server.VIEW_DISTANCE, VIEW_DISTANCE);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_DISPLAY_OBJECTIVE, SCOREBOARD_DISPLAY_OBJECTIVE);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_METADATA, ENTITY_METADATA);
+            packetIds.put(PacketTypeClasses.Server.ATTACH_ENTITY, ATTACH_ENTITY);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_VELOCITY, ENTITY_VELOCITY);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_EQUIPMENT, ENTITY_EQUIPMENT);
+            packetIds.put(PacketTypeClasses.Server.EXPERIENCE, EXPERIENCE);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_HEALTH, UPDATE_HEALTH);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_OBJECTIVE, SCOREBOARD_OBJECTIVE);
+            packetIds.put(PacketTypeClasses.Server.MOUNT, MOUNT);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_TEAM, SCOREBOARD_TEAM);
+            packetIds.put(PacketTypeClasses.Server.SCOREBOARD_SCORE, SCOREBOARD_SCORE);
+            packetIds.put(PacketTypeClasses.Server.SPAWN_POSITION, SPAWN_POSITION);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_TIME, UPDATE_TIME);
+            packetIds.put(PacketTypeClasses.Server.TITLE, TITLE);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_SOUND, ENTITY_SOUND);
+            packetIds.put(PacketTypeClasses.Server.NAMED_SOUND_EFFECT, NAMED_SOUND_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.STOP_SOUND, STOP_SOUND);
+            packetIds.put(PacketTypeClasses.Server.PLAYER_LIST_HEADER_FOOTER, PLAYER_LIST_HEADER_FOOTER);
+            packetIds.put(PacketTypeClasses.Server.NBT_QUERY, NBT_QUERY);
+            packetIds.put(PacketTypeClasses.Server.COLLECT, COLLECT);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_TELEPORT, ENTITY_TELEPORT);
+            packetIds.put(PacketTypeClasses.Server.ADVANCEMENTS, ADVANCEMENTS);
+            packetIds.put(PacketTypeClasses.Server.UPDATE_ATTRIBUTES, UPDATE_ATTRIBUTES);
+            packetIds.put(PacketTypeClasses.Server.ENTITY_EFFECT, ENTITY_EFFECT);
+            packetIds.put(PacketTypeClasses.Server.RECIPE_UPDATE, RECIPE_UPDATE);
+            packetIds.put(PacketTypeClasses.Server.TAGS, TAGS);
+            packetIds.put(PacketTypeClasses.Server.MAP_CHUNK_BULK, MAP_CHUNK_BULK);
+        }
+    }
+
+
+}

src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java

@@ -0,0 +1,234 @@
+package io.github.retrooper.packetevents.packet;
+
+import io.github.retrooper.packetevents.annotations.Nullable;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+public class PacketTypeClasses {
+    public static class Client {
+        public static Class<?> POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
+                TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
+                WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
+                BLOCK_PLACE, USE_ITEM, ABILITIES, HELD_ITEM_SLOT,
+                CLOSE_WINDOW, TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT,
+                KEEP_ALIVE, SETTINGS, ENCHANT_ITEM, TELEPORT_ACCEPT,
+                TILE_NBT_QUERY, DIFFICULTY_CHANGE, B_EDIT, ENTITY_NBT_QUERY,
+                JIGSAW_GENERATE, DIFFICULTY_LOCK, VEHICLE_MOVE, BOAT_MOVE, PICK_ITEM,
+                AUTO_RECIPE, RECIPE_DISPLAYED, ITEM_NAME, RESOURCE_PACK_STATUS,
+                ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK,
+                SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE;
+        private static final String c = "PacketPlayIn";
+        @Nullable
+        public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
+
+        public static void load() {
+            try {
+                POSITION = NMSUtils.getNMSClass(c + "Position");
+                POSITION_LOOK = NMSUtils.getNMSClass(c + "PositionLook");
+                LOOK = NMSUtils.getNMSClass(c + "Look");
+            } catch (ClassNotFoundException e) {
+                POSITION = Reflection.getSubClass(FLYING, c + "Position");
+                POSITION_LOOK = Reflection.getSubClass(FLYING, c + "PositionLook");
+                LOOK = Reflection.getSubClass(FLYING, c + "Look");
+            }
+
+            try {
+                SETTINGS = NMSUtils.getNMSClass(c + "Settings");
+                ENCHANT_ITEM = NMSUtils.getNMSClass(c + "EnchantItem");
+
+                CLIENT_COMMAND = NMSUtils.getNMSClass(c + "ClientCommand");
+                TRANSACTION = NMSUtils.getNMSClass(c + "Transaction");
+                BLOCK_DIG = NMSUtils.getNMSClass(c + "BlockDig");
+                ENTITY_ACTION = NMSUtils.getNMSClass(c + "EntityAction");
+                USE_ENTITY = NMSUtils.getNMSClass(c + "UseEntity");
+                WINDOW_CLICK = NMSUtils.getNMSClass(c + "WindowClick");
+                STEER_VEHICLE = NMSUtils.getNMSClass(c + "SteerVehicle");
+                CUSTOM_PAYLOAD = NMSUtils.getNMSClass(c + "CustomPayload");
+                ARM_ANIMATION = NMSUtils.getNMSClass(c + "ArmAnimation");
+                ABILITIES = NMSUtils.getNMSClass(c + "Abilities");
+                HELD_ITEM_SLOT = NMSUtils.getNMSClass(c + "HeldItemSlot");
+                CLOSE_WINDOW = NMSUtils.getNMSClass(c + "CloseWindow");
+                TAB_COMPLETE = NMSUtils.getNMSClass(c + "TabComplete");
+                CHAT = NMSUtils.getNMSClass(c + "Chat");
+                SET_CREATIVE_SLOT = NMSUtils.getNMSClass(c + "SetCreativeSlot");
+                KEEP_ALIVE = NMSUtils.getNMSClass(c + "KeepAlive");
+                UPDATE_SIGN = NMSUtils.getNMSClassWithoutException(c + "UpdateSign");
+
+                TELEPORT_ACCEPT = NMSUtils.getNMSClassWithoutException(c + "TeleportAccept");
+                TILE_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "TileNBTQuery");
+                DIFFICULTY_CHANGE = NMSUtils.getNMSClassWithoutException(c + "DifficultyChange");
+                B_EDIT = NMSUtils.getNMSClassWithoutException(c + "BEdit");
+                ENTITY_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "EntityNBTQuery");
+                JIGSAW_GENERATE = NMSUtils.getNMSClassWithoutException(c + "JigsawGenerate");
+                DIFFICULTY_LOCK = NMSUtils.getNMSClassWithoutException(c + "DifficultyLock");
+                VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(c + "VehicleMove");
+                BOAT_MOVE = NMSUtils.getNMSClassWithoutException(c + "BoatMove");
+                PICK_ITEM = NMSUtils.getNMSClassWithoutException(c + "PickItem");
+                AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(c + "AutoRecipe");
+                RECIPE_DISPLAYED = NMSUtils.getNMSClassWithoutException(c + "RecipeDisplayed");
+                ITEM_NAME = NMSUtils.getNMSClassWithoutException(c + "ItemName");
+                //1.8+
+                RESOURCE_PACK_STATUS = NMSUtils.getNMSClassWithoutException(c + "ResourcePackStatus");
+
+                ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(c + "Advancements");
+                TR_SEL = NMSUtils.getNMSClassWithoutException(c + "TrSel");
+                BEACON = NMSUtils.getNMSClassWithoutException(c + "Beacon");
+                SET_COMMAND_BLOCK = NMSUtils.getNMSClassWithoutException(c + "SetCommandBlock");
+                SET_COMMAND_MINECART = NMSUtils.getNMSClassWithoutException(c + "SetCommandMinecart");
+                SET_JIGSAW = NMSUtils.getNMSClassWithoutException(c + "SetJigsaw");
+                STRUCT = NMSUtils.getNMSClassWithoutException(c + "Struct");
+                SPECTATE = NMSUtils.getNMSClassWithoutException(c + "Spectate");
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+            //Block place
+            try {
+                BLOCK_PLACE = NMSUtils.getNMSClass(c + "BlockPlace");
+            } catch (ClassNotFoundException e) {
+                //They are just on a newer version
+                try {
+                    USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
+                } catch (ClassNotFoundException e2) {
+                    e.printStackTrace();
+                    e2.printStackTrace();
+                }
+            }
+
+
+            PacketType.Client.init();
+        }
+
+    }
+
+    public static class Server {
+        private static final String s = "PacketPlayOut";
+        public static Class<?> SPAWN_ENTITY, SPAWN_ENTITY_EXPERIENCE_ORB, SPAWN_ENTITY_WEATHER, SPAWN_ENTITY_LIVING,
+                SPAWN_ENTITY_PAINTING, SPAWN_ENTITY_SPAWN, ANIMATION, STATISTIC,
+                BLOCK_BREAK, BLOCK_BREAK_ANIMATION, TILE_ENTITY_DATA, BLOCK_ACTION,
+                BLOCK_CHANGE, BOSS, SERVER_DIFFICULTY, CHAT, MULTI_BLOCK_CHANGE,
+                TAB_COMPLETE, COMMANDS, TRANSACTION, CLOSE_WINDOW,
+                WINDOW_ITEMS, WINDOW_DATA, SET_SLOT, SET_COOLDOWN,
+                CUSTOM_PAYLOAD, CUSTOM_SOUND_EFFECT, KICK_DISCONNECT, ENTITY_STATUS,
+                EXPLOSION, UNLOAD_CHUNK, GAME_STATE_CHANGE, OPEN_WINDOW_HORSE,
+                KEEP_ALIVE, MAP_CHUNK, WORLD_EVENT, WORLD_PARTICLES,
+                LIGHT_UPDATE, LOGIN, MAP, OPEN_WINDOW_MERCHANT,
+                REL_ENTITY_MOVE, REL_ENTITY_MOVE_LOOK, ENTITY_LOOK, ENTITY,
+                VEHICLE_MOVE, OPEN_BOOK, OPEN_WINDOW, OPEN_SIGN_EDITOR,
+                AUTO_RECIPE, ABILITIES, COMBAT_EVENT, PLAYER_INFO,
+                LOOK_AT, POSITION, RECIPES, ENTITY_DESTROY,
+                REMOVE_ENTITY_EFFECT, RESOURCE_PACK_SEND, RESPAWN, ENTITY_HEAD_ROTATION,
+                SELECT_ADVANCEMENT_TAB, WORLD_BORDER, CAMERA, HELD_ITEM_SLOT,
+                VIEW_CENTRE, VIEW_DISTANCE, SCOREBOARD_DISPLAY_OBJECTIVE, ENTITY_METADATA,
+                ATTACH_ENTITY, ENTITY_VELOCITY, ENTITY_EQUIPMENT, EXPERIENCE,
+                UPDATE_HEALTH, SCOREBOARD_OBJECTIVE, MOUNT, SCOREBOARD_TEAM,
+                SCOREBOARD_SCORE, SPAWN_POSITION, UPDATE_TIME, TITLE,
+                ENTITY_SOUND, NAMED_SOUND_EFFECT, STOP_SOUND, PLAYER_LIST_HEADER_FOOTER,
+                NBT_QUERY, COLLECT, ENTITY_TELEPORT, ADVANCEMENTS, UPDATE_ATTRIBUTES,
+                ENTITY_EFFECT, RECIPE_UPDATE, TAGS, MAP_CHUNK_BULK;
+
+        public static void load() {
+            SPAWN_ENTITY = NMSUtils.getNMSClassWithoutException(s + "SpawnEntity");
+            SPAWN_ENTITY_EXPERIENCE_ORB = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityExperienceOrb");
+            SPAWN_ENTITY_WEATHER = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityWeather");
+            SPAWN_ENTITY_LIVING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityLiving");
+            SPAWN_ENTITY_PAINTING = NMSUtils.getNMSClassWithoutException(s + "SpawnEntityPainting");
+            SPAWN_ENTITY_SPAWN = NMSUtils.getNMSClassWithoutException(s + "SpawnEntitySpawn");
+            ANIMATION = NMSUtils.getNMSClassWithoutException(s + "Animation");
+            STATISTIC = NMSUtils.getNMSClassWithoutException(s + "Statistic");
+            BLOCK_BREAK = NMSUtils.getNMSClassWithoutException(s + "BlockBreak");
+            BLOCK_BREAK_ANIMATION = NMSUtils.getNMSClassWithoutException(s + "BlockBreakAnimation");
+            TILE_ENTITY_DATA = NMSUtils.getNMSClassWithoutException(s + "TileEntityData");
+            BLOCK_ACTION = NMSUtils.getNMSClassWithoutException(s + "BlockAction");
+            BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "BlockChange");
+            BOSS = NMSUtils.getNMSClassWithoutException(s + "Boss");
+            SERVER_DIFFICULTY = NMSUtils.getNMSClassWithoutException(s + "ServerDifficulty");
+            CHAT = NMSUtils.getNMSClassWithoutException(s + "Chat");
+            MULTI_BLOCK_CHANGE = NMSUtils.getNMSClassWithoutException(s + "MultiBlockChange");
+            TAB_COMPLETE = NMSUtils.getNMSClassWithoutException(s + "TabComplete");
+            COMMANDS = NMSUtils.getNMSClassWithoutException(s + "Commands");
+            TRANSACTION = NMSUtils.getNMSClassWithoutException(s + "Transaction");
+            CLOSE_WINDOW = NMSUtils.getNMSClassWithoutException(s + "CloseWindow");
+            WINDOW_ITEMS = NMSUtils.getNMSClassWithoutException(s + "WindowItems");
+            WINDOW_DATA = NMSUtils.getNMSClassWithoutException(s + "WindowData");
+            SET_SLOT = NMSUtils.getNMSClassWithoutException(s + "SetSlot");
+            SET_COOLDOWN = NMSUtils.getNMSClassWithoutException(s + "SetCooldown");
+            CUSTOM_PAYLOAD = NMSUtils.getNMSClassWithoutException(s + "CustomPayload");
+            CUSTOM_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "CustomSoundEffect");
+            KICK_DISCONNECT = NMSUtils.getNMSClassWithoutException(s + "KickDisconnect");
+            ENTITY_STATUS = NMSUtils.getNMSClassWithoutException(s + "EntityStatus");
+            EXPLOSION = NMSUtils.getNMSClassWithoutException(s + "Explosion");
+            UNLOAD_CHUNK = NMSUtils.getNMSClassWithoutException(s + "UnloadChunk");
+            GAME_STATE_CHANGE = NMSUtils.getNMSClassWithoutException(s + "GameStateChange");
+            OPEN_WINDOW_HORSE = NMSUtils.getNMSClassWithoutException(s + "OpenWindowHorse");
+            KEEP_ALIVE = NMSUtils.getNMSClassWithoutException(s + "KeepAlive");
+            MAP_CHUNK = NMSUtils.getNMSClassWithoutException(s + "MapChunk");
+            WORLD_EVENT = NMSUtils.getNMSClassWithoutException(s + "WorldEvent");
+            WORLD_PARTICLES = NMSUtils.getNMSClassWithoutException(s + "WorldParticles");
+            LIGHT_UPDATE = NMSUtils.getNMSClassWithoutException(s + "LightUpdate");
+            LOGIN = NMSUtils.getNMSClassWithoutException(s + "Login");
+            MAP = NMSUtils.getNMSClassWithoutException(s + "Map");
+            OPEN_WINDOW_MERCHANT = NMSUtils.getNMSClassWithoutException(s + "OpenWindowMerchant");
+            ENTITY = NMSUtils.getNMSClassWithoutException(s + "Entity");
+            REL_ENTITY_MOVE = Reflection.getSubClass(ENTITY, s + "RelEntityMove");
+            REL_ENTITY_MOVE_LOOK = Reflection.getSubClass(ENTITY, s + "RelEntityMoveLook");
+            ENTITY_LOOK = Reflection.getSubClass(ENTITY, s + "EntityLook");
+            if (REL_ENTITY_MOVE == null) {
+                //is not a subclass and should be accessed normally
+                REL_ENTITY_MOVE = NMSUtils.getNMSClassWithoutException(s + "RelEntityMove");
+                REL_ENTITY_MOVE_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityMoveLook");
+                ENTITY_LOOK = NMSUtils.getNMSClassWithoutException(s + "RelEntityLook");
+            }
+            VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(s + "VehicleMove");
+            OPEN_BOOK = NMSUtils.getNMSClassWithoutException(s + "OpenBook");
+            OPEN_WINDOW = NMSUtils.getNMSClassWithoutException(s + "OpenWindow");
+            OPEN_SIGN_EDITOR = NMSUtils.getNMSClassWithoutException(s + "OpenSignEditor");
+            AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(s + "AutoRecipe");
+            ABILITIES = NMSUtils.getNMSClassWithoutException(s + "Abilities");
+            COMBAT_EVENT = NMSUtils.getNMSClassWithoutException(s + "CombatEvent");
+            PLAYER_INFO = NMSUtils.getNMSClassWithoutException(s + "PlayerInfo");
+            LOOK_AT = NMSUtils.getNMSClassWithoutException(s + "LookAt");
+            POSITION = NMSUtils.getNMSClassWithoutException(s + "Position");
+            RECIPES = NMSUtils.getNMSClassWithoutException(s + "Recipes");
+            ENTITY_DESTROY = NMSUtils.getNMSClassWithoutException(s + "EntityDestroy");
+            REMOVE_ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "RemoveEntityEffect");
+            RESOURCE_PACK_SEND = NMSUtils.getNMSClassWithoutException(s + "ResourcePackSend");
+            RESPAWN = NMSUtils.getNMSClassWithoutException(s + "Respawn");
+            ENTITY_HEAD_ROTATION = NMSUtils.getNMSClassWithoutException(s + "EntityHeadRotation");
+            SELECT_ADVANCEMENT_TAB = NMSUtils.getNMSClassWithoutException(s + "SelectAdvancementTab");
+            WORLD_BORDER = NMSUtils.getNMSClassWithoutException(s + "WorldBorder");
+            CAMERA = NMSUtils.getNMSClassWithoutException(s + "Camera");
+            HELD_ITEM_SLOT = NMSUtils.getNMSClassWithoutException(s + "HeldItemSlot");
+            VIEW_CENTRE = NMSUtils.getNMSClassWithoutException(s + "ViewCentre");
+            VIEW_DISTANCE = NMSUtils.getNMSClassWithoutException(s + "ViewDistance");
+            SCOREBOARD_DISPLAY_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardDisplayObjective");
+            ENTITY_METADATA = NMSUtils.getNMSClassWithoutException(s + "EntityMetadata");
+            ATTACH_ENTITY = NMSUtils.getNMSClassWithoutException(s + "AttachEntity");
+            ENTITY_VELOCITY = NMSUtils.getNMSClassWithoutException(s + "EntityVelocity");
+            ENTITY_EQUIPMENT = NMSUtils.getNMSClassWithoutException(s + "EntityEquipment");
+            EXPERIENCE = NMSUtils.getNMSClassWithoutException(s + "Experience");
+            UPDATE_HEALTH = NMSUtils.getNMSClassWithoutException(s + "UpdateHealth");
+            SCOREBOARD_OBJECTIVE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardObjective");
+            MOUNT = NMSUtils.getNMSClassWithoutException(s + "Mount");
+            SCOREBOARD_TEAM = NMSUtils.getNMSClassWithoutException(s + "ScoreboardTeam");
+            SCOREBOARD_SCORE = NMSUtils.getNMSClassWithoutException(s + "ScoreboardScore");
+            SPAWN_POSITION = NMSUtils.getNMSClassWithoutException(s + "SpawnPosition");
+            UPDATE_TIME = NMSUtils.getNMSClassWithoutException(s + "UpdateTime");
+            TITLE = NMSUtils.getNMSClassWithoutException(s + "Title");
+            ENTITY_SOUND = NMSUtils.getNMSClassWithoutException(s + "EntitySound");
+            NAMED_SOUND_EFFECT = NMSUtils.getNMSClassWithoutException(s + "NamedSoundEffect");
+            STOP_SOUND = NMSUtils.getNMSClassWithoutException(s + "StopSound");
+            PLAYER_LIST_HEADER_FOOTER = NMSUtils.getNMSClassWithoutException(s + "PlayerListHeaderFooter");
+            NBT_QUERY = NMSUtils.getNMSClassWithoutException(s + "NBTQuery");
+            COLLECT = NMSUtils.getNMSClassWithoutException(s + "Collect");
+            ENTITY_TELEPORT = NMSUtils.getNMSClassWithoutException(s + "EntityTeleport");
+            ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(s + "Advancements");
+            UPDATE_ATTRIBUTES = NMSUtils.getNMSClassWithoutException(s + "UpdateAttributes");
+            ENTITY_EFFECT = NMSUtils.getNMSClassWithoutException(s + "EntityEffect");
+            RECIPE_UPDATE = NMSUtils.getNMSClassWithoutException(s + "RecipeUpdate");
+            TAGS = NMSUtils.getNMSClassWithoutException(s + "Tags");
+            MAP_CHUNK_BULK = NMSUtils.getNMSClassWithoutException(s + "MapChunkBulk");
+            PacketType.Server.init();
+        }
+    }
+
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/Sendable.java

@@ -1,5 +1,5 @@
 package io.github.retrooper.packetevents.packetwrappers;
 
 public interface Sendable {
-    public Object asNMSPacket();
+    Object asNMSPacket();
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java

@@ -4,13 +4,13 @@ import io.github.retrooper.packetevents.enums.ServerVersion;
 import org.bukkit.entity.Player;
 
 public class WrappedPacket {
+    protected static ServerVersion version = ServerVersion.getVersion();
     protected final Player player;
     protected Object packet;
-    protected static ServerVersion version = ServerVersion.getVersion();
 
     public WrappedPacket(final Object packet) {
         this.player = null;
-        if(packet == null)return;
+        if (packet == null) return;
         this.packet = packet;
         try {
             setup();
@@ -21,7 +21,7 @@ public class WrappedPacket {
 
     public WrappedPacket(final Player player, final Object packet) {
         this.player = player;
-        if(packet == null)return;
+        if (packet == null) return;
         this.packet = packet;
         try {
             setup();
@@ -30,7 +30,7 @@ public class WrappedPacket {
         }
     }
 
-    protected void setup()  {
+    protected void setup() {
 
     }
 

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/abilities/WrappedPacketInAbilities.java

@@ -1,11 +1,21 @@
 package io.github.retrooper.packetevents.packetwrappers.in.abilities;
 
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInAbilities extends WrappedPacket {
+    private static Class<?> abilitiesClass;
+
+    static {
+
+        try {
+            abilitiesClass = NMSUtils.getNMSClass("PacketPlayInAbilities");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     private boolean isVulnerable;
     private boolean isFlying;
     private boolean allowFly;
@@ -20,12 +30,12 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
     @Override
     protected void setup() {
         try {
-            this.isVulnerable = fields[0].getBoolean(packet);
-            this.isFlying = fields[1].getBoolean(packet);
-            this.allowFly = fields[2].getBoolean(packet);
-            this.instantBuild = fields[3].getBoolean(packet);
-            this.flySpeed = fields[4].getFloat(packet);
-            this.walkSpeed = fields[5].getFloat(packet);
+            this.isVulnerable = Reflection.getField(abilitiesClass, boolean.class, 0).getBoolean(packet);
+            this.isFlying = Reflection.getField(abilitiesClass, boolean.class, 1).getBoolean(packet);
+            this.allowFly = Reflection.getField(abilitiesClass, boolean.class, 2).getBoolean(packet);
+            this.instantBuild = Reflection.getField(abilitiesClass, boolean.class, 3).getBoolean(packet);
+            this.flySpeed = Reflection.getField(abilitiesClass, float.class, 0).getFloat(packet);
+            this.walkSpeed = Reflection.getField(abilitiesClass, float.class, 1).getFloat(packet);
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
@@ -39,7 +49,7 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
         return isFlying;
     }
 
-    public boolean canFly() {
+    public boolean isFlightAllowed() {
         return allowFly;
     }
 
@@ -54,35 +64,4 @@ public final class WrappedPacketInAbilities extends WrappedPacket {
     public float getWalkSpeed() {
         return walkSpeed;
     }
-
-    private static Class<?> abilitiesClass;
-
-    private static Field[] fields = new Field[6];
-
-    static {
-
-        try {
-            abilitiesClass = NMSUtils.getNMSClass("PacketPlayInAbilities");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-
-        try {
-            fields[0] = abilitiesClass.getDeclaredField("a");
-            fields[1] = abilitiesClass.getDeclaredField("b");
-            fields[2] = abilitiesClass.getDeclaredField("c");
-            fields[3] = abilitiesClass.getDeclaredField("d");
-            fields[4] = abilitiesClass.getDeclaredField("e");
-            fields[5] = abilitiesClass.getDeclaredField("f");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (Field f : fields) {
-            if (f != null) {
-                f.setAccessible(true);
-            }
-        }
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java

@@ -1,16 +1,36 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockdig;
 
 import io.github.retrooper.packetevents.enums.Direction;
-import io.github.retrooper.packetevents.enums.PlayerDigType;
 import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.enums.minecraft.PlayerDigType;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
 
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInBlockDig extends WrappedPacket {
+    private static Class<?> blockDigClass, blockPositionClass, enumDirectionClass, digTypeClass;
+
+    static {
+
+        try {
+            blockDigClass = NMSUtils.getNMSClass("PacketPlayInBlockDig");
+            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
+                blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
+                enumDirectionClass = NMSUtils.getNMSClass("EnumDirection");
+            }
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            digTypeClass = NMSUtils.getNMSClass("EnumPlayerDigType");
+        } catch (ClassNotFoundException e) {
+            //It is probably a subclass
+            digTypeClass = Reflection.getSubClass(blockDigClass, "EnumPlayerDigType");
+        }
+    }
+
     private Vector3i blockPosition;
     private Direction direction;
     private PlayerDigType digType;
@@ -19,45 +39,43 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
         super(packet);
     }
 
-
     @Override
     protected void setup() {
         Direction enumDirection = null;
         PlayerDigType enumDigType = null;
         //1.7.10
         try {
-            if (version == ServerVersion.v_1_7_10) {
-                final int x = fields[0].getInt(packet);
-                final int y = fields[1].getInt(packet);
-                final int z = fields[2].getInt(packet);
-
-                this.blockPosition = new Vector3i(x, y, z);
-
-                enumDirection = Direction.get((byte) face.getInt(packet));
-                enumDigType = PlayerDigType.get((byte) e.getInt(packet));
+            if (version.isLowerThan(ServerVersion.v_1_8)) {
+                setupCoordinates(blockDigClass, packet);
+                enumDirection = Direction.get(Reflection.getField(digTypeClass, int.class, 3).getInt(packet));
+                enumDigType = PlayerDigType.get(Reflection.getField(digTypeClass, int.class, 4).getInt(packet));
             } else {
                 //1.8+
-                final Object blockPosObj = fields[0].get(packet);
-                final Object enumDirectionObj = fields[1].get(packet);
-                final Object digTypeObj = fields[2].get(packet);
+                final Object blockPosObj = Reflection.getField(blockDigClass, blockPositionClass, 0).get(packet);
+                final Object enumDirectionObj = Reflection.getField(blockDigClass, enumDirectionClass, 0).get(packet);
+                final Object digTypeObj = Reflection.getField(blockDigClass, digTypeClass, 0).get(packet);
 
-                final int x = blockPosXYZ[0].get(blockPosObj);
-                final int y = blockPosXYZ[1].get(blockPosObj);
-                final int z = blockPosXYZ[2].get(blockPosObj);
-
-                this.blockPosition = new Vector3i(x, y, z);
+                Class<?> blockPosSuper = blockPositionClass;
+                setupCoordinates(blockPosSuper, blockPosObj);
 
                 enumDirection = Direction.valueOf(((Enum) enumDirectionObj).name());
                 enumDigType = PlayerDigType.valueOf(((Enum) digTypeObj).name());
             }
-        }
-        catch(IllegalAccessException e) {
+        } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-        this.direction =  enumDirection;
+        this.direction = enumDirection;
         this.digType = enumDigType;
     }
 
+    private void setupCoordinates(final Class<?> cls, final Object object) throws IllegalAccessException {
+        final int x = Reflection.getField(cls, int.class, 0).getInt(object);
+        final int y = Reflection.getField(cls, int.class, 1).getInt(object);
+        final int z = Reflection.getField(cls, int.class, 2).getInt(object);
+
+        this.blockPosition = new Vector3i(x, y, z);
+    }
+
     public Vector3i getBlockPosition() {
         return blockPosition;
     }
@@ -70,68 +88,5 @@ public final class WrappedPacketInBlockDig extends WrappedPacket {
         return digType;
     }
 
-    //ALL
-    private static Class<?> blockDigClass;
-
-
-    //1.8
-    private static Field[] fields = new Field[3];
-
-    private static Class<?> blockPositionClass;
-
-    private static Reflection.FieldAccessor<Integer>[] blockPosXYZ = new Reflection.FieldAccessor[3];
-
-    //1.7
-    private static Field face;
-
-    private static Field e;
-
-    static {
-
-        try {
-            blockDigClass = NMSUtils.getNMSClass("PacketPlayInBlockDig");
-            if (version != ServerVersion.v_1_7_10) {
-                blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-
-        try {
-            //blockpos
-            fields[0] = blockDigClass.getDeclaredField("a");
-            //direction
-            fields[1] = blockDigClass.getDeclaredField("b");
-            //digtype
-            fields[2] = blockDigClass.getDeclaredField("c");
-
-            if (version != ServerVersion.v_1_7_10) {
-                blockPosXYZ[0] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 0);
-                blockPosXYZ[1] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 1);
-                blockPosXYZ[2] = Reflection.getField(blockPositionClass.getSuperclass(), int.class, 2);
-            } else {
-                face = blockDigClass.getDeclaredField("face");
-                e = blockDigClass.getDeclaredField("e");
-            }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for(Field f : fields) {
-            if(f != null) {
-                f.setAccessible(true);
-            }
-        }
-
-        if(e != null) {
-            e.setAccessible(true);
-        }
-
-        if(face != null) {
-            face.setAccessible(true);
-        }
-    }
-
 
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace.java

@@ -9,6 +9,12 @@ import org.bukkit.inventory.ItemStack;
 
 
 public final class WrappedPacketInBlockPlace extends WrappedPacket {
+    static {
+        if (version.isHigherThan(ServerVersion.v_1_7_10)) {
+            WrappedPacketInBlockPlace_1_8.initStatic();
+        }
+    }
+
     private Vector3i blockPosition;
     private ItemStack itemStack;
 
@@ -22,22 +28,27 @@ public final class WrappedPacketInBlockPlace extends WrappedPacket {
         Vector3i position = null;
         ItemStack itemStack = null;
         try {
-        if (version.isHigherThan(ServerVersion.v_1_8_8)) {
-            final WrappedPacketInBlockPlace_1_9 updatedBlockPlace = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
-            final Block block = updatedBlockPlace.getBlock();
-            position = new Vector3i(block.getX(), block.getY(), block.getZ());
-            itemStack = new ItemStack(block.getType());
-        } else {
-            final WrappedPacketInBlockPlace_1_8 legacyBlockPlace = new WrappedPacketInBlockPlace_1_8(packet);
-            position = legacyBlockPlace.getBlockPosition();
-            itemStack = legacyBlockPlace.getItemStack();
-        } }
-        catch(IllegalArgumentException e) {
+            if (version.isHigherThan(ServerVersion.v_1_8_8)) {
+                final WrappedPacketInBlockPlace_1_9 blockPlace_1_9 = new WrappedPacketInBlockPlace_1_9(getPlayer(), packet);
+                final Block block = blockPlace_1_9.getBlock();
+                position = new Vector3i(block.getX(), block.getY(), block.getZ());
+                itemStack = new ItemStack(block.getType());
+            } else if (version.isHigherThan(ServerVersion.v_1_7_10)) {
+                final WrappedPacketInBlockPlace_1_8 blockPlace_1_8 = new WrappedPacketInBlockPlace_1_8(packet);
+                position = blockPlace_1_8.getBlockPosition();
+                itemStack = blockPlace_1_8.getItemStack();
+            } else {
+                final WrappedPacketInBlockPlace_1_7_10 blockPlace_1_7_10 = new WrappedPacketInBlockPlace_1_7_10(getPlayer(), packet);
+                position = blockPlace_1_7_10.getBlockPosition();
+                this.itemStack = blockPlace_1_7_10.getItemStack();
+            }
+        } catch (IllegalArgumentException e) {
             e.printStackTrace();
         }
         this.blockPosition = position;
         this.itemStack = itemStack;
     }
+
     public Player getPlayer() {
         return this.player;
     }
@@ -50,12 +61,4 @@ public final class WrappedPacketInBlockPlace extends WrappedPacket {
         return itemStack;
     }
 
-    static {
-        if (version.isHigherThan(ServerVersion.v_1_8_8)) {
-            WrappedPacketInBlockPlace_1_9.initStatic();
-        } else if(version.isLowerThan(ServerVersion.v_1_9) && version.isHigherThan(ServerVersion.v_1_7_10)){
-            WrappedPacketInBlockPlace_1_8.initStatic();
-        }
-    }
-
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_7_10.java

@@ -10,6 +10,7 @@ final class WrappedPacketInBlockPlace_1_7_10 extends WrappedPacket {
     private Vector3i blockPosition;
     private ItemStack itemStack;
     private int blockFace;
+
     WrappedPacketInBlockPlace_1_7_10(final Player player, final Object packet) {
         super(player, packet);
     }
@@ -17,14 +18,14 @@ final class WrappedPacketInBlockPlace_1_7_10 extends WrappedPacket {
 
     @Override
     protected void setup() {
-        final PacketPlayInBlockPlace blockPlace = (PacketPlayInBlockPlace)packet;
+        final PacketPlayInBlockPlace blockPlace = (PacketPlayInBlockPlace) packet;
 
         this.blockPosition = new Vector3i(blockPlace.c(), blockPlace.d(), blockPlace.e());
 
         this.blockFace = blockPlace.d();
 
         net.minecraft.server.v1_7_R4.ItemStack stack = blockPlace.getItemStack();
-       this.itemStack = org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack.asBukkitCopy(stack);
+        this.itemStack = org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack.asBukkitCopy(stack);
     }
 
     public Vector3i getBlockPosition() {

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_8.java

@@ -1,29 +1,49 @@
 package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import io.github.retrooper.packetevents.utils.vector.Vector3i;
 import org.bukkit.inventory.ItemStack;
 
+import java.lang.reflect.InvocationTargetException;
+
 final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
+    private static Class<?> blockPlaceClass, blockPositionClass;
     private Vector3i blockPosition;
     private ItemStack itemStack;
+
     WrappedPacketInBlockPlace_1_8(final Object packet) {
         super(packet);
     }
 
+    protected static void initStatic() {
+        try {
+            blockPlaceClass = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
+
+            blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     protected void setup() {
-        Object nmsBlockPos = blockPositionAccessor.get(packet);
+        try {
+            Object nmsBlockPos = Reflection.getField(blockPlaceClass, blockPositionClass, 1).get(packet);
 
-        int x = (int) blockPositionXYZInvoker[0].invoke(nmsBlockPos);
-        int y = (int) blockPositionXYZInvoker[1].invoke(nmsBlockPos);
-        int z = (int) blockPositionXYZInvoker[2].invoke(nmsBlockPos);
+            final int[] coords = new int[3];
+            for (int i = 0; i < 3; i++) {
+                final String s = "get" + (i == 0 ? "X" : i == 1 ? "Y" : "Z");
+                coords[i] = (int) Reflection.getMethod(blockPositionClass.getSuperclass(), s, 0).invoke(nmsBlockPos);
+            }
 
-        this.blockPosition = new Vector3i(x, y, z);
+            this.blockPosition = new Vector3i(coords[0], coords[1], coords[2]);
 
-        this.itemStack = NMSUtils.toBukkitItemStack(itemStackFieldAccessor.get(packet));
+            this.itemStack = NMSUtils.toBukkitItemStack(Reflection.getField(blockPlaceClass, NMSUtils.nmsItemStackClass, 0).get(packet));
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
     }
 
     public Vector3i getBlockPosition() {
@@ -33,27 +53,4 @@ final class WrappedPacketInBlockPlace_1_8 extends WrappedPacket {
     public ItemStack getItemStack() {
         return itemStack;
     }
-
-    private static Class<?> blockPlaceClass, blockPositionClass;
-
-    private static Reflection.FieldAccessor<?> blockPositionAccessor, itemStackFieldAccessor;
-    private static final Reflection.MethodInvoker[] blockPositionXYZInvoker = new Reflection.MethodInvoker[3];
-
-    protected static void initStatic(){
-        try {
-            blockPlaceClass = NMSUtils.getNMSClass("PacketPlayInBlockPlace");
-
-            blockPositionClass = NMSUtils.getNMSClass("BlockPosition");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        itemStackFieldAccessor = Reflection.getField(blockPlaceClass, NMSUtils.nmsItemStackClass, 0);
-
-        blockPositionAccessor = Reflection.getField(blockPlaceClass, blockPositionClass, 1);
-
-        blockPositionXYZInvoker[0] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getX");
-        blockPositionXYZInvoker[1] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getY");
-        blockPositionXYZInvoker[2] = Reflection.getMethod(blockPositionClass.getSuperclass(), "getZ");
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockplace/WrappedPacketInBlockPlace_1_9.java

@@ -2,13 +2,10 @@ package io.github.retrooper.packetevents.packetwrappers.in.blockplace;
 
 
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-import org.bukkit.Material;
+import io.github.retrooper.packetevents.utils.BlockIteratorUtils;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-import java.util.HashSet;
-
 final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
     private Block block;
 
@@ -16,10 +13,10 @@ final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
         super(player, packet);
     }
 
+
     @Override
     protected void setup() {
-        this.block = getPlayer().getTargetBlock((HashSet<Material>)null, 3);
-
+        this.block = BlockIteratorUtils.getBlockLookingAt(getPlayer(), 3);
     }
 
     public Player getPlayer() {
@@ -30,14 +27,5 @@ final class WrappedPacketInBlockPlace_1_9 extends WrappedPacket {
         return block;
     }
 
-    private static Class<?> blockPlaceClass_1_9;
-    protected static void initStatic() {
-        try {
-            blockPlaceClass_1_9 = NMSUtils.getNMSClass("PacketPlayInUseItem");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
 
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/chat/WrappedPacketInChat.java

@@ -1,22 +1,31 @@
 package io.github.retrooper.packetevents.packetwrappers.in.chat;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInChat extends WrappedPacket {
+    private static Class<?> chatPacketClass;
+
+    static {
+        try {
+            chatPacketClass = NMSUtils.getNMSClass("PacketPlayInChat");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     private String message;
 
     public WrappedPacketInChat(Object packet) {
         super(packet);
     }
 
+
     @Override
     protected void setup() {
         try {
-            final Object obj = field.get(packet);
+            final Object obj = Reflection.getField(chatPacketClass, String.class, 0).get(packet);
             this.message = obj.toString();
         } catch (IllegalAccessException e) {
             e.printStackTrace();
@@ -26,32 +35,4 @@ public final class WrappedPacketInChat extends WrappedPacket {
     public String getMessage() {
         return message;
     }
-
-    private static Class<?> chatPacketClass;
-
-    private static Field field;
-
-    static {
-
-        try {
-            chatPacketClass = NMSUtils.getNMSClass("PacketPlayInChat");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            field = chatPacketClass.getDeclaredField(getChatFieldName());
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        field.setAccessible(true);
-    }
-
-    private static String getChatFieldName() {
-        if (version == ServerVersion.v_1_7_10) {
-            return "message";
-        }
-        return "a";
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/entityaction/WrappedPacketInEntityAction.java

@@ -1,15 +1,36 @@
 package io.github.retrooper.packetevents.packetwrappers.in.entityaction;
 
-import io.github.retrooper.packetevents.enums.PlayerAction;
+import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.enums.minecraft.PlayerAction;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.entity.Entity;
 
-import io.github.retrooper.packetevents.annotations.Nullable;
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInEntityAction extends WrappedPacket {
+    private static Class<?> entityActionClass;
+    @Nullable
+    private static Class<?> enumPlayerActionClass;
+
+    static {
+        try {
+            entityActionClass = NMSUtils.getNMSClass("PacketPlayInEntityAction");
+            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
+                for (final Class<?> sub : entityActionClass.getDeclaredClasses()) {
+                    if (sub.getSimpleName().equals("EnumPlayerAction")) {
+                        enumPlayerActionClass = sub;
+                        break;
+                    }
+                }
+            } else {
+                enumPlayerActionClass = NMSUtils.getNMSClass("EnumPlayerAction");
+            }
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     private Entity entity;
     private int entityId;
     private PlayerAction action;
@@ -22,34 +43,37 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
     @Override
     protected void setup() {
         try {
-            final int entityId = fields[0].getInt(packet);
-            final int jumpBoost = fields[2].getInt(packet);
+            final int entityId = Reflection.getField(entityActionClass, int.class, 0).getInt(packet);
+            final int jumpBoost;
+            if (version.isLowerThan(ServerVersion.v_1_8)) {
+                jumpBoost = Reflection.getField(entityActionClass, int.class, 2).getInt(packet);
+            } else {
+                jumpBoost = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
+            }
 
             int animationIndex = -1;
 
             //1.7.10
             if (version.isLowerThan(ServerVersion.v_1_8)) {
-                animationIndex = fields[1].getInt(packet);
+                animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
             } else {
-                final Object enumObj = fields[1].get(packet);
-
-                final Object[] enumValues = enumPlayerActionConstants;
-                final int len = enumValues.length;
-                for (int i = 0; i < len; i++) {
-                    final Object val = enumValues[i];
-                    if (val.toString().equals(enumObj.toString())) {
-                        animationIndex = i;
-                        break;
-                    }
+                final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
+                final String enumValue = enumObj.toString();
+                try {
+                    this.action = PlayerAction.valueOf(enumValue);
+                } catch (IllegalArgumentException e) {
+                    //They aren't on a legacy version and the enum has changed
+                    final PlayerAction.UpdatedPlayerAction updatedPlayerAction = PlayerAction.UpdatedPlayerAction.valueOf(enumValue);
+                    this.action = PlayerAction.get(updatedPlayerAction.getIndex());
                 }
             }
 
 
             this.entityId = entityId;
-            this.action = action;
             this.jumpBoost = jumpBoost;
-            this.action = PlayerAction.get((byte) animationIndex);
-
+            if (animationIndex != -1) {
+                this.action = PlayerAction.get(animationIndex);
+            }
             this.entity = NMSUtils.getEntityById(this.entityId);
         } catch (IllegalAccessException e) {
             e.printStackTrace();
@@ -71,41 +95,4 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
     public int getJumpBoost() {
         return jumpBoost;
     }
-
-    private static Class<?> entityActionClass;
-
-    @Nullable
-    private static Class<?> enumPlayerActionClass;
-
-    private static Field[] fields = new Field[3];
-
-    @Nullable
-    private static Object[] enumPlayerActionConstants;
-
-    static {
-        try {
-            entityActionClass = NMSUtils.getNMSClass("PacketPlayInEntityAction");
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                enumPlayerActionClass = NMSUtils.getNMSClass("PacketPlayInEntityAction$EnumPlayerAction");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            //ints in 1.7.10, EnumPlayerAction in 1.8+
-            fields[0] = entityActionClass.getDeclaredField("a");
-            fields[1] = entityActionClass.getDeclaredField("animation");
-            fields[2] = entityActionClass.getDeclaredField("c");
-            if (version.isHigherThan(ServerVersion.v_1_7_10)) {
-                enumPlayerActionConstants = enumPlayerActionClass.getEnumConstants();
-            }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (final Field f : fields) {
-            f.setAccessible(true);
-        }
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/flying/WrappedPacketInFlying.java

@@ -1,13 +1,22 @@
 package io.github.retrooper.packetevents.packetwrappers.in.flying;
 
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
-import java.lang.reflect.Field;
-
 public class WrappedPacketInFlying extends WrappedPacket {
+    private static Class<?> flyingClass;
+
+    static {
+
+        try {
+            flyingClass = NMSUtils.getNMSClass("PacketPlayInFlying");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     private double x;
     private double y;
     private double z;
@@ -24,54 +33,23 @@ public class WrappedPacketInFlying extends WrappedPacket {
     @Override
     protected void setup() {
         try {
-            this.x = fields[0].getDouble(packet);
-            this.y = fields[1].getDouble(packet);
-            this.z = fields[2].getDouble(packet);
+            //x, y, z, yaw pitch, onGround, isPosition, isLook
+            this.x = Reflection.getField(flyingClass, double.class, 0).getDouble(packet);
+            this.y = Reflection.getField(flyingClass, double.class, 1).getDouble(packet);
+            this.z = Reflection.getField(flyingClass, double.class, 2).getDouble(packet);
 
-            this.yaw = fields[3].getFloat(packet);
-            this.pitch = fields[4].getFloat(packet);
+            this.yaw = Reflection.getField(flyingClass, float.class, 0).getFloat(packet);
+            this.pitch = Reflection.getField(flyingClass, float.class, 1).getFloat(packet);
 
-            this.onGround = fields[5].getBoolean(packet);
+            this.onGround = Reflection.getField(flyingClass, boolean.class, 0).getBoolean(packet);
 
-            this.isPosition = fields[6].getBoolean(packet);
-            this.isLook = fields[7].getBoolean(packet);
+            this.isPosition = Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
+            this.isLook = Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
     }
 
-    public static class WrappedPacketInPosition extends WrappedPacketInFlying {
-        public WrappedPacketInPosition(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        public boolean isPosition() {
-            return true;
-        }
-
-        @Override
-        public boolean isLook() {
-            return false;
-        }
-    }
-
-    public static class WrappedPacketInPosition_Look extends WrappedPacketInFlying {
-        public WrappedPacketInPosition_Look(Object packet) {
-            super(packet);
-        }
-
-        @Override
-        public boolean isLook() {
-            return true;
-        }
-
-        @Override
-        public boolean isPosition() {
-            return false;
-        }
-    }
-
     public final double getX() {
         return x;
     }
@@ -104,44 +82,83 @@ public class WrappedPacketInFlying extends WrappedPacket {
         return isLook;
     }
 
-    private static Class<?> flyingClass;
-
-    private static Field[] fields = new Field[8]; //x, y, z, yaw pitch, onGround, isPositionPacket, isLookPacket
-
-    static {
-
-        try {
-            flyingClass = NMSUtils.getNMSClass("PacketPlayInFlying");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+    public static class WrappedPacketInPosition extends WrappedPacketInFlying {
+        public WrappedPacketInPosition(Object packet) {
+            super(packet);
         }
 
-
-        try {
-            fields[0] = flyingClass.getDeclaredField("x");
-            fields[1] = flyingClass.getDeclaredField("y");
-            fields[2] = flyingClass.getDeclaredField("z");
-            fields[3] = flyingClass.getDeclaredField("yaw");
-            fields[4] = flyingClass.getDeclaredField("pitch");
-            fields[5] = flyingClass.getDeclaredField(getOnGroundFieldName());
-            fields[6] = flyingClass.getDeclaredField("hasPos");
-            fields[7] = flyingClass.getDeclaredField("hasLook");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (Field f : fields) {
-            if (f != null) {
-                f.setAccessible(true);
+        @Override
+        public boolean isPosition() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
             }
+            return true;
+        }
+
+        @Override
+        public boolean isLook() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            return false;
         }
     }
 
-    private static String getOnGroundFieldName() {
-        if (version == ServerVersion.v_1_7_10) {
-            return "g";
+    public static class WrappedPacketInPosition_Look extends WrappedPacketInFlying {
+        public WrappedPacketInPosition_Look(Object packet) {
+            super(packet);
+        }
+
+        @Override
+        public boolean isPosition() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+
+        @Override
+        public boolean isLook() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+    }
+
+    public static class WrappedPacketInLook extends WrappedPacketInFlying {
+
+        public WrappedPacketInLook(Object packet) {
+            super(packet);
+        }
+
+        @Override
+        public boolean isPosition() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 1).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            return false;
+        }
+
+        @Override
+        public boolean isLook() {
+            try {
+                return Reflection.getField(flyingClass, boolean.class, 2).getBoolean(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            return true;
         }
-        return "f";
     }
 
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/keepalive/WrappedPacketInKeepAlive.java

@@ -1,58 +1,50 @@
 package io.github.retrooper.packetevents.packetwrappers.in.keepalive;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInKeepAlive extends WrappedPacket {
-    public WrappedPacketInKeepAlive(final Object packet) {
-        super(packet);
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInKeepAlive");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     private long id;
 
+    public WrappedPacketInKeepAlive(final Object packet) {
+        super(packet);
+    }
+
     @Override
     protected void setup() {
-        try {
-            if (version.isHigherThan(ServerVersion.v_1_12)) {
-                this.id = idField.getLong(packet);
-            } else {
-                this.id = idField.getInt(packet);
+        if (Reflection.getField(packetClass, int.class, 0) == null) {
+            try {
+                this.id = Reflection.getField(packetClass, long.class, 0).getLong(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                this.id = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
             }
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
         }
     }
 
     /**
-     * Cast this long to an integer if you are using 1.7.10->1.12.2!
-     * In 1.13.2->1.15.2 a long is sent
+     * Optionally Cast this long to an integer if you are using 1.7.10->1.12.2!
+     * In 1.13.2->1.16.1 a long is sent
      *
-     * @return
+     * @return response is
      */
     public long getId() {
         return id;
     }
-
-    private static Class<?> keepAliveClass;
-
-    //1.7.10->1.12.2 has int field "a", rest as long field "a"
-    private static Field idField;
-
-    static {
-        try {
-            keepAliveClass = NMSUtils.getNMSClass("PacketPlayInKeepAlive");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            idField = keepAliveClass.getDeclaredField("a");
-            idField.setAccessible(true);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/steervehicle/WrappedPacketInSteerVehicle.java

@@ -0,0 +1,55 @@
+package io.github.retrooper.packetevents.packetwrappers.in.steervehicle;
+
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+public class WrappedPacketInSteerVehicle extends WrappedPacket {
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInSteerVehicle");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private float side, forward;
+    private boolean jump, unmount;
+
+    public WrappedPacketInSteerVehicle(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.side = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+            this.forward = Reflection.getField(packetClass, float.class, 1).getFloat(packet);
+
+            this.jump = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+            this.unmount = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //Positive side value means left, negative means right
+    public float getSideValue() {
+        return side;
+    }
+
+    //Positive forward value means forward, negative is backwards
+    public float getForwardValue() {
+        return forward;
+    }
+
+    public boolean isJump() {
+        return jump;
+    }
+
+    public boolean isUnmount() {
+        return unmount;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/transaction/WrappedPacketInTransaction.java

@@ -0,0 +1,49 @@
+package io.github.retrooper.packetevents.packetwrappers.in.transaction;
+
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+public final class WrappedPacketInTransaction extends WrappedPacket {
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInTransaction");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int windowId;
+    private short actionNumber;
+    private boolean accepted;
+
+    public WrappedPacketInTransaction(final Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
+            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public int getWindowId() {
+        return windowId;
+    }
+
+    public short getActionNumber() {
+        return actionNumber;
+    }
+
+    public boolean isAccepted() {
+        return accepted;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/in/useentity/WrappedPacketInUseEntity.java

@@ -1,13 +1,36 @@
 package io.github.retrooper.packetevents.packetwrappers.in.useentity;
 
-import io.github.retrooper.packetevents.enums.EntityUseAction;
+import io.github.retrooper.packetevents.enums.minecraft.EntityUseAction;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.entity.Entity;
 
-import java.lang.reflect.Field;
-
 public final class WrappedPacketInUseEntity extends WrappedPacket {
+    private static Class<?> useEntityClass, entityClass, enumEntityUseActionClass;
+
+    static {
+
+        try {
+            useEntityClass = NMSUtils.getNMSClass("PacketPlayInUseEntity");
+            entityClass = NMSUtils.getNMSClass("Entity");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            enumEntityUseActionClass = NMSUtils.getNMSClass("EnumEntityUseAction");
+        } catch (ClassNotFoundException e) {
+            //That is fine, it is probably a subclass
+            for (final Class<?> sub : useEntityClass.getDeclaredClasses()) {
+                if (sub.getSimpleName().equals("EnumEntityUseAction")) {
+                    enumEntityUseActionClass = sub;
+                    break;
+                }
+            }
+        }
+    }
+
     private int entityId;
     private Entity entity;
     private EntityUseAction action;
@@ -16,20 +39,18 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
         super(packet);
     }
 
-
     @Override
     protected void setup() {
         try {
-            this.entityId = fields[0].getInt(packet);
+            this.entityId = Reflection.getField(useEntityClass, int.class, 0).getInt(packet);
             this.entity = NMSUtils.getEntityById(this.entityId);
-            final Object useActionEnum = fields[1].get(packet);
+            final Object useActionEnum = Reflection.getField(useEntityClass, enumEntityUseActionClass, 0).get(packet);
             this.action = EntityUseAction.valueOf(useActionEnum.toString());
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
     }
 
-
     public Entity getEntity() {
         return entity;
     }
@@ -41,38 +62,4 @@ public final class WrappedPacketInUseEntity extends WrappedPacket {
     public EntityUseAction getAction() {
         return action;
     }
-
-    private static Class<?> useEntityClass;
-
-    private static Class<?> entityClass;
-
-
-    private static Field[] fields = new Field[2];
-
-    static {
-
-        try {
-            useEntityClass = NMSUtils.getNMSClass("PacketPlayInUseEntity");
-            entityClass = NMSUtils.getNMSClass("Entity");
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-
-        try {
-            fields[0] = useEntityClass.getDeclaredField("a");
-            fields[1] = useEntityClass.getDeclaredField("action");
-
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (Field f : fields) {
-            if (f != null) {
-                f.setAccessible(true);
-            }
-        }
-
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/login/WrappedPacketLoginHandshake.java

@@ -1,55 +0,0 @@
-package io.github.retrooper.packetevents.packetwrappers.login;
-
-import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
-import io.github.retrooper.packetevents.utils.NMSUtils;
-
-
-public final class WrappedPacketLoginHandshake extends WrappedPacket {
-    private int protocolVersion, port;
-    private String hostname;
-
-    public WrappedPacketLoginHandshake(final Object packet) {
-        super(packet);
-    }
-
-    @Override
-    protected void setup() {
-        final Object protocolVersionObj = fields[0].get(packet);
-        final Object hostNameObj = fields[1].get(packet);
-        final Object portObj = fields[2].get(packet);
-
-        this.protocolVersion = (int)protocolVersionObj;
-        this.hostname = hostNameObj.toString();
-        this.port = (int)portObj;
-    }
-
-    public int getProtocolVersion() {
-        return protocolVersion;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    private static Class<?> loginHandshakeClass;
-
-    private static FieldAccessor<?>[] fields = new FieldAccessor[3];
-
-    static {
-        try {
-            loginHandshakeClass = NMSUtils.getNMSClass("PacketHandshakingInSetProtocol");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        fields[0] = Reflection.getField(loginHandshakeClass, int.class, 0);
-        fields[1] = Reflection.getField(loginHandshakeClass, String.class, 0);
-        fields[2] = Reflection.getField(loginHandshakeClass, int.class, 1);
-    }
-}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/PlayerAbilitiesUtils.java

@@ -0,0 +1,38 @@
+package io.github.retrooper.packetevents.packetwrappers.out.abilities;
+
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+final class PlayerAbilitiesUtils {
+    public static Class<?> playerAbilitiesClass;
+    public static Constructor<?> playerAbilitiesConstructor;
+
+    static {
+        try {
+            playerAbilitiesClass = NMSUtils.getNMSClass("PlayerAbilities");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        try {
+            playerAbilitiesConstructor = playerAbilitiesClass.getConstructor();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static Object getPlayerAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
+                                            final float flySpeed, final float walkSpeed) throws IllegalAccessException, InvocationTargetException, InstantiationException {
+        final Object instance = playerAbilitiesConstructor.newInstance();
+        Reflection.getField(playerAbilitiesClass, boolean.class, 0).setBoolean(instance, isVulnerable);
+        Reflection.getField(playerAbilitiesClass, boolean.class, 1).setBoolean(instance, isFlying);
+        Reflection.getField(playerAbilitiesClass, boolean.class, 2).setBoolean(instance, allowFlight);
+        Reflection.getField(playerAbilitiesClass, boolean.class, 3).setBoolean(instance, canBuildInstantly);
+
+        Reflection.getField(playerAbilitiesClass, float.class, 0).setFloat(instance, flySpeed);
+        Reflection.getField(playerAbilitiesClass, float.class, 1).setFloat(instance, walkSpeed);
+        return instance;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java

@@ -0,0 +1,96 @@
+package io.github.retrooper.packetevents.packetwrappers.out.abilities;
+
+import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public final class WrappedPacketOutAbilities extends WrappedPacket implements Sendable {
+    private static Class<?> packetClass;
+    private static Constructor<?> packetConstructor;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutAbilities");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            packetConstructor = packetClass.getConstructor(PlayerAbilitiesUtils.playerAbilitiesClass);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean vulnerable, flying, allowFlight, instantBuild;
+    private float flySpeed, walkSpeed;
+
+    public WrappedPacketOutAbilities(final Object packet) {
+        super(packet);
+    }
+
+    public WrappedPacketOutAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly,
+                                     final float flySpeed, final float walkSpeed) {
+        super(null);
+        this.vulnerable = isVulnerable;
+        this.flying = isFlying;
+        this.allowFlight = allowFlight;
+        this.instantBuild = canBuildInstantly;
+        this.flySpeed = flySpeed;
+        this.walkSpeed = walkSpeed;
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.vulnerable = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+            this.flying = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet);
+            this.allowFlight = Reflection.getField(packetClass, boolean.class, 2).getBoolean(packet);
+            this.instantBuild = Reflection.getField(packetClass, boolean.class, 3).getBoolean(packet);
+
+            this.flySpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+            this.walkSpeed = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public boolean isVulnerable() {
+        return vulnerable;
+    }
+
+    public boolean isFlying() {
+        return flying;
+    }
+
+    public boolean isFlightAllowed() {
+        return allowFlight;
+    }
+
+    public boolean canInstantlyBuild() {
+        return instantBuild;
+    }
+
+    public float getFlySpeed() {
+        return flySpeed;
+    }
+
+    public float getWalkSpeed() {
+        return walkSpeed;
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        try {
+            return packetConstructor.newInstance(PlayerAbilitiesUtils.getPlayerAbilities(vulnerable, flying, allowFlight, instantBuild, flySpeed, walkSpeed));
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java

@@ -1,16 +1,34 @@
 package io.github.retrooper.packetevents.packetwrappers.out.animation;
 
-import io.github.retrooper.packetevents.enums.EntityAnimationType;
+import io.github.retrooper.packetevents.enums.minecraft.EntityAnimationType;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.entity.Entity;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
 public final class WrappedPacketOutAnimation extends WrappedPacket implements Sendable {
+    private static Class<?> animationClass, nmsEntityClass;
+    private static Constructor<?> animationConstructor;
+
+    static {
+        try {
+            animationClass = NMSUtils.getNMSClass("PacketPlayOutAnimation");
+            nmsEntityClass = NMSUtils.getNMSClass("Entity");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            animationConstructor = animationClass.getConstructor(nmsEntityClass, int.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
     private Entity entity;
     private int entityID;
     private EntityAnimationType type;
@@ -31,9 +49,9 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se
         try {
             //a - ID
             //b - TYPE
-            this.entityID = fields[0].getInt(packet);
+            this.entityID = Reflection.getField(animationClass, int.class, 0).getInt(packet);
             this.entity = NMSUtils.getEntityById(this.entityID);
-            this.type = EntityAnimationType.get(fields[1].getInt(packet));
+            this.type = EntityAnimationType.get(Reflection.getField(animationClass, int.class, 1).getInt(packet));
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
@@ -52,7 +70,6 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se
         return type;
     }
 
-
     @Override
     public Object asNMSPacket() {
         final Object nmsEntity = NMSUtils.getNMSEntity(this.entity);
@@ -64,35 +81,4 @@ public final class WrappedPacketOutAnimation extends WrappedPacket implements Se
         }
         return null;
     }
-
-    private static Class<?> animationClass, nmsEntityClass;
-    private static Constructor<?> animationConstructor;
-
-    private static Field[] fields = new Field[2];
-
-    static {
-        try {
-            animationClass = NMSUtils.getNMSClass("PacketPlayOutAnimation");
-            nmsEntityClass = NMSUtils.getNMSClass("Entity");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            animationConstructor = animationClass.getConstructor(nmsEntityClass, int.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-        try {
-            fields[0] = animationClass.getDeclaredField("a");
-            fields[1] = animationClass.getDeclaredField("b");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (final Field f : fields) {
-            f.setAccessible(true);
-        }
-
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java

@@ -1,16 +1,42 @@
 package io.github.retrooper.packetevents.packetwrappers.out.chat;
 
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 
 public final class WrappedPacketOutChat extends WrappedPacket implements Sendable {
+    private static Constructor<?> chatClassConstructor;
+    private static Class<?> chatClass, iChatBaseComponentClass, chatSerializerClass;
+
+    static {
+        try {
+            chatClass = NMSUtils.getNMSClass("PacketPlayOutChat");
+            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        //In 1.8.3+ the ChatSerializer class is declared in the IChatBaseComponent class, so we have to handle that
+        try {
+            chatSerializerClass = NMSUtils.getNMSClass("ChatSerializer");
+        } catch (ClassNotFoundException e) {
+            //That is fine, it is probably a subclass
+            chatSerializerClass = Reflection.getSubClass(iChatBaseComponentClass, "ChatSerializer");
+        }
+
+        try {
+            chatClassConstructor = chatClass.getConstructor(iChatBaseComponentClass);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
     private String message;
 
     public WrappedPacketOutChat(final Object packet) {
@@ -22,14 +48,31 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
         this.message = "{\"text\": \"" + message + "\"}";
     }
 
+    public static String toStringFromIChatBaseComponent(Object obj) {
+        try {
+            return Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(obj).toString();
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static Object toIChatBaseComponent(String msg) {
+        try {
+            return Reflection.getMethod(chatSerializerClass, 0, String.class).invoke(null, msg);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
     @Override
     protected void setup() {
-        //all fields are IChatBaseComponents, and named 'a'
-
         try {
-            Object iChatBaseObj = iChatBaseField.get(packet);
+            final Object iChatBaseObj = Reflection.getField(chatClass, iChatBaseComponentClass, 0).get(packet);
 
-            Object contentString = getStringOfIChatBase.invoke(iChatBaseObj);
+            final Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);
 
             this.message = contentString.toString();
         } catch (IllegalAccessException | InvocationTargetException e) {
@@ -48,85 +91,7 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
         return null;
     }
 
-    public static String toStringFromIChatBaseComponent(Object obj) {
-        try {
-            return getStringOfIChatBase.invoke(obj).toString();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static Object toIChatBaseComponent(String msg) {
-        try {
-            return serialize.invoke(null, msg);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
     public String getMessage() {
         return this.message;
     }
-
-    private static Constructor<?> chatClassConstructor;
-
-    private static Class<?> chatClass, iChatBaseComponentClass, chatSerializerClass;
-
-    private static Field iChatBaseField;
-
-    private static Method serialize, getStringOfIChatBase;
-
-    static {
-        try {
-            chatClass = NMSUtils.getNMSClass("PacketPlayOutChat");
-            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
-
-            //In 1.8.3+ the ChatSerializer class is declared in the IChatBaseComponent class, so we have to handle tahat
-            if(version.isHigherThan(ServerVersion.v_1_8)) {
-                for(final Class<?> cls : iChatBaseComponentClass.getDeclaredClasses()) {
-                    if(cls.getSimpleName().equals("ChatSerializer")) {
-                        chatSerializerClass = cls;
-                        break;
-                    }
-                }
-            }
-            else {
-                chatSerializerClass = NMSUtils.getNMSClass("ChatSerializer");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            chatClassConstructor = chatClass.getConstructor(iChatBaseComponentClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            serialize = chatSerializerClass.getMethod("a", String.class);
-            getStringOfIChatBase = iChatBaseComponentClass.getMethod(getTextMethodName());
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            iChatBaseField = chatClass.getDeclaredField("a");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        iChatBaseField.setAccessible(true);
-
-    }
-
-    private static String getTextMethodName() {
-        //1.7.10
-        if (version.isLowerThan(ServerVersion.v_1_8)) {
-            return "e"; //or c
-        } else {
-            return "getText";
-        }
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java

@@ -0,0 +1,90 @@
+package io.github.retrooper.packetevents.packetwrappers.out.entity;
+
+import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+public class WrappedPacketOutEntity extends WrappedPacket {
+    private int entityId;
+    private double deltaX, deltaY, deltaZ;
+    private byte yaw, pitch;
+    private boolean onGround;
+
+    public WrappedPacketOutEntity(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.entityId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            this.onGround = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+            if (version.isLowerThan(ServerVersion.v_1_9)) {
+                byte dX = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
+                byte dY = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
+                byte dZ = Reflection.getField(packetClass, byte.class, 2).getByte(packet);
+
+                this.deltaX = dX / 32.0;
+                this.deltaY = dY / 32.0;
+                this.deltaZ = dZ / 32.0;
+
+                this.yaw = Reflection.getField(packetClass, byte.class, 3).getByte(packet);
+                this.pitch = Reflection.getField(packetClass, byte.class, 4).getByte(packet);
+            } else {
+                short dX = Reflection.getField(packetClass, short.class, 0).getShort(packet);
+                short dY = Reflection.getField(packetClass, short.class, 1).getShort(packet);
+                short dZ = Reflection.getField(packetClass, short.class, 2).getShort(packet);
+
+                this.deltaX = dX / 4096.0;
+                this.deltaY = dY / 4096.0;
+                this.deltaZ = dZ / 4096.0;
+
+                this.yaw = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
+                this.pitch = Reflection.getField(packetClass, byte.class, 1).getByte(packet);
+            }
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+    public byte getPitch() {
+        return pitch;
+    }
+
+    public byte getYaw() {
+        return yaw;
+    }
+
+    public double getDeltaZ() {
+        return deltaZ;
+    }
+
+    public double getDeltaY() {
+        return deltaY;
+    }
+
+    public double getDeltaX() {
+        return deltaX;
+    }
+
+    public int getEntityId() {
+        return entityId;
+    }
+
+    public boolean isOnGround() {
+        return onGround;
+    }
+
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutEntity");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java

@@ -3,14 +3,48 @@ package io.github.retrooper.packetevents.packetwrappers.out.entityvelocity;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 import org.bukkit.entity.Entity;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
 public final class WrappedPacketOutEntityVelocity extends WrappedPacket implements Sendable {
+    private static Constructor<?> velocityConstructor, vec3dConstructor;
+    private static Class<?> velocityClass, vec3dClass;
+
+    /**
+     * Velocity Constructor parameter types:
+     * 1.7.10->1.13.2 use int, double, double, double style,
+     * 1.14+ use int, Vec3D style
+     */
+    static {
+        try {
+
+            velocityClass = NMSUtils.getNMSClass("PacketPlayOutEntityVelocity");
+            if (version.isHigherThan(ServerVersion.v_1_13_2)) {
+                vec3dClass = NMSUtils.getNMSClass("Vec3D");
+            }
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            velocityConstructor = velocityClass.getConstructor(int.class, double.class, double.class, double.class);
+        } catch (NoSuchMethodException e) {
+            //That is fine, just a newer version
+            try {
+                velocityConstructor = velocityClass.getConstructor(int.class, vec3dClass);
+                //vec3d constructor
+                vec3dConstructor = vec3dClass.getConstructor(double.class, double.class, double.class);
+            } catch (NoSuchMethodException e2) {
+                e2.printStackTrace();
+            }
+
+        }
+    }
+
     private Entity entity;
     private int entityId;
     private double velocityX, velocityY, velocityZ;
@@ -32,11 +66,11 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
     protected void setup() {
         try {
             int i = 0;
-            final int entityId = fields[0].getInt(packet);
+            final int entityId = Reflection.getField(velocityClass, int.class, 0).getInt(packet);
 
-            final int x = fields[1].getInt(packet);
-            final int y = fields[2].getInt(packet);
-            final int z = fields[3].getInt(packet);
+            final int x = Reflection.getField(velocityClass, int.class, 1).getInt(packet);
+            final int y = Reflection.getField(velocityClass, int.class, 2).getInt(packet);
+            final int z = Reflection.getField(velocityClass, int.class, 3).getInt(packet);
 
             this.entityId = entityId;
             this.entity = NMSUtils.getEntityById(this.entityId);
@@ -87,59 +121,4 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen
         return null;
     }
 
-
-    private static Constructor<?> velocityConstructor, vec3dConstructor;
-    private static Class<?> velocityClass, vec3dClass;
-
-    private static Field[] fields = new Field[4];
-
-
-    /**
-     * Velocity Constructor parameter types:
-     * 1.7.10->1.13.2 use int, double, double, double style,
-     * 1.14+ use int, Vec3D style
-     */
-    static {
-        try {
-
-            velocityClass = NMSUtils.getNMSClass("PacketPlayOutEntityVelocity");
-            if (version.isHigherThan(ServerVersion.v_1_13_2)) {
-                vec3dClass = NMSUtils.getNMSClass("Vec3D");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            if (version.isHigherThan(ServerVersion.v_1_13_2)) {
-                velocityConstructor = velocityClass.getConstructor(int.class, vec3dClass);
-                //vec3d constructor
-                vec3dConstructor = vec3dClass.getConstructor(double.class, double.class, double.class);
-            } else {
-                velocityConstructor = velocityClass.getConstructor(int.class, double.class, double.class, double.class);
-            }
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            //entity id
-            fields[0] = velocityClass.getDeclaredField("a");
-            //x
-            fields[1] = velocityClass.getDeclaredField("b");
-            //y
-            fields[2] = velocityClass.getDeclaredField("c");
-            //z
-            fields[3] = velocityClass.getDeclaredField("d");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        for (final Field f : fields) {
-            f.setAccessible(true);
-        }
-
-
-    }
-
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java

@@ -0,0 +1,52 @@
+package io.github.retrooper.packetevents.packetwrappers.out.keepalive;
+
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import net.minecraft.server.v1_8_R3.PacketPlayOutKeepAlive;
+
+public class WrappedPacketOutKeepAlive extends WrappedPacket {
+    private long id;
+
+    public WrappedPacketOutKeepAlive(Object packet) {
+        super(packet);
+    }
+
+    /**
+     * Optionally Cast this long to an integer if you are using 1.7.10->1.12.2!
+     * In 1.13.2->1.16.1 a long is sent
+     *
+     * @return response is
+     */
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    protected void setup() {
+        if (Reflection.getField(packetClass, int.class, 0) == null) {
+            try {
+                this.id = Reflection.getField(packetClass, long.class, 0).getLong(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                this.id = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutKeepAlive");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        PacketPlayOutKeepAlive p;
+    }
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java

@@ -3,13 +3,31 @@ package io.github.retrooper.packetevents.packetwrappers.out.kickdisconnect;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
 import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.NMSUtils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 public final class WrappedPacketOutKickDisconnect extends WrappedPacket implements Sendable {
+    private static Class<?> packetClass, iChatBaseComponentClass;
+    private static Constructor<?> kickDisconnectConstructor;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutKickDisconnect");
+            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            kickDisconnectConstructor = packetClass.getConstructor(iChatBaseComponentClass);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
     private String kickMessage;
 
     public WrappedPacketOutKickDisconnect(final Object packet) {
@@ -23,7 +41,11 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen
 
     @Override
     protected void setup() {
-        this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(iChatBaseComponentAccessor.get(packet));
+        try {
+            this.kickMessage = WrappedPacketOutChat.toStringFromIChatBaseComponent(Reflection.getField(packetClass, iChatBaseComponentClass, 0).get(packet));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
     }
 
     public String getKickMessage() {
@@ -39,26 +61,4 @@ public final class WrappedPacketOutKickDisconnect extends WrappedPacket implemen
         }
         return null;
     }
-
-    private static Class<?> packetClass, iChatBaseComponentClass;
-
-    private static Constructor<?> kickDisconnectConstructor;
-
-    private static final Reflection.FieldAccessor<?> iChatBaseComponentAccessor;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayOutKickDisconnect");
-            iChatBaseComponentClass = NMSUtils.getNMSClass("IChatBaseComponent");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            kickDisconnectConstructor = packetClass.getConstructor(iChatBaseComponentClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-        iChatBaseComponentAccessor = Reflection.getField(packetClass, iChatBaseComponentClass, 0);
-    }
 }

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java

@@ -0,0 +1,44 @@
+package io.github.retrooper.packetevents.packetwrappers.out.playerinfo;
+
+import io.github.retrooper.packetevents.enums.minecraft.Gamemode;
+import io.github.retrooper.packetevents.enums.minecraft.PlayerInfoAction;
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo;
+
+public class WrappedPacketOutPlayerInfo extends WrappedPacket {
+    private PlayerInfoAction action;
+
+    public WrappedPacketOutPlayerInfo(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    protected void setup() {
+        PacketPlayOutPlayerInfo.PlayerInfoData dl;
+    }
+
+    private static Class<?> packetClass, enumPlayerInfoActionClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutPlayerInfo");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            enumPlayerInfoActionClass = NMSUtils.getNMSClass("EnumPLayerInfoAction");
+        } catch (ClassNotFoundException e) {
+            enumPlayerInfoActionClass = Reflection.getSubClass(packetClass, "EnumPlayerInfoAction");
+        }
+    }
+
+    public class PlayerDataInfo {
+        public PlayerDataInfo(Object gameProfile, int var, Gamemode gamemode, String s) {
+
+        }
+    }
+
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java

@@ -0,0 +1,78 @@
+package io.github.retrooper.packetevents.packetwrappers.out.transaction;
+
+import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class WrappedPacketOutTransaction extends WrappedPacket implements Sendable {
+    private static Class<?> packetClass;
+    private static Constructor<?> packetConstructor;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutTransaction");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            packetConstructor = packetClass.getConstructor(int.class, short.class, boolean.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int windowId;
+    private short actionNumber;
+    private boolean accepted;
+
+    public WrappedPacketOutTransaction(final Object packet) {
+        super(packet);
+    }
+
+    public WrappedPacketOutTransaction(final int windowId, final short actionNumber, final boolean accepted) {
+        super(null);
+        this.windowId = windowId;
+        this.actionNumber = actionNumber;
+        this.accepted = accepted;
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.windowId = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+            this.actionNumber = Reflection.getField(packetClass, short.class, 0).getShort(packet);
+            this.accepted = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public int getWindowId() {
+        return windowId;
+    }
+
+    public short getActionNumber() {
+        return actionNumber;
+    }
+
+    public boolean isAccepted() {
+        return accepted;
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        try {
+            return packetConstructor.newInstance(windowId, actionNumber, accepted);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java

@@ -0,0 +1,83 @@
+package io.github.retrooper.packetevents.packetwrappers.out.updatehealth;
+
+import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements Sendable {
+    private static Class<?> packetClass;
+    private static Constructor<?> packetConstructor;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayOutUpdateHealth");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            packetConstructor = packetClass.getConstructor(float.class, int.class, float.class);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private float health, foodSaturation;
+    private int food;
+
+    public WrappedPacketOutUpdateHealth(final Object packet) {
+        super(packet);
+    }
+
+    /**
+     * See https://wiki.vg/Protocol#Update_Health
+     *
+     * @param health
+     * @param food
+     * @param foodSaturation
+     */
+    public WrappedPacketOutUpdateHealth(final float health, final int food, final float foodSaturation) {
+        super(null);
+        this.health = health;
+        this.food = food;
+        this.foodSaturation = foodSaturation;
+    }
+
+    @Override
+    protected void setup() {
+        try {
+            this.health = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+            this.foodSaturation = Reflection.getField(packetClass, float.class, 0).getFloat(packet);
+            this.food = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public float getHealth() {
+        return health;
+    }
+
+    public float getFoodSaturation() {
+        return foodSaturation;
+    }
+
+    public int getFood() {
+        return food;
+    }
+
+    @Override
+    public Object asNMSPacket() {
+        try {
+            return packetConstructor.newInstance(health, food, foodSaturation);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/reflectionutils/Reflection.java

@@ -0,0 +1,190 @@
+package io.github.retrooper.packetevents.reflectionutils;
+
+
+import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithIndex;
+import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithName;
+import io.github.retrooper.packetevents.reflectionutils.fielddata.FieldWithTypeAndIndex;
+import io.github.retrooper.packetevents.reflectionutils.methoddata.MethodWithIndexAndParams;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+
+/**
+ * @author retrooper
+ */
+public final class Reflection {
+    private static final HashMap<Class<?>, Field[]> cachedFields = new HashMap<Class<?>, Field[]>();
+    private static final HashMap<Class<?>, Method[]> cachedMethods = new HashMap<Class<?>, Method[]>();
+    private static final HashMap<Class<?>, Class<?>[]> cachedSubclasses = new HashMap<Class<?>, Class<?>[]>();
+
+
+    //FIELDS
+    private static final HashMap<FieldWithName, Field> fieldWithNameHashMap = new HashMap<FieldWithName, Field>();
+    private static final HashMap<FieldWithTypeAndIndex, Field> fieldWithTypeAndIndexHashMap = new HashMap<FieldWithTypeAndIndex, Field>();
+    private static final HashMap<FieldWithIndex, Field> fieldWithIndexHashMap = new HashMap<FieldWithIndex, Field>();
+    private static final HashMap<MethodWithIndexAndParams, Method> methodWithIndexAndParamsHashMap = new HashMap<MethodWithIndexAndParams, Method>();
+
+    public static Field[] getFields(final Class<?> cls) {
+        if (cachedFields.containsKey(cls)) {
+            return cachedFields.get(cls);
+        } else {
+            final Field[] fields = cls.getDeclaredFields();
+            for (final Field f : fields) {
+                f.setAccessible(true);
+            }
+            cachedFields.put(cls, fields);
+            return fields;
+        }
+    }
+
+    public static Field getField(final Class<?> cls, final String name) {
+        final FieldWithName fwn = new FieldWithName(cls, name);
+        if (!fieldWithNameHashMap.containsKey(fwn)) {
+            for (final Field f : getFields(cls)) {
+                if (f.getName().equals(name)) {
+                    fieldWithNameHashMap.put(fwn, f);
+                    return f;
+                }
+            }
+        } else {
+            return fieldWithNameHashMap.get(fwn);
+        }
+        return null;
+    }
+
+    public static Field getField(final Class<?> cls, final Class<?> dataType, final int index) {
+        final FieldWithTypeAndIndex fwtai = new FieldWithTypeAndIndex(cls, dataType, index);
+        if (!fieldWithTypeAndIndexHashMap.containsKey(fwtai)) {
+            int i = 0;
+            for (final Field f : getFields(cls)) {
+                if (f.getType().equals(dataType)) {
+                    if (i++ == index) {
+                        fieldWithTypeAndIndexHashMap.put(fwtai, f);
+                        return f;
+                    }
+                }
+            }
+        } else {
+            return fieldWithTypeAndIndexHashMap.get(fwtai);
+        }
+        return null;
+    }
+
+    public static Field getField(final Class<?> cls, final int index) {
+        final FieldWithIndex fwi = new FieldWithIndex(cls, index);
+        if (!fieldWithIndexHashMap.containsKey(fwi)) {
+            int i = 0;
+            for (final Field f : getFields(cls)) {
+                if (index == i++) {
+                    fieldWithIndexHashMap.put(fwi, f);
+                    return f;
+                }
+            }
+        } else {
+            return fieldWithIndexHashMap.get(fwi);
+        }
+        return null;
+    }
+
+    //METHODS
+    public static Method[] getMethods(final Class<?> cls) {
+        if (cachedMethods.containsKey(cls)) {
+            return cachedMethods.get(cls);
+        } else {
+            final Method[] methods = cls.getDeclaredMethods();
+            for (final Method m : methods) {
+                m.setAccessible(true);
+            }
+            cachedMethods.put(cls, methods);
+            return methods;
+        }
+    }
+
+    public static Method getMethod(final Class<?> cls, final int index, final Class<?>... params) {
+        final MethodWithIndexAndParams mwiap = new MethodWithIndexAndParams(cls, index, params);
+        if (!methodWithIndexAndParamsHashMap.containsKey(mwiap)) {
+            int i = 0;
+            for (final Method m : getMethods(cls)) {
+                if (Arrays.equals(m.getParameterTypes(), params) && index == i++) {
+                    return m;
+                }
+            }
+        } else {
+            return methodWithIndexAndParamsHashMap.get(mwiap);
+        }
+        return null;
+    }
+
+    //THE REST LATER
+
+    public static Method getMethod(final Class<?> cls, final String name, Class<?> returning, Class<?>... params) {
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && Arrays.equals(m.getParameterTypes(), params) && m.getReturnType().equals(returning)) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final String name, final int index) {
+        int i = 0;
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && index == i++) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final Class<?> returning, final int index) {
+        int i = 0;
+        for (final Method m : getMethods(cls)) {
+            if (m.getReturnType().equals(returning) && index == i++) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Method getMethod(final Class<?> cls, final String name, final Class<?> returning) {
+        int i = 0;
+        for (final Method m : getMethods(cls)) {
+            if (m.getName().equals(name) && m.getReturnType().equals(returning)) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static Class<?>[] getSubClasses(final Class<?> cls) {
+        if (cachedSubclasses.containsKey(cls)) {
+            return cachedSubclasses.get(cls);
+        } else {
+            final Class<?>[] subclasses = cls.getDeclaredClasses();
+            cachedSubclasses.put(cls, subclasses);
+            return subclasses;
+        }
+    }
+
+    public static Class<?> getSubClass(final Class<?> cls, final String name) {
+        for (final Class<?> subclass : getSubClasses(cls)) {
+            if (subclass.getSimpleName().equals(name)) {
+                return subclass;
+            }
+        }
+        return null;
+    }
+
+    public static Class<?> getSubClass(final Class<?> cls, final int index) {
+        final Class<?>[] subclasses = getSubClasses(cls);
+        for (int i = 0; i < index + 1; i++) {
+            final Class<?> c = subclasses[i];
+            if (i == index) {
+                return c;
+            }
+        }
+        return null;
+    }
+}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java

@@ -0,0 +1,19 @@
+package io.github.retrooper.packetevents.reflectionutils.fielddata;
+
+public class FieldWithIndex {
+    private final Class<?> cls;
+    private final int index;
+
+    public FieldWithIndex(Class<?> cls, int index) {
+        this.cls = cls;
+        this.index = index;
+    }
+
+    public Class<?> getCls() {
+        return cls;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java

@@ -0,0 +1,20 @@
+package io.github.retrooper.packetevents.reflectionutils.fielddata;
+
+public class FieldWithName {
+
+    private final Class<?> cls;
+    private final String name;
+
+    public FieldWithName(Class<?> cls, String name) {
+        this.cls = cls;
+        this.name = name;
+    }
+
+    public Class<?> getCls() {
+        return cls;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java

@@ -0,0 +1,24 @@
+package io.github.retrooper.packetevents.reflectionutils.fielddata;
+
+public class FieldWithTypeAndIndex {
+    private final Class<?> cls, type;
+    private final int index;
+
+    public FieldWithTypeAndIndex(Class<?> cls, Class<?> type, int index) {
+        this.cls = cls;
+        this.type = type;
+        this.index = index;
+    }
+
+    public Class<?> getCls() {
+        return cls;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}

src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java

@@ -0,0 +1,25 @@
+package io.github.retrooper.packetevents.reflectionutils.methoddata;
+
+public class MethodWithIndexAndParams {
+    private final Class<?> cls;
+    private final int index;
+    private final Class<?>[] params;
+
+    public MethodWithIndexAndParams(Class<?> cls, int index, Class<?>[] params) {
+        this.cls = cls;
+        this.index = index;
+        this.params = params;
+    }
+
+    public Class<?> getCls() {
+        return cls;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public Class<?>[] getParams() {
+        return params;
+    }
+}

src/main/java/io/github/retrooper/packetevents/settings/Settings.java

@@ -0,0 +1,34 @@
+package io.github.retrooper.packetevents.settings;
+
+import io.github.retrooper.packetevents.enums.ServerVersion;
+
+public class Settings {
+    private ServerVersion defaultServerVersion;
+    private String identifier = "";
+
+    /**
+     * If PacketEvents fails to detect your server version, it will use the recommended version
+     *
+     * @return Recommended version
+     */
+    public ServerVersion getDefaultServerVersion() {
+        return defaultServerVersion;
+    }
+
+    /**
+     * Set the recommended version
+     *
+     * @param version
+     */
+    public void setDefaultServerVersion(final ServerVersion version) {
+        defaultServerVersion = version;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(final String identifier) {
+        this.identifier = identifier;
+    }
+}

src/main/java/io/github/retrooper/packetevents/tinyprotocol/Reflection.java

@@ -1,403 +0,0 @@
-package io.github.retrooper.packetevents.tinyprotocol;
-
-import org.bukkit.Bukkit;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * An utility class that simplifies reflection in Bukkit plugins.
- *
- * @author Kristian
- */
-public final class Reflection {
-    /**
-     * An interface for invoking a specific constructor.
-     */
-    public interface ConstructorInvoker {
-        /**
-         * Invoke a constructor for a specific class.
-         *
-         * @param arguments - the arguments to pass to the constructor.
-         * @return The constructed object.
-         */
-        Object invoke(Object... arguments);
-    }
-
-    /**
-     * An interface for invoking a specific method.
-     */
-    public interface MethodInvoker {
-        /**
-         * Invoke a method on a specific target object.
-         *
-         * @param target - the target object, or NULL for a static method.
-         * @param arguments - the arguments to pass to the method.
-         * @return The return value, or NULL if is void.
-         */
-        Object invoke(Object target, Object... arguments);
-    }
-
-    /**
-     * An interface for retrieving the field content.
-     *
-     * @param <T> - field type.
-     */
-    public interface FieldAccessor<T> {
-        /**
-         * Retrieve the content of a field.
-         *
-         * @param target - the target object, or NULL for a static field.
-         * @return The value of the field.
-         */
-        T get(Object target);
-
-        /**
-         * Set the content of a field.
-         *
-         * @param target - the target object, or NULL for a static field.
-         * @param value - the new value of the field.
-         */
-        void set(Object target, Object value);
-
-        /**
-         * Determine if the given object has this field.
-         *
-         * @param target - the object to test.
-         * @return TRUE if it does, FALSE otherwise.
-         */
-        boolean hasField(Object target);
-    }
-
-    // Deduce the net.minecraft.server.v* package
-    private static String OBC_PREFIX = Bukkit.getServer().getClass().getPackage().getName();
-    private static String NMS_PREFIX = OBC_PREFIX.replace("org.bukkit.craftbukkit", "net.minecraft.server");
-    private static String VERSION = OBC_PREFIX.replace("org.bukkit.craftbukkit", "").replace(".", "");
-
-    // Variable replacement
-    private static Pattern MATCH_VARIABLE = Pattern.compile("\\{([^\\}]+)\\}");
-
-    private Reflection() {
-        // Seal class
-    }
-
-    /**
-     * Retrieve a field accessor for a specific field type and name.
-     *
-     * @param target - the target type.
-     * @param name - the name of the field, or NULL to ignore.
-     * @param fieldType - a compatible field type.
-     * @return The field accessor.
-     */
-    public static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType) {
-        return getField(target, name, fieldType, 0);
-    }
-
-    /**
-     * Retrieve a field accessor for a specific field type and name.
-     *
-     * @param className - lookup name of the class, see {@link #getClass(String)}.
-     * @param name - the name of the field, or NULL to ignore.
-     * @param fieldType - a compatible field type.
-     * @return The field accessor.
-     */
-    public static <T> FieldAccessor<T> getField(String className, String name, Class<T> fieldType) {
-        return getField(getClass(className), name, fieldType, 0);
-    }
-
-    /**
-     * Retrieve a field accessor for a specific field type and name.
-     *
-     * @param target - the target type.
-     * @param fieldType - a compatible field type.
-     * @param index - the number of compatible fields to skip.
-     * @return The field accessor.
-     */
-    public static <T> FieldAccessor<T> getField(Class<?> target, Class<T> fieldType, int index) {
-        return getField(target, null, fieldType, index);
-    }
-
-    /**
-     * Retrieve a field accessor for a specific field type and name.
-     *
-     * @param className - lookup name of the class, see {@link #getClass(String)}.
-     * @param fieldType - a compatible field type.
-     * @param index - the number of compatible fields to skip.
-     * @return The field accessor.
-     */
-    public static <T> FieldAccessor<T> getField(String className, Class<T> fieldType, int index) {
-        return getField(getClass(className), fieldType, index);
-    }
-
-    // Common method
-    private static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType, int index) {
-        for (final Field field : target.getDeclaredFields()) {
-            if ((name == null || field.getName().equals(name)) && fieldType.isAssignableFrom(field.getType()) && index-- <= 0) {
-                field.setAccessible(true);
-
-                // A function for retrieving a specific field value
-                return new FieldAccessor<T>() {
-
-                    @Override
-                    @SuppressWarnings("unchecked")
-                    public T get(Object target) {
-                        try {
-                            return (T) field.get(target);
-                        } catch (IllegalAccessException e) {
-                            throw new RuntimeException("Cannot access reflection.", e);
-                        }
-                    }
-
-                    @Override
-                    public void set(Object target, Object value) {
-                        try {
-                            field.set(target, value);
-                        } catch (IllegalAccessException e) {
-                            throw new RuntimeException("Cannot access reflection.", e);
-                        }
-                    }
-
-                    @Override
-                    public boolean hasField(Object target) {
-                        // target instanceof DeclaringClass
-                        return field.getDeclaringClass().isAssignableFrom(target.getClass());
-                    }
-                };
-            }
-        }
-
-        // Search in parent classes
-        if (target.getSuperclass() != null)
-            return getField(target.getSuperclass(), name, fieldType, index);
-
-        throw new IllegalArgumentException("Cannot find field with type " + fieldType);
-    }
-
-    /**
-     * Search for the first publicly and privately defined method of the given name and parameter count.
-     *
-     * @param className - lookup name of the class, see {@link #getClass(String)}.
-     * @param methodName - the method name, or NULL to skip.
-     * @param params - the expected parameters.
-     * @return An object that invokes this specific method.
-     * @throws IllegalStateException If we cannot find this method.
-     */
-    public static MethodInvoker getMethod(String className, String methodName, Class<?>... params) {
-        return getTypedMethod(getClass(className), methodName, null, params);
-    }
-
-    /**
-     * Search for the first publicly and privately defined method of the given name and parameter count.
-     *
-     * @param clazz - a class to start with.
-     * @param methodName - the method name, or NULL to skip.
-     * @param params - the expected parameters.
-     * @return An object that invokes this specific method.
-     * @throws IllegalStateException If we cannot find this method.
-     */
-    public static MethodInvoker getMethod(Class<?> clazz, String methodName, Class<?>... params) {
-        return getTypedMethod(clazz, methodName, null, params);
-    }
-
-    /**
-     * Search for the first publicly and privately defined method of the given name and parameter count.
-     *
-     * @param clazz - a class to start with.
-     * @param methodName - the method name, or NULL to skip.
-     * @param returnType - the expected return type, or NULL to ignore.
-     * @param params - the expected parameters.
-     * @return An object that invokes this specific method.
-     * @throws IllegalStateException If we cannot find this method.
-     */
-    public static MethodInvoker getTypedMethod(Class<?> clazz, String methodName, Class<?> returnType, Class<?>... params) {
-        for (final Method method : clazz.getDeclaredMethods()) {
-            if ((methodName == null || method.getName().equals(methodName))
-                    && (returnType == null || method.getReturnType().equals(returnType))
-                    && Arrays.equals(method.getParameterTypes(), params)) {
-                method.setAccessible(true);
-
-                return new MethodInvoker() {
-
-                    @Override
-                    public Object invoke(Object target, Object... arguments) {
-                        try {
-                            return method.invoke(target, arguments);
-                        } catch (Exception e) {
-                            throw new RuntimeException("Cannot invoke method " + method, e);
-                        }
-                    }
-
-                };
-            }
-        }
-
-        // Search in every superclass
-        if (clazz.getSuperclass() != null)
-            return getMethod(clazz.getSuperclass(), methodName, params);
-
-        throw new IllegalStateException(String.format("Unable to find method %s (%s).", methodName, Arrays.asList(params)));
-    }
-
-    /**
-     * Search for the first publically and privately defined constructor of the given name and parameter count.
-     *
-     * @param className - lookup name of the class, see {@link #getClass(String)}.
-     * @param params - the expected parameters.
-     * @return An object that invokes this constructor.
-     * @throws IllegalStateException If we cannot find this method.
-     */
-    public static ConstructorInvoker getConstructor(String className, Class<?>... params) {
-        return getConstructor(getClass(className), params);
-    }
-
-    /**
-     * Search for the first publically and privately defined constructor of the given name and parameter count.
-     *
-     * @param clazz - a class to start with.
-     * @param params - the expected parameters.
-     * @return An object that invokes this constructor.
-     * @throws IllegalStateException If we cannot find this method.
-     */
-    public static ConstructorInvoker getConstructor(Class<?> clazz, Class<?>... params) {
-        for (final Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-            if (Arrays.equals(constructor.getParameterTypes(), params)) {
-                constructor.setAccessible(true);
-
-                return new ConstructorInvoker() {
-
-                    @Override
-                    public Object invoke(Object... arguments) {
-                        try {
-                            return constructor.newInstance(arguments);
-                        } catch (Exception e) {
-                            throw new RuntimeException("Cannot invoke constructor " + constructor, e);
-                        }
-                    }
-
-                };
-            }
-        }
-
-        throw new IllegalStateException(String.format("Unable to find constructor for %s (%s).", clazz, Arrays.asList(params)));
-    }
-
-    /**
-     * Retrieve a class from its full name, without knowing its type on compile time.
-     * <p>
-     * This is useful when looking up fields by a NMS or OBC type.
-     * <p>
-     *
-     * @see {@link #getClass()} for more information.
-     * @param lookupName - the class name with variables.
-     * @return The class.
-     */
-    public static Class<Object> getUntypedClass(String lookupName) {
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        Class<Object> clazz = (Class) getClass(lookupName);
-        return clazz;
-    }
-
-    /**
-     * Retrieve a class from its full name.
-     * <p>
-     * Strings enclosed with curly brackets - such as {TEXT} - will be replaced according to the following table:
-     * <p>
-     * <table border="1">
-     * <tr>
-     * <th>Variable</th>
-     * <th>Content</th>
-     * </tr>
-     * <tr>
-     * <td>{nms}</td>
-     * <td>Actual package name of net.minecraft.server.VERSION</td>
-     * </tr>
-     * <tr>
-     * <td>{obc}</td>
-     * <td>Actual pacakge name of org.bukkit.craftbukkit.VERSION</td>
-     * </tr>
-     * <tr>
-     * <td>{version}</td>
-     * <td>The current Minecraft package VERSION, if any.</td>
-     * </tr>
-     * </table>
-     *
-     * @param lookupName - the class name with variables.
-     * @return The looked up class.
-     * @throws IllegalArgumentException If a variable or class could not be found.
-     */
-    public static Class<?> getClass(String lookupName) {
-        return getCanonicalClass(expandVariables(lookupName));
-    }
-
-    /**
-     * Retrieve a class in the net.minecraft.server.VERSION.* package.
-     *
-     * @param name - the name of the class, excluding the package.
-     * @throws IllegalArgumentException If the class doesn't exist.
-     */
-    public static Class<?> getMinecraftClass(String name) {
-        return getCanonicalClass(NMS_PREFIX + "." + name);
-    }
-
-    /**
-     * Retrieve a class in the org.bukkit.craftbukkit.VERSION.* package.
-     *
-     * @param name - the name of the class, excluding the package.
-     * @throws IllegalArgumentException If the class doesn't exist.
-     */
-    public static Class<?> getCraftBukkitClass(String name) {
-        return getCanonicalClass(OBC_PREFIX + "." + name);
-    }
-
-    /**
-     * Retrieve a class by its canonical name.
-     *
-     * @param canonicalName - the canonical name.
-     * @return The class.
-     */
-    private static Class<?> getCanonicalClass(String canonicalName) {
-        try {
-            return Class.forName(canonicalName);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("Cannot find " + canonicalName, e);
-        }
-    }
-
-    /**
-     * Expand variables such as "{nms}" and "{obc}" to their corresponding packages.
-     *
-     * @param name - the full name of the class.
-     * @return The expanded string.
-     */
-    private static String expandVariables(String name) {
-        StringBuffer output = new StringBuffer();
-        Matcher matcher = MATCH_VARIABLE.matcher(name);
-
-        while (matcher.find()) {
-            String variable = matcher.group(1);
-            String replacement = "";
-
-            // Expand all detected variables
-            if ("nms".equalsIgnoreCase(variable))
-                replacement = NMS_PREFIX;
-            else if ("obc".equalsIgnoreCase(variable))
-                replacement = OBC_PREFIX;
-            else if ("version".equalsIgnoreCase(variable))
-                replacement = VERSION;
-            else
-                throw new IllegalArgumentException("Unknown variable: " + variable);
-
-            // Assume the expanded variables are all packages, and append a dot
-            if (replacement.length() > 0 && matcher.end() < name.length() && name.charAt(matcher.end()) != '.')
-                replacement += ".";
-            matcher.appendReplacement(output, Matcher.quoteReplacement(replacement));
-        }
-
-        matcher.appendTail(output);
-        return output.toString();
-    }
-}

src/main/java/io/github/retrooper/packetevents/tinyprotocol/TinyProtocol7.java

@@ -1,544 +0,0 @@
-/*
- * This file is part of Hawk Anticheat.
- * Copyright (C) 2018 Hawk Development Team
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-
-package io.github.retrooper.packetevents.tinyprotocol;
-
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.MethodInvoker;
-import net.minecraft.util.com.google.common.collect.Lists;
-import net.minecraft.util.com.google.common.collect.MapMaker;
-import net.minecraft.util.com.mojang.authlib.GameProfile;
-import net.minecraft.util.io.netty.channel.*;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-
-
-/**
- * Represents a very tiny alternative to ProtocolLib.
- * <p>
- * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
- *
- * @author Kristian
- */
-
-//BROKEN: NPEs when player joins while server is starting, and using PlayerJoinEvent instead will cause NPE for protocol version lookup.
-//Protocol version number lookup method from DeprecatedLuke's version of TinyProtocol
-public abstract class TinyProtocol7 {
-    private static final AtomicInteger ID = new AtomicInteger(0);
-
-    // Used in order to lookup a channel
-    private static final MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-    private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
-    private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
-    private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
-
-    // Looking up ServerConnection
-    private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
-    private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
-    private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
-    private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
-    private static final MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
-
-    // Packets we have to intercept
-    private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
-    private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
-
-    // Speedup channel/protocol lookup
-    private final Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
-    private Listener listener;
-
-    // Channels that have already been removed
-    private final Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
-
-    // List of network markers
-    private List<Object> networkManagers;
-
-    // Injected channel handlers
-    private List<Channel> serverChannels = Lists.newArrayList();
-    private ChannelInboundHandlerAdapter serverChannelHandler;
-    private ChannelInitializer<Channel> beginInitProtocol;
-    private ChannelInitializer<Channel> endInitProtocol;
-
-    // Current handler name
-    private String handlerName;
-
-    protected volatile boolean closed;
-    protected Plugin plugin;
-
-    /**
-     * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients.
-     * <p>
-     * You can construct multiple instances per plugin.
-     *
-     * @param plugin - the plugin.
-     */
-    public TinyProtocol7(final Plugin plugin) {
-        this.plugin = plugin;
-
-        // Compute handler name
-        this.handlerName = getHandlerName();
-
-        // Prepare existing players
-        registerBukkitEvents();
-
-        try {
-            registerChannelHandler();
-            registerPlayers(plugin);
-        } catch (IllegalArgumentException ex) {
-            // Damn you, late bind
-            plugin.getLogger().info("[TinyProtocol] Delaying server channel injection due to late bind.");
-
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    registerChannelHandler();
-                    registerPlayers(plugin);
-                    plugin.getLogger().info("[TinyProtocol] Late bind injection successful.");
-                }
-            }.runTask(plugin);
-        }
-    }
-
-    private void createServerChannelHandler() {
-        // Handle connected channels
-        endInitProtocol = new ChannelInitializer<Channel>() {
-
-            @Override
-            protected void initChannel(Channel channel) throws Exception {
-                try {
-                    // This can take a while, so we need to stop the main thread from interfering
-                    synchronized (networkManagers) {
-                        // Stop injecting channels
-                        if (!closed) {
-                            channel.eventLoop().submit(() -> injectChannelInternal(channel));
-                        }
-                    }
-                } catch (Exception e) {
-                    plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
-                }
-            }
-
-        };
-
-        // This is executed before Minecraft's channel handler
-        beginInitProtocol = new ChannelInitializer<Channel>() {
-
-            @Override
-            protected void initChannel(Channel channel) throws Exception {
-                channel.pipeline().addLast(endInitProtocol);
-            }
-
-        };
-
-        serverChannelHandler = new ChannelInboundHandlerAdapter() {
-
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Channel channel = (Channel) msg;
-
-                // Prepare to initialize ths channel
-                channel.pipeline().addFirst(beginInitProtocol);
-                ctx.fireChannelRead(msg);
-            }
-
-        };
-    }
-
-    /**
-     * Register bukkit events.
-     */
-    private void registerBukkitEvents() {
-        listener = new Listener() {
-
-            @EventHandler(priority = EventPriority.LOWEST)
-            public final void onPlayerLogin(PlayerLoginEvent e) {
-                if (closed)
-                    return;
-
-                Channel channel = getChannel(e.getPlayer());
-
-                // Don't inject players that have been explicitly uninjected
-                if (!uninjectedChannels.contains(channel)) {
-                    injectPlayer(e.getPlayer());
-                }
-            }
-
-            @EventHandler
-            public final void onPluginDisable(PluginDisableEvent e) {
-                if (e.getPlugin().equals(plugin)) {
-                    close();
-                }
-            }
-
-        };
-
-        plugin.getServer().getPluginManager().registerEvents(listener, plugin);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void registerChannelHandler() {
-        Object mcServer = getMinecraftServer.get(Bukkit.getServer());
-        Object serverConnection = getServerConnection.get(mcServer);
-        boolean looking = true;
-
-        // We need to synchronize against this list
-        networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
-        createServerChannelHandler();
-
-        // Find the correct list, or implicitly throw an exception
-        for (int i = 0; looking; i++) {
-            List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
-
-            for (Object item : list) {
-                if (!(item instanceof ChannelFuture))
-                    break;
-
-                // Channel future that contains the server connection
-                Channel serverChannel = ((ChannelFuture) item).channel();
-
-                serverChannels.add(serverChannel);
-                serverChannel.pipeline().addFirst(serverChannelHandler);
-                looking = false;
-            }
-        }
-    }
-
-    private void unregisterChannelHandler() {
-        if (serverChannelHandler == null)
-            return;
-
-        for (Channel serverChannel : serverChannels) {
-            final ChannelPipeline pipeline = serverChannel.pipeline();
-
-            // Remove channel handler
-            serverChannel.eventLoop().execute(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        pipeline.remove(serverChannelHandler);
-                    } catch (NoSuchElementException e) {
-                        // That's fine
-                    }
-                }
-
-            });
-        }
-    }
-
-    private void registerPlayers(Plugin plugin) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            injectPlayer(player);
-        }
-    }
-
-    /**
-     * Invoked when the server is starting to send a packet to a player.
-     * <p>
-     * Note that this is not executed on the main thread.
-     *
-     * @param receiver - the receiving player, NULL for early login/status packets.
-     * @param channel  - the channel that received the packet. Never NULL.
-     * @param packet   - the packet being sent.
-     * @return The packet to send instead, or NULL to cancel the transmission.
-     */
-    public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-        final String packetName = packet.getClass().getSimpleName();
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(receiver, packetName, packet);
-        PacketEvents.getEventManager().callEvent(packetSendEvent);
-        if (!packetSendEvent.isCancelled()) {
-            return packet;
-        }
-        return null;
-    }
-
-    /**
-     * Invoked when the server has received a packet from a given player.
-     * <p>
-     * Use {@link Channel#remoteAddress()} to get the remote address of the client.
-     *
-     * @param sender  - the player that sent the packet, NULL for early login/status packets.
-     * @param channel - channel that received the packet. Never NULL.
-     * @param packet  - the packet being received.
-     * @return The packet to recieve instead, or NULL to cancel.
-     */
-    public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-        return packet;
-    }
-
-    /**
-     * Send a packet to a particular player.
-     * <p>
-     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param player - the destination player.
-     * @param packet - the packet to send.
-     */
-    public void sendPacket(Player player, Object packet) {
-        sendPacket(getChannel(player), packet);
-    }
-
-    /**
-     * Send a packet to a particular client.
-     * <p>
-     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param channel - client identified by a channel.
-     * @param packet  - the packet to send.
-     */
-    public void sendPacket(Channel channel, Object packet) {
-        channel.pipeline().writeAndFlush(packet);
-    }
-
-    /**
-     * Pretend that a given packet has been received from a player.
-     * <p>
-     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param player - the player that sent the packet.
-     * @param packet - the packet that will be received by the server.
-     */
-    public void receivePacket(Player player, Object packet) {
-        receivePacket(getChannel(player), packet);
-    }
-
-    /**
-     * Pretend that a given packet has been received from a given client.
-     * <p>
-     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param channel - client identified by a channel.
-     * @param packet  - the packet that will be received by the server.
-     */
-    public void receivePacket(Channel channel, Object packet) {
-        channel.pipeline().context("encoder").fireChannelRead(packet);
-    }
-
-
-    /**
-     * Changed from "tiny-" to "packetevents"
-     * @return handlerName
-     */
-    protected String getHandlerName() {
-        return "packetevents-" + plugin.getName() + "-" + ID.incrementAndGet();
-    }
-
-    /**
-     * Add a custom channel handler to the given player's channel pipeline, allowing us to intercept sent and received packets.
-     * <p>
-     * This will automatically be called when a player has logged in.
-     *
-     * @param player - the player to inject.
-     */
-    public void injectPlayer(Player player) {
-        final PlayerInjectEvent playerInjectEvent = new PlayerInjectEvent(player);
-        PacketEvents.getEventManager().callEvent(playerInjectEvent);
-        if (!playerInjectEvent.isCancelled()) {
-            injectChannelInternal(getChannel(player)).player = player;
-        }
-    }
-
-    /**
-     * Add a custom channel handler to the given channel.
-     *
-     * @param channel - the channel to inject.
-     * @return The intercepted channel, or NULL if it has already been injected.
-     */
-    public void injectChannel(Channel channel) {
-        injectChannelInternal(channel);
-    }
-
-    /**
-     * Add a custom channel handler to the given channel.
-     *
-     * @param channel - the channel to inject.
-     * @return The packet interceptor.
-     */
-    private PacketInterceptor injectChannelInternal(Channel channel) {
-        try {
-            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
-
-            // Inject our packet interceptor
-            if (interceptor == null) {
-                interceptor = new PacketInterceptor();
-                channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
-                uninjectedChannels.remove(channel);
-            }
-
-            return interceptor;
-        } catch (IllegalArgumentException e) {
-            // Try again
-            return (PacketInterceptor) channel.pipeline().get(handlerName);
-        }
-    }
-
-    /**
-     * Retrieve the Netty channel associated with a player. This is cached.
-     *
-     * @param player - the player.
-     * @return The Netty channel.
-     */
-    public Channel getChannel(Player player) {
-        Channel channel = channelLookup.get(player.getName());
-
-        // Lookup channel again
-        if (channel == null) {
-            Object connection = getConnection.get(getPlayerHandle.invoke(player));
-            Object manager = getManager.get(connection);
-
-            channelLookup.put(player.getName(), channel = getChannel.get(manager));
-        }
-
-        return channel;
-    }
-
-    /**
-     * Uninject a specific player.
-     *
-     * @param player - the injected player.
-     */
-    public void uninjectPlayer(Player player) {
-        uninjectChannel(getChannel(player));
-        PacketEvents.getEventManager().callEvent(new PlayerUninjectEvent(player));
-    }
-
-    /**
-     * Uninject a specific channel.
-     * <p>
-     * This will also disable the automatic channel injection that occurs when a player has properly logged in.
-     *
-     * @param channel - the injected channel.
-     */
-    public void uninjectChannel(final Channel channel) {
-        // No need to guard against this if we're closing
-        if (!closed) {
-            uninjectedChannels.add(channel);
-        }
-
-        // See ChannelInjector in ProtocolLib, line 590
-        channel.eventLoop().execute(new Runnable() {
-
-            @Override
-            public void run() {
-                channel.pipeline().remove(handlerName);
-            }
-
-        });
-    }
-
-    /**
-     * Determine if the given player has been injected by TinyProtocol.
-     *
-     * @param player - the player.
-     * @return TRUE if it is, FALSE otherwise.
-     */
-    public boolean hasInjected(Player player) {
-        return hasInjected(getChannel(player));
-    }
-
-    /**
-     * Determine if the given channel has been injected by TinyProtocol.
-     *
-     * @param channel - the channel.
-     * @return TRUE if it is, FALSE otherwise.
-     */
-    public boolean hasInjected(Channel channel) {
-        return channel.pipeline().get(handlerName) != null;
-    }
-
-    /**
-     * Cease listening for packets. This is called automatically when your plugin is disabled.
-     */
-    public final void close() {
-        if (!closed) {
-            closed = true;
-
-            // Remove our handlers
-            for (Player player : plugin.getServer().getOnlinePlayers()) {
-                uninjectPlayer(player);
-            }
-
-            // Clean up Bukkit
-            HandlerList.unregisterAll(listener);
-            unregisterChannelHandler();
-        }
-    }
-
-    /**
-     * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
-     *
-     * @author Kristian
-     */
-    private final class PacketInterceptor extends ChannelDuplexHandler {
-        // Updated by the login event
-        public volatile Player player;
-
-        @Override
-        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-            // Intercept channel
-            final Channel channel = ctx.channel();
-            handleLoginStart(channel, msg);
-
-            try {
-                msg = onPacketInAsync(player, channel, msg);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
-            }
-
-            if (msg != null) {
-                super.channelRead(ctx, msg);
-            }
-        }
-
-        @Override
-        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-            try {
-                msg = onPacketOutAsync(player, ctx.channel(), msg);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
-            }
-
-            if (msg != null) {
-                super.write(ctx, msg, promise);
-            }
-        }
-
-        private void handleLoginStart(Channel channel, Object packet) {
-            if (PACKET_LOGIN_IN_START.isInstance(packet)) {
-                GameProfile profile = getGameProfile.get(packet);
-                channelLookup.put(profile.getName(), channel);
-            }
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/tinyprotocol/TinyProtocol8.java

@@ -1,550 +0,0 @@
-/*
- * This file is part of Hawk Anticheat.
- * Copyright (C) 2018 Hawk Development Team
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-
-package io.github.retrooper.packetevents.tinyprotocol;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.MapMaker;
-import com.mojang.authlib.GameProfile;
-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
-import io.github.retrooper.packetevents.handler.TinyProtocolHandler_1_8;
-import io.github.retrooper.packetevents.tinyprotocol.Reflection.FieldAccessor;
-import io.netty.channel.*;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-
-/**
- * Represents a very tiny alternative to ProtocolLib.
- * <p>
- * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
- *
- * @author Kristian
- */
-
-//BROKEN: NPEs when player joins while server is starting, and using PlayerJoinEvent instead will cause NPE for protocol version lookup.
-//Protocol version number lookup method from DeprecatedLuke's version of TinyProtocol
-public abstract class TinyProtocol8 {
-    private static final AtomicInteger ID = new AtomicInteger(0);
-
-    // Used in order to lookup a channel
-    private static final Reflection.MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
-    private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
-    private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
-    private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
-
-    // Looking up ServerConnection
-    private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
-    private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
-    private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
-    private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
-
-    // Packets we have to intercept
-    private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
-    private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
-
-    // Speedup channel/protocol lookup
-    private final Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
-    private Listener listener;
-
-    // Channels that have already been removed
-    private final Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
-
-    // List of network markers
-    private List<Object> networkManagers;
-
-    // Injected channel handlers
-    private final List<Channel> serverChannels = Lists.newArrayList();
-    private ChannelInboundHandlerAdapter serverChannelHandler;
-    private ChannelInitializer<Channel> beginInitProtocol;
-    private ChannelInitializer<Channel> endInitProtocol;
-
-    // Current handler name
-    private String handlerName;
-
-    protected volatile boolean closed;
-    protected Plugin plugin;
-
-    /**
-     * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients.
-     * <p>
-     * You can construct multiple instances per plugin.
-     *
-     * @param plugin - the plugin.
-     */
-    public TinyProtocol8(final Plugin plugin) {
-        this.plugin = plugin;
-
-        // Compute handler name
-        this.handlerName = getHandlerName();
-
-        // Prepare existing players
-        registerBukkitEvents();
-
-        try {
-            registerChannelHandler();
-            registerPlayers(plugin);
-        } catch (IllegalArgumentException | NoSuchFieldException | IllegalAccessException ex) {
-            // Damn you, late bind
-            plugin.getLogger().info("[TinyProtocol] Delaying server channel injection due to late bind.");
-
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    try {
-                        registerChannelHandler();
-                    } catch (NoSuchFieldException | IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                    registerPlayers(plugin);
-                    plugin.getLogger().info("[TinyProtocol] Late bind injection successful.");
-                }
-            }.runTask(plugin);
-        }
-    }
-
-    private void createServerChannelHandler() {
-        // Handle connected channels
-        endInitProtocol = new ChannelInitializer<Channel>() {
-
-            @Override
-            protected void initChannel(Channel channel) throws Exception {
-                try {
-                    // This can take a while, so we need to stop the main thread from interfering
-                    synchronized (networkManagers) {
-                        // Stop injecting channels
-                        if (!closed) {
-                            channel.eventLoop().submit(() -> injectChannelInternal(channel));
-                        }
-                    }
-                } catch (Exception e) {
-                    plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
-                }
-            }
-
-        };
-
-        // This is executed before Minecraft's channel handler
-        beginInitProtocol = new ChannelInitializer<Channel>() {
-
-            @Override
-            protected void initChannel(Channel channel) throws Exception {
-                channel.pipeline().addLast(endInitProtocol);
-            }
-
-        };
-
-        serverChannelHandler = new ChannelInboundHandlerAdapter() {
-
-            @Override
-            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                Channel channel = (Channel) msg;
-
-                // Prepare to initialize ths channel
-                channel.pipeline().addFirst(beginInitProtocol);
-                ctx.fireChannelRead(msg);
-            }
-
-        };
-    }
-
-    /**
-     * Register bukkit events.
-     */
-    private void registerBukkitEvents() {
-        listener = new Listener() {
-
-            @EventHandler(priority = EventPriority.LOWEST)
-            public final void onPlayerLogin(PlayerLoginEvent e) {
-                if (closed)
-                    return;
-
-                Channel channel = getChannel(e.getPlayer());
-
-                // Don't inject players that have been explicitly uninjected
-                if (!uninjectedChannels.contains(channel)) {
-                    injectPlayer(e.getPlayer());
-                }
-            }
-
-            @EventHandler
-            public final void onPluginDisable(PluginDisableEvent e) {
-                if (e.getPlugin().equals(plugin)) {
-                    close();
-                }
-            }
-
-        };
-
-        plugin.getServer().getPluginManager().registerEvents(listener, plugin);
-    }
-
-    /**
-     * Function modified by Retrooper
-     *
-     * @throws NoSuchFieldException
-     * @throws IllegalAccessException
-     */
-    @SuppressWarnings("unchecked")
-    private void registerChannelHandler() throws NoSuchFieldException, IllegalAccessException {
-        Object mcServer = getMinecraftServer.get(Bukkit.getServer());
-        Object serverConnection = getServerConnection.get(mcServer);
-        boolean looking = true;
-
-        /*
-         * I am doing this so we can support 1.8->1.15.2, the previous method TinyProtocol used wasn't supported on some versions
-         * like 1.15.2
-         */
-        final Field networkManagersField = serverConnection.getClass().getDeclaredField(TinyProtocolHandler_1_8.getNetworkManagersFieldName());
-        networkManagersField.setAccessible(true);
-        networkManagers = (List<Object>) networkManagersField.get(serverConnection);
-        createServerChannelHandler();
-
-        // Find the correct list, or implicitly throw an exception
-        for (int i = 0; looking; i++) {
-            List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
-            for (Object item : list) {
-                if (!(item instanceof ChannelFuture))
-                    break;
-
-                // Channel future that contains the server connection
-                Channel serverChannel = ((ChannelFuture) item).channel();
-
-                serverChannels.add(serverChannel);
-                serverChannel.pipeline().addFirst(serverChannelHandler);
-                looking = false;
-            }
-        }
-    }
-
-    private void unregisterChannelHandler() {
-        if (serverChannelHandler == null)
-            return;
-
-        for (Channel serverChannel : serverChannels) {
-            final ChannelPipeline pipeline = serverChannel.pipeline();
-
-            // Remove channel handler
-            serverChannel.eventLoop().execute(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        pipeline.remove(serverChannelHandler);
-                    } catch (NoSuchElementException e) {
-                        // That's fine
-                    }
-                }
-            });
-        }
-    }
-
-    private void registerPlayers(Plugin plugin) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            injectPlayer(player);
-        }
-    }
-
-    /**
-     * Invoked when the server is starting to send a packet to a player.
-     * <p>
-     * Note that this is not executed on the main thread.
-     *
-     * @param receiver - the receiving player, NULL for early login/status packets.
-     * @param channel  - the channel that received the packet. Never NULL.
-     * @param packet   - the packet being sent.
-     * @return The packet to send instead, or NULL to cancel the transmission.
-     */
-    public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
-        return packet;
-    }
-
-    /**
-     * Invoked when the server has received a packet from a given player.
-     * <p>
-     * Use {@link Channel#remoteAddress()} to get the remote address of the client.
-     *
-     * @param sender  - the player that sent the packet, NULL for early login/status packets.
-     * @param channel - channel that received the packet. Never NULL.
-     * @param packet  - the packet being received.
-     * @return The packet to recieve instead, or NULL to cancel.
-     */
-    public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-        return packet;
-    }
-
-    /**
-     * Send a packet to a particular player.
-     * <p>
-     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param player - the destination player.
-     * @param packet - the packet to send.
-     */
-    public void sendPacket(Player player, Object packet) {
-        sendPacket(getChannel(player), packet);
-    }
-
-    /**
-     * Send a packet to a particular client.
-     * <p>
-     * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param channel - client identified by a channel.
-     * @param packet  - the packet to send.
-     */
-    public void sendPacket(Channel channel, Object packet) {
-        channel.pipeline().writeAndFlush(packet);
-    }
-
-    /**
-     * Pretend that a given packet has been received from a player.
-     * <p>
-     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param player - the player that sent the packet.
-     * @param packet - the packet that will be received by the server.
-     */
-    public void receivePacket(Player player, Object packet) {
-        receivePacket(getChannel(player), packet);
-    }
-
-    /**
-     * Pretend that a given packet has been received from a given client.
-     * <p>
-     * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
-     *
-     * @param channel - client identified by a channel.
-     * @param packet  - the packet that will be received by the server.
-     */
-    public void receivePacket(Channel channel, Object packet) {
-        channel.pipeline().context("encoder").fireChannelRead(packet);
-    }
-
-
-    /**
-     * Changed from "tiny-" to "packetevents"
-     *
-     * @return handlerName
-     */
-    protected String getHandlerName() {
-        return "packetevents-" + plugin.getName() + "-" + ID.incrementAndGet();
-    }
-
-    /**
-     * Add a custom channel handler to the given player's channel pipeline, allowing us to intercept sent and received packets.
-     * <p>
-     * This will automatically be called when a player has logged in.
-     *
-     * @param player - the player to inject.
-     */
-    public void injectPlayer(Player player) {
-        final PlayerInjectEvent playerInjectEvent = new PlayerInjectEvent(player);
-        PacketEvents.getEventManager().callEvent(playerInjectEvent);
-        if (!playerInjectEvent.isCancelled()) {
-            injectChannelInternal(getChannel(player)).player = player;
-        }
-    }
-
-    /**
-     * Add a custom channel handler to the given channel.
-     *
-     * @param channel - the channel to inject.
-     * @return The intercepted channel, or NULL if it has already been injected.
-     */
-    public void injectChannel(Channel channel) {
-        injectChannelInternal(channel);
-    }
-
-    /**
-     * Add a custom channel handler to the given channel.
-     *
-     * @param channel - the channel to inject.
-     * @return The packet interceptor.
-     */
-    private PacketInterceptor injectChannelInternal(Channel channel) {
-        try {
-            PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
-
-            // Inject our packet interceptor
-            if (interceptor == null) {
-                interceptor = new PacketInterceptor();
-                channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
-                uninjectedChannels.remove(channel);
-            }
-
-            return interceptor;
-        } catch (IllegalArgumentException e) {
-            // Try again
-            return (PacketInterceptor) channel.pipeline().get(handlerName);
-        }
-    }
-
-    /**
-     * Retrieve the Netty channel associated with a player. This is cached.
-     *
-     * @param player - the player.
-     * @return The Netty channel.
-     */
-    public Channel getChannel(Player player) {
-        Channel channel = channelLookup.get(player.getName());
-
-        // Lookup channel again
-        if (channel == null) {
-            Object connection = getConnection.get(getPlayerHandle.invoke(player));
-            Object manager = getManager.get(connection);
-
-            channelLookup.put(player.getName(), channel = getChannel.get(manager));
-        }
-
-        return channel;
-    }
-
-    /**
-     * Uninject a specific player.
-     *
-     * @param player - the injected player.
-     */
-    public void uninjectPlayer(Player player) {
-        uninjectChannel(getChannel(player));
-        PacketEvents.getEventManager().callEvent(new PlayerUninjectEvent(player));
-    }
-
-    /**
-     * Uninject a specific channel.
-     * <p>
-     * This will also disable the automatic channel injection that occurs when a player has properly logged in.
-     *
-     * @param channel - the injected channel.
-     */
-    public void uninjectChannel(final Channel channel) {
-        // No need to guard against this if we're closing
-        if (!closed) {
-            uninjectedChannels.add(channel);
-        }
-
-        // See ChannelInjector in ProtocolLib, line 590
-        channel.eventLoop().execute(new Runnable() {
-
-            @Override
-            public void run() {
-                channel.pipeline().remove(handlerName);
-            }
-
-        });
-    }
-
-    /**
-     * Determine if the given player has been injected by TinyProtocol.
-     *
-     * @param player - the player.
-     * @return TRUE if it is, FALSE otherwise.
-     */
-    public boolean hasInjected(Player player) {
-        return hasInjected(getChannel(player));
-    }
-
-    /**
-     * Determine if the given channel has been injected by TinyProtocol.
-     *
-     * @param channel - the channel.
-     * @return TRUE if it is, FALSE otherwise.
-     */
-    public boolean hasInjected(Channel channel) {
-        return channel.pipeline().get(handlerName) != null;
-    }
-
-    /**
-     * Cease listening for packets. This is called automatically when your plugin is disabled.
-     */
-    public final void close() {
-        if (!closed) {
-            closed = true;
-
-            // Remove our handlers
-            for (Player player : plugin.getServer().getOnlinePlayers()) {
-                uninjectPlayer(player);
-            }
-
-            // Clean up Bukkit
-            HandlerList.unregisterAll(listener);
-            unregisterChannelHandler();
-        }
-    }
-
-    /**
-     * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
-     *
-     * @author Kristian
-     */
-    private final class PacketInterceptor extends ChannelDuplexHandler {
-        // Updated by the login event
-        public volatile Player player;
-
-        @Override
-        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-            // Intercept channel
-            final Channel channel = ctx.channel();
-            handleLoginStart(channel, msg);
-
-            try {
-                msg = onPacketInAsync(player, channel, msg);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
-            }
-
-            if (msg != null) {
-                super.channelRead(ctx, msg);
-            }
-        }
-
-        @Override
-        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-            try {
-                msg = onPacketOutAsync(player, ctx.channel(), msg);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
-            }
-
-            if (msg != null) {
-                super.write(ctx, msg, promise);
-            }
-        }
-
-        private void handleLoginStart(Channel channel, Object packet) {
-            if (PACKET_LOGIN_IN_START.isInstance(packet)) {
-                GameProfile profile = getGameProfile.get(packet);
-                channelLookup.put(profile.getName(), channel);
-            }
-        }
-    }
-}

src/main/java/io/github/retrooper/packetevents/utils/BlockIteratorUtils.java

@@ -0,0 +1,18 @@
+package io.github.retrooper.packetevents.utils;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BlockIterator;
+
+public class BlockIteratorUtils {
+    public static Block getBlockLookingAt(final Player player, final int distance) {
+        final Location location = player.getEyeLocation();
+        final BlockIterator blocksToAdd = new BlockIterator(location, 0.0D, distance);
+        Block block = null;
+        while (blocksToAdd.hasNext()) {
+            block = blocksToAdd.next();
+        }
+        return block;
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java

@@ -1,35 +1,40 @@
 package io.github.retrooper.packetevents.utils;
 
+import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
 import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import io.github.retrooper.packetevents.annotations.Nullable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 public final class NMSUtils {
     private static final ServerVersion version = ServerVersion.getVersion();
-
-
-    public static final String nettyPrefix = version.isLowerThan(ServerVersion.v_1_8) ? "net.minecraft.util.io.netty" : "io.netty";
+    public static String nettyPrefix;
     private static final String nmsDir = ServerVersion.getNMSDirectory();
     private static final String obcDir = ServerVersion.getOBCDirectory();
-
     public static Class<?> minecraftServerClass, craftWorldsClass,
-            packetClass, entityPlayerClass, playerConnectionClass, craftPlayerClass, serverConnectionClass, craftEntityClass, craftItemStack, nmsItemStackClass;
-
-    private static Method getServerMethod, getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
-
-    private static Field recentTPSField, entityPlayerPingField, playerConnectionField;
+            packetClass, entityPlayerClass, playerConnectionClass,
+            craftPlayerClass, serverConnectionClass, craftEntityClass,
+            craftItemStack, nmsItemStackClass, networkManagerClass, nettyChannelClass;
+    private static Method getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
+    private static Field entityPlayerPingField, playerConnectionField;
 
     static {
         try {
+            nettyPrefix = "io.netty";
+            Class.forName("io.netty.channel.Channel");
+        } catch (ClassNotFoundException e) {
+            nettyPrefix = "net.minecraft.util.io.netty";
+        }
+        try {
+            nettyChannelClass = getNettyClass("channel.Channel");
             minecraftServerClass = getNMSClass("MinecraftServer");
             craftWorldsClass = getOBCClass("CraftWorld");
             craftPlayerClass = getOBCClass("entity.CraftPlayer");
@@ -40,13 +45,13 @@ public final class NMSUtils {
             craftEntityClass = getOBCClass("entity.CraftEntity");
             craftItemStack = getOBCClass("inventory.CraftItemStack");
             nmsItemStackClass = getNMSClass("ItemStack");
+            networkManagerClass = getNMSClass("NetworkManager");
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
 
         //METHODS
         try {
-            getServerMethod = minecraftServerClass.getMethod("getServer");
             getCraftWorldHandleMethod = craftWorldsClass.getMethod("getHandle");
             getCraftPlayerHandle = craftPlayerClass.getMethod("getHandle");
             getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
@@ -59,30 +64,35 @@ public final class NMSUtils {
 
 
         try {
-            recentTPSField = minecraftServerClass.getField("recentTps");
             entityPlayerPingField = entityPlayerClass.getField("ping");
             playerConnectionField = entityPlayerClass.getField("playerConnection");
         } catch (NoSuchFieldException e) {
             e.printStackTrace();
         }
-
-
     }
 
     public static Object getMinecraftServerInstance() throws InvocationTargetException, IllegalAccessException {
-        return getServerMethod.invoke(null);
+        return Reflection.getMethod(minecraftServerClass, "getServer", 0).invoke(null);
     }
 
     public static double[] recentTPS() throws IllegalAccessException, InvocationTargetException {
         final Object minecraftServerObj = getMinecraftServerInstance();
-        double[] recentTPS = (double[]) recentTPSField.get(minecraftServerObj);
-        return recentTPS;
+        return (double[]) Reflection.getField(minecraftServerClass, double[].class, 0).get(minecraftServerObj);
     }
 
     public static Class<?> getNMSClass(String name) throws ClassNotFoundException {
         return Class.forName(nmsDir + "." + name);
     }
 
+    public static Class<?> getNMSClassWithoutException(String name) {
+        try {
+            return getNMSClass(name);
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+
+    }
+
     public static Class<?> getOBCClass(String name) throws ClassNotFoundException {
         return Class.forName(obcDir + "." + name);
     }
@@ -124,16 +134,42 @@ public final class NMSUtils {
     }
 
     public static Object getEntityPlayer(final Player player) {
-        final Object craftPlayer = getCraftPlayer(player);
         Object entityPlayer = null;
         try {
-            return getCraftPlayerHandle.invoke(craftPlayer);
+            return getCraftPlayerHandle.invoke(getCraftPlayer(player));
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
         return null;
     }
 
+    public static Object getPlayerConnection(final Player player) {
+        try {
+            return playerConnectionField.get(getEntityPlayer(player));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static Object getNetworkManager(final Player player) {
+        try {
+            return Reflection.getField(playerConnectionClass, networkManagerClass, 0).get(getPlayerConnection(player));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static Object getChannel(final Player player) {
+        try {
+            return Reflection.getField(networkManagerClass, nettyChannelClass, 0).get(getNetworkManager(player));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public static int getPlayerPing(final Player player) {
         Object entityPlayer = getEntityPlayer(player);
         try {

src/main/java/io/github/retrooper/packetevents/utils/api/PlayerUtils.java

@@ -0,0 +1,60 @@
+package io.github.retrooper.packetevents.utils.api;
+
+import io.github.retrooper.packetevents.enums.ClientVersion;
+import io.github.retrooper.packetevents.handler.NettyPacketHandler;
+import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public final class PlayerUtils {
+    private final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
+
+    public int getPing(final Player player) {
+        return NMSUtils.getPlayerPing(player);
+    }
+
+    public ClientVersion getClientVersion(final UUID uuid) {
+        return clientVersionsMap.get(uuid);
+    }
+
+    public ClientVersion getClientVersion(final Player player) {
+        return getClientVersion(player.getUniqueId());
+    }
+
+    public void setClientVersion(final UUID uuid, final ClientVersion version) {
+        clientVersionsMap.put(uuid, version);
+    }
+
+    public void setClientVersion(final Player player, final ClientVersion version) {
+        setClientVersion(player.getUniqueId(), version);
+    }
+
+    public void clearClientVersion(final UUID uuid) {
+        clientVersionsMap.remove(uuid);
+    }
+
+    public void clearClientVersion(final Player player) {
+        clearClientVersion(player.getUniqueId());
+    }
+
+    public void injectPlayer(final Player player) {
+        NettyPacketHandler.injectPlayer(player);
+    }
+
+    public void uninjectPlayer(final Player player) {
+        NettyPacketHandler.uninjectPlayer(player);
+    }
+
+    public void uninjectPlayerNow(final Player player) {
+        NettyPacketHandler.uninjectPlayerNow(player);
+    }
+
+    public void sendPacket(final Player player, final Sendable sendable) {
+        NMSUtils.sendSendableWrapper(player, sendable);
+    }
+
+
+}

src/main/java/io/github/retrooper/packetevents/utils/api/ServerUtils.java

@@ -0,0 +1,46 @@
+package io.github.retrooper.packetevents.utils.api;
+
+import io.github.retrooper.packetevents.enums.ServerVersion;
+import io.github.retrooper.packetevents.enums.SystemOS;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+import java.lang.reflect.InvocationTargetException;
+
+public final class ServerUtils {
+    @Deprecated
+    public ServerVersion getServerVersion() {
+        return getVersion();
+    }
+
+    @Deprecated
+    public double[] getRecentServerTPS() {
+        return getRecentTPS();
+    }
+
+    @Deprecated
+    public double getCurrentServerTPS() {
+        return getCurrentTPS();
+    }
+
+    public ServerVersion getVersion() {
+        return ServerVersion.getVersion();
+    }
+
+    public double[] getRecentTPS() {
+        double[] tpsArray = new double[0];
+        try {
+            tpsArray = NMSUtils.recentTPS();
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return tpsArray;
+    }
+
+    public double getCurrentTPS() {
+        return getRecentTPS()[0];
+    }
+
+    public SystemOS getPlatform() {
+        return SystemOS.getOperatingSystem();
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/nms_entityfinder/EntityFinderUtils.java

@@ -1,6 +1,5 @@
 package io.github.retrooper.packetevents.utils.nms_entityfinder;
 
-import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.annotations.Nullable;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.utils.NMSUtils;
@@ -13,58 +12,12 @@ import java.lang.reflect.Method;
 
 public final class EntityFinderUtils {
     @Nullable
-    private static ServerVersion version = PacketEvents.getServerVersion();
-
-
-    public static Entity getEntityById(final int id) {
-        for (final World world : Bukkit.getWorlds()) {
-            final Entity entity = getEntityByIdWithWorld(world, id);
-            if (entity != null) {
-                return entity;
-            }
-        }
-        return null;
-    }
-
-    @Nullable
-    public static Entity getEntityByIdWithWorld(final World world, final int id) {
-        if(world == null) {
-            return null;
-        }
-        Object craftWorld = craftWorldClass.cast(world);
-
-        Object worldServer = null;
-        try {
-            worldServer = craftWorldGetHandle.invoke(craftWorld);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-
-        Object nmsEntity = null;
-        try {
-            nmsEntity = getEntityByIdMethod.invoke(worldServer, id);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        if(nmsEntity == null) {
-            return null;
-        }
-        try {
-            return (Entity) getBukkitEntity.invoke(nmsEntity);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
+    private static final ServerVersion version = ServerVersion.getVersion();
     private static Class<?> worldServerClass;
     private static Class<?> craftWorldClass;
     private static Class<?> entityClass;
-
     private static Method getEntityByIdMethod;
     private static Method craftWorldGetHandle;
-
     private static Method getBukkitEntity;
 
     static {
@@ -85,6 +38,47 @@ public final class EntityFinderUtils {
         }
     }
 
+    public static Entity getEntityById(final int id) {
+        for (final World world : Bukkit.getWorlds()) {
+            final Entity entity = getEntityByIdWithWorld(world, id);
+            if (entity != null) {
+                return entity;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static Entity getEntityByIdWithWorld(final World world, final int id) {
+        if (world == null) {
+            return null;
+        }
+        Object craftWorld = craftWorldClass.cast(world);
+
+        Object worldServer = null;
+        try {
+            worldServer = craftWorldGetHandle.invoke(craftWorld);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+
+        Object nmsEntity = null;
+        try {
+            nmsEntity = getEntityByIdMethod.invoke(worldServer, id);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        if (nmsEntity == null) {
+            return null;
+        }
+        try {
+            return (Entity) getBukkitEntity.invoke(nmsEntity);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public static String getEntityByNameMethodName() {
         if (version.isHigherThan(ServerVersion.v_1_7_10) && version.isLowerThan(ServerVersion.v_1_9)) {
             return "a";

src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtilities.java

@@ -0,0 +1,16 @@
+package io.github.retrooper.packetevents.utils.onlineplayers;
+
+import io.github.retrooper.packetevents.enums.ServerVersion;
+import org.bukkit.entity.Player;
+
+public class OnlinePlayerUtilities {
+    private static final ServerVersion version = ServerVersion.getVersion();
+
+    public static Player[] getOnlinePlayers() {
+        if (version.isLowerThan(ServerVersion.v_1_9)) {
+            return OnlinePlayerUtils_8.getOnlinePlayers();
+        } else {
+            return OnlinePlayerUtils_9.getOnlinePlayers();
+        }
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_8.java

@@ -0,0 +1,12 @@
+package io.github.retrooper.packetevents.utils.onlineplayers;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+
+public class OnlinePlayerUtils_8 {
+    public static Player[] getOnlinePlayers() {
+
+        return Bukkit.getServer().getOnlinePlayers().toArray(new Player[0]);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_9.java

@@ -0,0 +1,10 @@
+package io.github.retrooper.packetevents.utils.onlineplayers;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class OnlinePlayerUtils_9 {
+    public static Player[] getOnlinePlayers() {
+        return Bukkit.getOnlinePlayers().toArray(new Player[0]);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolLibAPIAccessor.java

@@ -0,0 +1,10 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import org.bukkit.entity.Player;
+
+class ProtocolLibAPIAccessor {
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolLibrary.getProtocolManager().getProtocolVersion(player);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolLibUtils.java

@@ -0,0 +1,14 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class ProtocolLibUtils {
+    public static boolean isAvailable() {
+        return Bukkit.getPluginManager().isPluginEnabled("ProtocolLib");
+    }
+
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolLibAPIAccessor.getProtocolVersion(player);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolSupportAPIAccessor.java

@@ -0,0 +1,10 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.entity.Player;
+import protocolsupport.api.ProtocolSupportAPI;
+
+class ProtocolSupportAPIAccessor {
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolSupportAPI.getProtocolVersion(player).getId();
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ProtocolSupportUtils.java

@@ -0,0 +1,14 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class ProtocolSupportUtils {
+    public static boolean isAvailable() {
+        return Bukkit.getPluginManager().isPluginEnabled("ProtocolSupport");
+    }
+
+    public static int getProtocolVersion(final Player player) {
+        return ProtocolSupportAPIAccessor.getProtocolVersion(player);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/VersionLookupUtils.java

@@ -0,0 +1,25 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.entity.Player;
+
+public class VersionLookupUtils {
+    /**
+     * If ViaVersion is present, we get the protocol version with the ViaVersion API.
+     * If ProtocolSupport is present, we get the protocol version with the ProtocolSupport API.
+     * If ProtocolLib is present, we get the protocol version with the ProtocolLib API.
+     * Otherwise return -1
+     *
+     * @param player
+     * @return protocol version of the player if ViaVersion or ProtocolSupport or ProtocolLib is present. Otherwise -1
+     */
+    public static int getProtocolVersion(final Player player) {
+        if (ViaUtils.isAvailable()) {
+            return ViaUtils.getProtocolVersion(player);
+        } else if (ProtocolSupportUtils.isAvailable()) {
+            return ProtocolSupportUtils.getProtocolVersion(player);
+        } else if (ProtocolLibUtils.isAvailable()) {
+            return ProtocolLibUtils.getProtocolVersion(player);
+        }
+        return -1;
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ViaAPIAccessor.java

@@ -0,0 +1,16 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.entity.Player;
+import us.myles.ViaVersion.api.Via;
+
+import java.util.UUID;
+
+class ViaAPIAccessor {
+    public static int getProtocolVersion(final Player player) {
+        return getProtocolVersion(player.getUniqueId());
+    }
+
+    public static int getProtocolVersion(final UUID uuid) {
+        return Via.getAPI().getPlayerVersion(uuid);
+    }
+}

src/main/java/io/github/retrooper/packetevents/utils/versionlookup/ViaUtils.java

@@ -0,0 +1,15 @@
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+
+public class ViaUtils {
+    public static int getProtocolVersion(final Player player) {
+        return ViaAPIAccessor.getProtocolVersion(player);
+    }
+
+    public static boolean isAvailable() {
+        return Bukkit.getPluginManager().isPluginEnabled("ViaVersion");
+    }
+}