Undo commit

Fixed NPE
2020-08-09 14:37:19 +02:00 · 2020-08-09 12:49:18 +02:00 · 2020-08-09 12:46:23 +02:00 · 2020-07-24 19:54:52 +08:00 · 2020-07-24 19:54:22 +08:00 · 2020-07-23 18:43:38 +02:00
56 changed files with 1485 additions and 936 deletions
@@ -1,339 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+MIT License

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (c) 2020 retrooper

-                            Preamble
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:

-  The 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
-your programs, too.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.

-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  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".
-
-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.
-
-  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.
-
-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.
-
-  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:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    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.
-
-    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.)
-
-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.
-
-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.
-
-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.
-
-  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) 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,
-
-    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,
-
-    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 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.
-
-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.
-
-  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.
-
-  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.
-
-  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
-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
-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.
-
-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.
-
-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.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest 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
-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.
-
-  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.
-
-                            NO WARRANTY
-
-  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.
-
-  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.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-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:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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.
-
-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:
-
-  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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -2,27 +2,19 @@

 A lightweight spigot packetlistener & packetsender coded by retrooper.

-## Credit
-
-PacketEvents forked [Atlas](https://github.com/funkemunky/Atlas)' [Packet](https://github.com/funkemunky/Atlas/blob/master/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/tinyprotocol/api/Packet.java) class.
-
-[Find our forked version](https://github.com/retrooper/packetevents/blob/master/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java)
 ## 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 MIT license

-[![](https://img.shields.io/badge/License-GPLv2-blue.svg)](https://www.gnu.org/licenses/gpl-2.0)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

-Join my discord server(to talk to me): https://discord.gg/ZWTkg4v
+Our discord server: https://discord.me/packetevents

 [![](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)
@@ -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>
@@ -6,43 +6,37 @@

    <groupId>io.github.retrooper</groupId>
    <artifactId>packetevents</artifactId>
-    <version>1.3.8</version>
+    <version>1.5.5</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>
@@ -68,26 +62,27 @@


    <dependencies>
-        <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.8</artifactId>
-            <version>1.8.8</version>
-            <scope>provided</scope>
-        </dependency>

-        <!-- ProtocolLib API-->
+        <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.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>
+          </dependency>
        <!-- ViaVersion API-->
        <dependency>
            <groupId>us.myles</groupId>
@@ -103,5 +98,20 @@
            <version>4fdd683</version>
            <scope>provided</scope>
        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
    </dependencies>
 </project>
@@ -1,12 +1,16 @@
 package io.github.retrooper.packetevents;

-import io.github.retrooper.packetevents.annotations.PacketHandler;
+import io.github.retrooper.packetevents.api.PacketEventsAPI;
+import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent;
-import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
-import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
-import io.github.retrooper.packetevents.event.impl.ServerTickEvent;
+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;
@@ -15,34 +19,40 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;

 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 hasRegistered;
-    private static int currentTick;
-    private static Plugin plugin;
+    private static boolean hasLoaded, hasStarted;
+    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) {
+    public static void load() {
+        PacketTypeClasses.Client.load();
+        PacketTypeClasses.Server.load();
+        ClientVersion.prepareLookUp();
+        hasLoaded = true;
+    }
+
+    /**
+     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
+     */
+    public static void start(final Plugin pl) {
+        if (!hasLoaded) {
+            load();
+        }
+        if (!hasStarted) {
+            plugin = pl;
            //Register Bukkit and PacketListener
-            getAPI().getEventManager().registerListener(getInstance());
+            getAPI().getEventManager().registerListener(instance);

-            Bukkit.getPluginManager().registerEvents(getInstance(), plugin);
+            Bukkit.getPluginManager().registerEvents(instance, plugin);

-            //Start the server tick task
-            final Runnable tickRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    getAPI().getEventManager().callEvent(new ServerTickEvent(currentTick++, PacketEvents.getAPI().currentPreciseMillis()));
-                }
-            };
-            getAPI().setServerTickTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, tickRunnable, 0L, 1L));
-            hasRegistered = true;
-            PacketEvents.plugin = plugin;
+            for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) {
+                getAPI().getPlayerUtils().injectPlayer(p);
+            }
+            hasStarted = true;
        }
    }

@@ -50,58 +60,59 @@ public final class PacketEvents implements PacketListener, Listener {
     * Stop all tasks and unregisters all PacketEvents' listeners
     */
    public static void stop() {
-        if (getAPI().getServerTickTask() != null) {
-            getAPI().getServerTickTask().cancel();
+        if (hasStarted) {
+            for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) {
+
+                getAPI().getPlayerUtils().uninjectPlayerNow(p);
+            }
+            getAPI().getEventManager().unregisterAllListeners();
+
+            PacketType.Client.packetIds.clear();
+            PacketType.Server.packetIds.clear();
        }
-        getAPI().getEventManager().unregisterAllListeners();
+    }
+
+    public static boolean hasLoaded() {
+        return hasLoaded;
+    }
+
+    public static boolean hasStarted() {
+        return hasStarted;
    }

    public static PacketEventsAPI getAPI() {
        return packetEventsAPI;
    }

-
-    /**
-     * Get an instance of the PacketEvents API class
-     *
-     * @return instance
-     */
-    private static PacketEvents getInstance() {
-        return instance;
-    }
-
    public static Plugin getPlugin() {
        return plugin;
    }

-    /**
-     * 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) {
-        getAPI().getPlayerUtilities().clientVersionsMap.put(e.getPlayer().getUniqueId(), e.getClientVersion());
+    public static String getHandlerName(final String name) {
+        return "pe-" + getSettings().getIdentifier() + "-" + name;
    }

-    @PacketHandler
-    public void onReceive(final PacketReceiveEvent e) {
+    public static Settings getSettings() {
+        return settings;
    }

+
    @EventHandler
    public void onJoin(final PlayerJoinEvent e) {
-        getAPI().getPlayerUtilities().injectPlayer(e.getPlayer());
+        getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
+        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer())));
    }

    @EventHandler
    public void onQuit(final PlayerQuitEvent e) {
-        getAPI().getPlayerUtilities().uninjectPlayer(e.getPlayer());
+        getAPI().getPlayerUtils().clearClientVersion(e.getPlayer());
+        getAPI().getPlayerUtils().uninjectPlayerNow(e.getPlayer());
    }

    @EventHandler
    public void onMove(final PlayerMoveEvent e) {
-        getAPI().getEventManager().callEvent(new BukkitMoveEvent(e));
+        BukkitMoveEvent moveEvent = new BukkitMoveEvent(e);
+        getAPI().getEventManager().callEvent(moveEvent);
+        e.setCancelled(moveEvent.isCancelled());
    }
 }
@@ -1,6 +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;
@@ -1,20 +1,20 @@
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.api;

 import io.github.retrooper.packetevents.event.manager.EventManager;
-import org.bukkit.scheduler.BukkitTask;
+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();

-    private BukkitTask serverTickTask;
-
    /**
     * 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() {
@@ -35,16 +35,38 @@ public final class PacketEventsAPI {

    /**
     * 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;
    }
@@ -52,27 +74,12 @@ public final class PacketEventsAPI {
    /**
     * Get the event manager
     * Used to call events, register and unregister listeners
+     *
     * @return PacketEvents' event manager
     */
    public EventManager getEventManager() {
        return eventManager;
    }

-    /**
-     * Get the server tick task, called **asynchronously** every tick
-     * @return server tick task
-     */
-    public BukkitTask getServerTickTask() {
-        return serverTickTask;
-    }
-
-    /**
-     * Modify the server tick task object
-     * @param task
-     */
-    public void setServerTickTask(final BukkitTask task) {
-        this.serverTickTask = task;
-    }
-

 }
@@ -1,74 +1,75 @@
 package io.github.retrooper.packetevents.enums;

+import io.github.retrooper.packetevents.PacketEvents;
+
+import java.util.HashMap;
+import java.util.Map;
+
 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, v_1_16, v_1_16_1, HIGHER_THAN_V_1_16_1, INVALID, ACCESS_FAILURE;
+    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_PRE_1, v_1_15_PRE_2, v_1_15_PRE_3, v_1_15_PRE_4, v_1_15_PRE_5, v_1_15_PRE_6, v_1_15_PRE_7,
+    v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_PRE_1, v_1_16_PRE_2, v_1_16_PRE_3, v_1_16_PRE_4, v_1_16_PRE_5, v_1_16_PRE_6, v_1_16_PRE_7, v_1_16_PRE_8, v_1_16_RC_1, 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:
-            case 4:
-                return LESS_THAN_V_1_7_10;
-            case 47://ranging from 1.8->1.8.9
-                return v_1_8;
-            case 107:
-                return v_1_9;
-            case 108:
-                return v_1_9_1;
-            case 109:
-                return v_1_9_2;
-            case 110:
-                return v_1_9_3; //can be 1.9.3 or 1.9.4
-            case 210:
-                return v_1_10; //could be 1.10,1.10.1, 1.10.2
-            case 315:
-                return v_1_11;
-            case 316: //could be 11.1 or 11.2
-                return v_1_11_1;
-            case 335:
-                return v_1_12;
-            case 338:
-                return v_1_12_1;
-            case 340:
-                return v_1_12_2;
-            case 393:
-                return v_1_13;
-            case 401:
-                return v_1_13_1;
-            case 404:
-                return v_1_13_2;
-            case 477:
-                return v_1_14;
-            case 480:
-                return v_1_14_1;
-            case 485:
-                return v_1_14_2;
-            case 490:
-                return v_1_14_3;
-            case 498:
-                return v_1_14_4;
-            case 573:
-                return v_1_15;
-            case 575:
-                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;
+    private static final Map<Integer, ClientVersion> VERSION_LOOKUP = new HashMap<>();
+
+    public static void prepareLookUp() {
+        VERSION_LOOKUP.put(-1, ACCESS_FAILURE);
+        VERSION_LOOKUP.put(1, LESS_THAN_V_1_7_10);
+        VERSION_LOOKUP.put(2, LESS_THAN_V_1_7_10);
+        VERSION_LOOKUP.put(3, LESS_THAN_V_1_7_10);
+        VERSION_LOOKUP.put(4, LESS_THAN_V_1_7_10);
+        VERSION_LOOKUP.put(5, v_1_7_10);
+        VERSION_LOOKUP.put(47, v_1_8);
+        VERSION_LOOKUP.put(107, v_1_9);
+        VERSION_LOOKUP.put(108, v_1_9_1);
+        VERSION_LOOKUP.put(109, v_1_9_2);
+        VERSION_LOOKUP.put(110, v_1_9_3);
+        VERSION_LOOKUP.put(210, v_1_10);
+        VERSION_LOOKUP.put(315, v_1_11);
+        VERSION_LOOKUP.put(316, v_1_11_1);
+        VERSION_LOOKUP.put(335, v_1_12);
+        VERSION_LOOKUP.put(338, v_1_12_1);
+        VERSION_LOOKUP.put(340, v_1_12_2);
+        VERSION_LOOKUP.put(393, v_1_13);
+        VERSION_LOOKUP.put(401, v_1_13_1);
+        VERSION_LOOKUP.put(404, v_1_13_2);
+        VERSION_LOOKUP.put(477, v_1_14);
+        VERSION_LOOKUP.put(480, v_1_14_1);
+        VERSION_LOOKUP.put(485, v_1_14_2);
+        VERSION_LOOKUP.put(490, v_1_14_3);
+        VERSION_LOOKUP.put(498, v_1_14_4);
+        VERSION_LOOKUP.put(565, v_1_15_PRE_1);
+        VERSION_LOOKUP.put(566, v_1_15_PRE_2);
+        VERSION_LOOKUP.put(567, v_1_15_PRE_3);
+        VERSION_LOOKUP.put(569, v_1_15_PRE_4);
+        VERSION_LOOKUP.put(570, v_1_15_PRE_5);
+        VERSION_LOOKUP.put(571, v_1_15_PRE_6);
+        VERSION_LOOKUP.put(572, v_1_15_PRE_7);
+        VERSION_LOOKUP.put(573, v_1_15);
+        VERSION_LOOKUP.put(575, v_1_15_1);
+        VERSION_LOOKUP.put(578, v_1_15_2);
+        VERSION_LOOKUP.put(721, v_1_16_PRE_1);
+        VERSION_LOOKUP.put(722, v_1_16_PRE_2);
+        VERSION_LOOKUP.put(725, v_1_16_PRE_3);
+        VERSION_LOOKUP.put(727, v_1_16_PRE_4);
+        VERSION_LOOKUP.put(729, v_1_16_PRE_5);
+        VERSION_LOOKUP.put(730, v_1_16_PRE_6);
+        VERSION_LOOKUP.put(732, v_1_16_PRE_7);
+        VERSION_LOOKUP.put(733, v_1_16_PRE_8);
+        VERSION_LOOKUP.put(734, v_1_16_RC_1);
+        VERSION_LOOKUP.put(735, v_1_16);
+        VERSION_LOOKUP.put(736, v_1_16_1);
+    }
+
+    public static ClientVersion fromProtocolVersion(int protocolVersion) {
+        if (protocolVersion == -1 && PacketEvents.getSettings().doAutoResolveClientProtocolVersion()) {
+            protocolVersion = ServerVersion.getVersion().toProtocolVersion();
        }
-        if (remainder > 578) {
-            return HIGHER_THAN_V_1_16_1;
+        final ClientVersion lookedUp = VERSION_LOOKUP.get(protocolVersion);
+        if (lookedUp != null) {
+            return lookedUp;
        }
-        return INVALID;
+        return protocolVersion > 736 ? HIGHER_THAN_V_1_16_1 : INVALID;
    }

    /**
@@ -1,5 +1,6 @@
 package io.github.retrooper.packetevents.enums;

+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;

 /**
@@ -22,18 +23,21 @@ public enum ServerVersion {
            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;
    }

    public static ServerVersion getVersion() {
-        if(cachedVersion == null) {
+        if (cachedVersion == null) {
            cachedVersion = getVers();
        }
        return cachedVersion;
    }

+
    private static ServerVersion[] reverse(final ServerVersion[] arr) {
        ServerVersion[] array = arr.clone();
        if (array == null) {
@@ -57,7 +61,7 @@ public enum ServerVersion {
    }

    public static String getNMSDirectory() {
-        return "net.minecraft.server." + nmsVersionSuffix;
+        return "net.minecraft.server." + getNmsSuffix();
    }

    public static String getOBCDirectory() {
@@ -95,4 +99,47 @@ public enum ServerVersion {
        return false;
    }

+    public int toProtocolVersion() {
+        if (this.equals(ServerVersion.v_1_7_10)) {
+            return 5;
+        }
+        if (this.name().startsWith("v_1_8")) {
+            return 47;
+        }
+        if (this.equals(ServerVersion.v_1_9)) {
+            return 107;
+        }
+        if (this.equals(ServerVersion.v_1_9_4)) {
+            return 110;
+        }
+        if (this.equals(ServerVersion.v_1_10)) {
+            return 210;
+        }
+        if (this.equals(ServerVersion.v_1_11)) {
+            return 315;
+        }
+        if (this.equals(ServerVersion.v_1_11)) {
+            return 315;
+        }
+        if (this.equals(ServerVersion.v_1_12)) {
+            return 335;
+        }
+        if (this.equals(ServerVersion.v_1_13)) {
+            return 393;
+        }
+        if (this.equals(ServerVersion.v_1_13_2)) {
+            return 404;
+        }
+        if (this.equals(ServerVersion.v_1_14)) {
+            return 477;
+        }
+        if (this.equals(ServerVersion.v_1_15)) {
+            return 573;
+        }
+        if (this.equals(ServerVersion.v_1_16_1)) {
+            return 735;
+        }
+        return -1;
+    }
+
 }
@@ -8,7 +8,7 @@ public enum SystemOS {
    private static SystemOS getOS() {
        final String os = System.getProperty("os.name");
        for (final String osName : getOperatingSystemNames()) {
-            if(os.toLowerCase().contains(osName.toLowerCase())) {
+            if (os.toLowerCase().contains(osName.toLowerCase())) {
                return SystemOS.valueOf(osName);
            }
        }
@@ -16,7 +16,7 @@ public enum SystemOS {
    }

    public static SystemOS getOperatingSystem() {
-        if(value == null) {
+        if (value == null) {
            value = getOS();
        }
        return value;
@@ -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;
+    }
+}
@@ -16,6 +16,8 @@ public enum PlayerDigType {

    SWAP_HELD_ITEMS,

+    SWAP_ITEM_WITH_OFFHAND,
+
    WRONG_PACKET;

    public static PlayerDigType get(final int i) {
@@ -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() {
+    }
+}
@@ -1,16 +1,11 @@
 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 static ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
-    protected long timestamp = PacketEvents.getAPI().currentPreciseMillis();
+    protected static ServerVersion version = ServerVersion.getVersion();
+    private long timestamp = System.currentTimeMillis();

    /**
     * Timestamp of the packet
@@ -20,4 +15,8 @@ public class PacketEvent {
    public long getTimestamp() {
        return timestamp;
    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
 }
@@ -8,6 +8,7 @@ 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;
@@ -32,4 +33,16 @@ public final class BukkitMoveEvent extends PacketEvent {
    public Location getTo() {
        return to;
    }
+
+    public void setCancelled(final boolean val) {
+        this.cancelled = val;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void cancel() {
+        setCancelled(true);
+    }
 }
@@ -1,17 +1,16 @@
 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 {
    private final Player player;
-    private final String name;
    private final Object packet;
    private boolean cancelled;

-    public PacketReceiveEvent(final Player player, final String packetName, final Object packet) {
+    public PacketReceiveEvent(final Player player, final Object packet) {
        this.player = player;
-        this.name = packetName;
        this.packet = packet;
    }

@@ -26,11 +25,9 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the packet's name (NMS packet class simple name)
-     *
-     * @return
     */
    public String getPacketName() {
-        return this.name;
+        return this.packet.getClass().getSimpleName();
    }

    /**
@@ -44,12 +41,26 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the class of the NMS packet object
+     *
     * @return packet object class
     */
    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;
+    }
+
    /**
     * Returns if the packet has been cancelled
     *
@@ -1,18 +1,17 @@
 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 PacketSendEvent extends PacketEvent {
    private final Player player;
-    private final String name;
    private final Object packet;
    private boolean cancelled;

-    public PacketSendEvent(final Player player, final String packetName, final Object packet) {
+    public PacketSendEvent(final Player player, final Object packet) {
        this.player = player;
-        this.name = packetName;
        this.packet = packet;
        this.cancelled = false;
    }
@@ -22,10 +21,26 @@ public final class PacketSendEvent extends PacketEvent {
        return this.player;
    }

+    /**
+     * Get the packet's name (NMS packet class simple name)
+     */
    public String getPacketName() {
-        return this.name;
+        return this.packet.getClass().getSimpleName();
    }

+    /**
+     * Get the ID of the packet
+     *
+     * @return packet id
+     */
+    public byte getPacketId() {
+        Byte id =
+                PacketType.Server.packetIds.get(getNMSPacketClass());
+        if (id == null) {
+            return -1;
+        }
+        return id;
+    }

    /**
     * Get the NMS packet object
@@ -38,6 +53,7 @@ public final class PacketSendEvent extends PacketEvent {

    /**
     * Get the class of the NMS packet object
+     *
     * @return packet object class
     */
    public Class<?> getNMSPacketClass() {
@@ -1,18 +1,14 @@
 package io.github.retrooper.packetevents.event.impl;

-import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.utils.api.VersionLookupUtils;
 import org.bukkit.entity.Player;

 public final class PlayerInjectEvent extends PacketEvent {
    private final Player player;
-    private final ClientVersion clientVersion;
    private boolean cancelled;

    public PlayerInjectEvent(final Player player) {
        this.player = player;
-        this.clientVersion = ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(player));
    }

    public boolean isCancelled() {
@@ -27,10 +23,6 @@ public final class PlayerInjectEvent extends PacketEvent {
        setCancelled(true);
    }

-    public ClientVersion getClientVersion() {
-        return clientVersion;
-    }
-
    public Player getPlayer() {
        return player;
    }
@@ -6,9 +6,11 @@ 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) {
+    public PlayerUninjectEvent(final Player player, final boolean sync) {
        this.player = player;
+        this.sync = sync;
    }

    public void cancel() {
@@ -23,6 +25,17 @@ public final class PlayerUninjectEvent extends PacketEvent {
        this.cancelled = val;
    }

+    /**
+     * Whether the uninjection was called synchronously or asynchronously.
+     * The event is still called synchronously.
+     * By default all uninjections are called aynchronously in this build.
+     *
+     * @return If the uninjection was done async or sync
+     */
+    public boolean isSync() {
+        return sync;
+    }
+
    public Player getPlayer() {
        return player;
    }
@@ -1,33 +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.getAPI().getServerUtilities().getCurrentServerTPS();
-    }
-
-    public ServerTickEvent(final int tick) {
-        this.tick = tick;
-        this.tps = PacketEvents.getAPI().getServerUtilities().getCurrentServerTPS();
-    }
-
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public int getCurrentTick() {
-        return tick;
-    }
-
-    public double getCurrentServerTPS() {
-        return tps;
-    }
-}
@@ -22,12 +22,12 @@ public final class EventManager {
    public EventManager(final int threadCount) {
        executorService = Executors.newFixedThreadPool(threadCount);
    }
+
    public EventManager() {
        this(Runtime.getRuntime().availableProcessors());
    }

    public void callEvent(final PacketEvent e) {
-        Integer i = 0;
        for (final PacketListener listener : registeredMethods.keySet()) {
            //Annotated methods
            final List<Method> methods = registeredMethods.get(listener);
@@ -71,10 +71,22 @@ public final class EventManager {
        }
    }

+    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();
    }
@@ -1,23 +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.PacketReceiveEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.in.armanimation.WrappedPacketInArmAnimation;
+import io.github.retrooper.packetevents.packetwrappers.in.custompayload.WrappedPacketInCustomPayload;
+import io.github.retrooper.packetevents.packetwrappers.in.helditemslot.WrappedPacketInHeldItemSlot;
 import org.bukkit.plugin.java.JavaPlugin;

-import static io.github.retrooper.packetevents.PacketEvents.getAPI;
+public class MainExample extends JavaPlugin implements PacketListener {

-public class MainExample extends JavaPlugin {
+    @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);


-        getAPI().getServerTickTask().cancel();
+        PacketEvents.getAPI().getEventManager().registerListeners(this);
    }

    @Override
    public void onDisable() {
        PacketEvents.stop();
    }
-
 }
@@ -1,7 +1,6 @@
 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.PacketReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
 import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
@@ -11,14 +10,21 @@ import org.bukkit.entity.Player;
 import java.util.concurrent.Future;

 public class NettyPacketHandler {
-    public static final String handlerName = "packet_handler";
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+    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 (version.isLowerThan(ServerVersion.v_1_8)) {
+            if (v1_7_nettyMode) {
                NettyPacketHandler_7.injectPlayer(player);
            } else {
                NettyPacketHandler_8.injectPlayer(player);
@@ -27,21 +33,39 @@ public class NettyPacketHandler {
    }

    public static Future<?> uninjectPlayer(final Player player) {
-        final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
-        PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
-        if (!uninjectEvent.isCancelled()) {
-            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                return NettyPacketHandler_7.uninjectPlayer(player);
-            } else {
-                return NettyPacketHandler_8.uninjectPlayer(player);
+        try {
+            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);
+                }
            }
+        } catch (Exception ignored) {
+
        }
        return null;
    }

+    public static void uninjectPlayerNow(final Player player) {
+        try {
+            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);
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
    public static Object write(final Player sender, final Object packet) {
-        final String packetName = packet.getClass().getSimpleName();
-        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packetName, packet);
+        final PacketSendEvent packetSendEvent = new PacketSendEvent(sender, packet);
        PacketEvents.getAPI().getEventManager().callEvent(packetSendEvent);
        if (!packetSendEvent.isCancelled()) {
            return packet;
@@ -50,8 +74,7 @@ public class NettyPacketHandler {
    }

    public static Object read(final Player receiver, final Object packet) {
-        final String packetName = packet.getClass().getSimpleName();
-        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packetName, packet);
+        final PacketReceiveEvent packetReceiveEvent = new PacketReceiveEvent(receiver, packet);
        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent);
        if (!packetReceiveEvent.isCancelled()) {
            return packet;
@@ -1,7 +1,12 @@
 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 net.minecraft.util.io.netty.channel.Channel;
+import net.minecraft.util.io.netty.channel.ChannelDuplexHandler;
+import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
+import net.minecraft.util.io.netty.channel.ChannelPipeline;
+import net.minecraft.util.io.netty.channel.ChannelPromise;
 import org.bukkit.entity.Player;

 import java.util.concurrent.Future;
@@ -29,16 +34,18 @@ final class NettyPacketHandler_7 {
            }
        };
        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore(NettyPacketHandler.handlerName, player.getName(), channelDuplexHandler);
+        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(player.getName());
-            }
+        return channel.eventLoop().submit(() -> {
+            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()));
+    }
 }
@@ -1,15 +1,17 @@
 package io.github.retrooper.packetevents.handler;

 import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.utils.NMSUtils;
-import io.netty.channel.*;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
 import org.bukkit.entity.Player;

 import java.util.concurrent.Future;

 final class NettyPacketHandler_8 {
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();

    public static void injectPlayer(final Player player) {
        final ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() {
@@ -32,16 +34,18 @@ final class NettyPacketHandler_8 {
            }
        };
        final ChannelPipeline pipeline = ((Channel) NMSUtils.getChannel(player)).pipeline();
-        pipeline.addBefore(NettyPacketHandler.handlerName, player.getName(), channelDuplexHandler);
+        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(player.getName());
-            }
+        return channel.eventLoop().submit(() -> {
+            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()));
+    }
 }
@@ -1,84 +0,0 @@
-package io.github.retrooper.packetevents.mojang;
-
-import com.mojang.authlib.properties.PropertyMap;
-
-import java.util.UUID;
-
-public final class GameProfile {
-    private final UUID id;
-    private final String name;
-    private final PropertyMap properties = new PropertyMap();
-    private boolean legacy;
-
-    public GameProfile(UUID id, String name) {
-        if (id == null && name.isEmpty()) {
-            throw new IllegalArgumentException("Name and ID cannot both be blank");
-        } else {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
-    public UUID getId() {
-        return this.id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public PropertyMap getProperties() {
-        return this.properties;
-    }
-
-    public boolean isComplete() {
-        return this.id != null && !getName().isEmpty();
-    }
-
-
-    public boolean isLegacy() {
-        return this.legacy;
-    }
-
-    public boolean equals(com.mojang.authlib.GameProfile profile) {
-        if (profile != null) {
-            return profile.getId() != null && getId() != null && profile.getId() == getId()
-                    && profile.getName() != null && getName() != null && profile.getName().equals(getName());
-        }
-        return false;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        } else if (o != null && this.getClass() == o.getClass()) {
-            GameProfile that = (GameProfile) o;
-            if (this.id != null) {
-                if (!this.id.equals(that.id)) {
-                    return false;
-                }
-            } else if (that.id != null) {
-                return false;
-            }
-
-            if (this.name != null) {
-                return this.name.equals(that.name);
-            } else return that.name == null;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        int result = this.id != null ? this.id.hashCode() : 0;
-        result = 31 * result + (this.name != null ? this.name.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "id: " + id + ", name: " + name + ", legacy: " + legacy;
-    }
-}
@@ -1,178 +1,211 @@
 package io.github.retrooper.packetevents.packet;

-import io.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.reflectionutils.Reflection;
-import io.github.retrooper.packetevents.utils.NMSUtils;
+import java.util.HashMap;
+import java.util.Map;

-public final class PacketType {
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+public class PacketType {


-    public static final class Util {
-        private static Class<?> packetPlayInFlying, packetPlayInPosition, packetPlayInPositionLook, packetPlayInLook, packetPlayInUseEntity;
-
-        static {
-            try {
-                //Only exists in 1.7->1.8.8 & 1.16 protocol
-                packetPlayInFlying = NMSUtils.getNMSClass(Client.FLYING);
-            } catch (ClassNotFoundException e) {
-                //That is fine, they are on 1.9->1.15.2
-            }
-            try {
-                packetPlayInPosition = NMSUtils.getNMSClass(Client.POSITION);
-                packetPlayInPositionLook = NMSUtils.getNMSClass(Client.POSITION_LOOK);
-                packetPlayInLook = NMSUtils.getNMSClass(Client.LOOK);
-
-            } catch (ClassNotFoundException e) {
-                packetPlayInPosition = Reflection.getSubClass(packetPlayInFlying, Client.POSITION);
-                packetPlayInPositionLook = Reflection.getSubClass(packetPlayInFlying, Client.POSITION_LOOK);
-                packetPlayInLook = Reflection.getSubClass(packetPlayInFlying, Client.LOOK);
-            }
-
-            try {
-                packetPlayInUseEntity = NMSUtils.getNMSClass(Client.USE_ENTITY);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
+    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;
            }
        }

-        /**
-         * Is this NMS packet an instance of the "PacketPlayInFlying" packet?
-         * 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 & 1.16 protocol!
-         */
-        public static boolean isInstanceOfFlyingPacket(final Object nmsPacket) {
-            //1.7->1.8.8
-            if (packetPlayInFlying != null) {
-                return packetPlayInFlying.isInstance(nmsPacket);
-            } else {
-                //1.9->1.15.2
-                return isInstanceOfPositionOrPositionLook(nmsPacket) || isInstanceOfPositionLookPacket(nmsPacket);
-            }
-        }
+        public static final Map<Class<?>, Byte> packetIds = new HashMap<Class<?>, Byte>();

-        /**
-         * Is this NMS packet an instance of the "PacketPlayInPosition" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPosition
-         */
-        public static boolean isInstanceOfPositionPacket(final Object nmsPacket) {
-            return packetPlayInPosition.isInstance(nmsPacket);
-        }
+        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;

-        /**
-         * Is this NMS packet an instance of the "PacketPlayInPositionLook" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPositionLook
-         */
-        public static boolean isInstanceOfPositionLookPacket(final Object nmsPacket) {
-            return packetPlayInPositionLook.isInstance(nmsPacket);
-        }
-
-        /**
-         * Is this NMS Packet an instanceof the "PacketPlayInPosition" or "PacketPlayInPositionLook"
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInPosition || nmsPacket instanceof PacketPlayInPositionLook
-         */
-        public static boolean isInstanceOfPositionOrPositionLook(final Object nmsPacket) {
-            return isInstanceOfPositionPacket(nmsPacket) || isInstanceOfPositionLookPacket(nmsPacket);
-        }
-
-        /**
-         * Is this NMS Packet an instance of the "PacketPlayInLook" packet?
-         *
-         * @param nmsPacket
-         * @return nmsPacket instanceof PacketPlayInLook
-         */
-        public static boolean isInstanceOfLook(final Object nmsPacket) {
-            return packetPlayInLook.isInstance(nmsPacket);
-        }
-
-        public static boolean isInstanceOfUseEntity(final Object nmsPacket) {
-            return packetPlayInUseEntity.isInstance(nmsPacket);
+        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 final class Client {
-        private static final String c = "PacketPlayIn";
-        /*
-         * Only exists in 1.7.10->1.8.8 & 1.16+
-         */
-        public static final String FLYING = c + "Flying";
+    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 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 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);
+        }
    }

-    public static final 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 final 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 ENCRYPTION_BEGIN_IN = "PacketLoginInEncryptionBegin";
-        public static final String ENCRYPTION_BEGIN_OUT = "PacketLoginOutEncryptionBegin";
-    }

 }
@@ -1,26 +1,40 @@
 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 {
-        private static String c = "PacketPlayIn";
-
-        @Nullable
-        public static final Class<?> FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
-
        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, ABILITIES, HELD_ITEM_SLOT, CLOSE_WINDOW,
-                TAB_COMPLETE, CHAT, SET_CREATIVE_SLOT, KEEP_ALIVE;
+                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");

-        static {
+        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");
@@ -38,10 +52,182 @@ public class PacketTypeClasses {
                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();
        }
    }

@@ -3,10 +3,6 @@ package io.github.retrooper.packetevents.packetwrappers.api;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import org.bukkit.entity.Player;

-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public class WrappedPacket {
    protected static ServerVersion version = ServerVersion.getVersion();
    protected final Player player;
@@ -34,6 +30,7 @@ public class WrappedPacket {
        }
    }

+
    protected void setup() {

    }
@@ -0,0 +1,36 @@
+package io.github.retrooper.packetevents.packetwrappers.in.armanimation;
+
+import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
+import io.github.retrooper.packetevents.reflectionutils.Reflection;
+import io.github.retrooper.packetevents.utils.NMSUtils;
+
+//TODO: Test on 1.9, 1.11, 1.13, 1.14
+public final class WrappedPacketInArmAnimation extends WrappedPacket {
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInArmAnimation");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private long timeStamp;
+
+    public WrappedPacketInArmAnimation(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    public void setup() {
+        //Lazy way, do you really need to get the timestamp in the actual class? Edit by Retrooper: Yes lol
+        //TODO: Get EnumHand value sent in 1.9+, however not really necessary
+        timeStamp = System.currentTimeMillis();
+    }
+
+    public long getTimestamp() {
+        return timeStamp;
+    }
+
+}
@@ -0,0 +1,66 @@
+package io.github.retrooper.packetevents.packetwrappers.in.clientcommand;
+
+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;
+
+//TODO: Test on 1.9, 1.10, 1.11, 1.13, 1.14
+public final class WrappedPacketInClientCommand extends WrappedPacket {
+    private static Class<?> packetClass;
+    @Nullable
+    private static Class<?> enumClientCommandClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInClientCommand");
+            if(version.isHigherThan(ServerVersion.v_1_7_10)) {
+                enumClientCommandClass = Reflection.getSubClass(packetClass, "EnumClientCommand");
+            }else {
+                enumClientCommandClass = NMSUtils.getNMSClass("EnumClientCommand");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private ClientCommand clientCommand;
+
+    public WrappedPacketInClientCommand(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    public void setup() {
+        try {
+            if(version.isLowerThan(ServerVersion.v_1_8)) {
+                clientCommand = ClientCommand.get(Reflection.getField(enumClientCommandClass, int.class, 1).getInt(packet));
+            } else {
+                final Object enumObj = Reflection.getField(packetClass, enumClientCommandClass, 0).get(packet);
+                this.clientCommand = ClientCommand.valueOf(enumObj.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public ClientCommand getClientCommand() {
+        return clientCommand;
+    }
+
+    public static enum ClientCommand {
+        PERFORM_RESPAWN,
+        REQUEST_STATS,
+        OPEN_INVENTORY_ACHIEVEMENT;
+
+        private ClientCommand() {
+        }
+
+        public static ClientCommand get(final int i) {
+            return values()[i];
+        }
+    }
+
+}
@@ -0,0 +1,62 @@
+package io.github.retrooper.packetevents.packetwrappers.in.custompayload;
+
+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 WrappedPacketInCustomPayload extends WrappedPacket {
+    private static Class<?> packetClass, nmsMinecraftKey, nmsPacketDataSerializer;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInCustomPayload");
+            nmsPacketDataSerializer = NMSUtils.getNMSClass("PacketDataSerializer");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try{
+            //Only on 1.13+
+            nmsMinecraftKey = NMSUtils.getNMSClass("MinecraftKey");
+        } catch (Exception e) {
+            //Its okay, this means they are on versions 1.7.10 ~ 1.12.2
+        }
+    }
+
+    private String data;
+    private Object minecraftKey, dataSerializer;
+
+    public WrappedPacketInCustomPayload(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    public void setup() {
+        if(Reflection.getField(packetClass, String.class, 0) == null) {
+            try {
+                this.minecraftKey = Reflection.getField(packetClass, nmsMinecraftKey, 0).get(packet);
+                this.dataSerializer = Reflection.getField(packetClass, nmsPacketDataSerializer, 0).get(packet);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                this.data = (String)Reflection.getField(packetClass, String.class, 0).get(packet);
+                this.dataSerializer = Reflection.getField(packetClass, nmsPacketDataSerializer, 0).get(packet);
+            } catch (Exception e) {
+//intentionally empty, allegedly 1.7.10 produces a NPE?
+            }
+        }
+    }
+
+    public String getData() {
+        return data;
+    }
+    
+    public Object getMinecraftKey() {
+        return minecraftKey;
+    }
+
+    public Object getDataSerializer() {
+        return dataSerializer;
+    }
+}
@@ -23,8 +23,6 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
                        break;
                    }
                }
-            } else {
-                enumPlayerActionClass = NMSUtils.getNMSClass("EnumPlayerAction");
            }
        } catch (ClassNotFoundException e) {
            e.printStackTrace();
@@ -55,7 +53,7 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {

            //1.7.10
            if (version.isLowerThan(ServerVersion.v_1_8)) {
-                animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
+                animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet); // TODO: += if packetdataserializer.version < 16
            } else {
                final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
                final String enumValue = enumObj.toString();
@@ -0,0 +1,37 @@
+package io.github.retrooper.packetevents.packetwrappers.in.helditemslot;
+
+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 WrappedPacketInHeldItemSlot extends WrappedPacket {
+    private static Class<?> packetClass;
+
+    static {
+        try {
+            packetClass = NMSUtils.getNMSClass("PacketPlayInHeldItemSlot");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int itemInHandIndex;
+
+    public WrappedPacketInHeldItemSlot(Object packet) {
+        super(packet);
+    }
+
+    @Override
+    public void setup() {
+        try {
+            itemInHandIndex = Reflection.getField(packetClass, int.class, 0).getInt(packet);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public int getItemInHandIndex() {
+        return itemInHandIndex;
+    }
+
+}
@@ -1,16 +1,15 @@
 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;

 public final class WrappedPacketInKeepAlive extends WrappedPacket {
-    private static Class<?> keepAliveClass;
+    private static Class<?> packetClass;

    static {
        try {
-            keepAliveClass = NMSUtils.getNMSClass("PacketPlayInKeepAlive");
+            packetClass = NMSUtils.getNMSClass("PacketPlayInKeepAlive");
        } catch (ClassNotFoundException e) {
            e.printStackTrace();
        }
@@ -24,22 +23,26 @@ public final class WrappedPacketInKeepAlive extends WrappedPacket {

    @Override
    protected void setup() {
-        try {
-            if (version.isHigherThan(ServerVersion.v_1_12)) {
-                this.id = Reflection.getField(keepAliveClass, long.class, 0).getLong(packet);
-            } else {
-                this.id = Reflection.getField(keepAliveClass, int.class, 0).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;
@@ -5,6 +5,16 @@ 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;

@@ -24,10 +34,12 @@ public class WrappedPacketInSteerVehicle extends WrappedPacket {
            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;
@@ -40,14 +52,4 @@ public class WrappedPacketInSteerVehicle extends WrappedPacket {
    public boolean isUnmount() {
        return unmount;
    }
-
-    private static Class<?> packetClass;
-
-    static {
-        try {
-            packetClass = NMSUtils.getNMSClass("PacketPlayInSteerVehicle");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
 }
@@ -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();
+        }
+    }
+}
@@ -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;
+    }
+}
@@ -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) {
+
+        }
+    }
+
+}
@@ -75,17 +75,16 @@ public final class Reflection {
    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;
-                }
+            final Field[] fields = getFields(cls);
+            if (fields.length <= index) {
+                return null;
            }
+            final Field field = fields[index];
+            fieldWithIndexHashMap.put(fwi, field);
+            return field;
        } else {
            return fieldWithIndexHashMap.get(fwi);
        }
-        return null;
    }

    //METHODS
@@ -187,4 +186,4 @@ public final class Reflection {
        }
        return null;
    }
-}
+}
@@ -0,0 +1,57 @@
+package io.github.retrooper.packetevents.settings;
+
+import io.github.retrooper.packetevents.enums.ServerVersion;
+
+public class Settings {
+    private ServerVersion defaultServerVersion;
+    private String identifier = "";
+    private boolean autoResolveClientProtocolVersion;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Set a unique Identifier (Usually something that represents your plugin, For example: MyPluginPacketHandler)
+     * If another present plugin uses the same Identifier, It might cause incompatibilities
+     *
+     * @param identifier
+     */
+    public void setIdentifier(final String identifier) {
+        this.identifier = identifier;
+    }
+
+    public boolean doAutoResolveClientProtocolVersion() {
+        return autoResolveClientProtocolVersion;
+    }
+
+    /**
+     * If PacketEvents fails to detect a client's version
+     * Should it assume that the client is using the same version that the server is?
+     * <p>
+     * Returns ACCESS_FAILURE if false
+     *
+     * @param autoResolveClientProtocolVersion
+     */
+    public void setDoAutoResolveClientProtocolVersion(boolean autoResolveClientProtocolVersion) {
+        this.autoResolveClientProtocolVersion = autoResolveClientProtocolVersion;
+    }
+}
@@ -15,4 +15,4 @@ public class BlockIteratorUtils {
        }
        return block;
    }
-}
+}
@@ -16,17 +16,23 @@ 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, networkManagerClass, nettyChannelClass;
-    private static Method getServerMethod, getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
-    private static Field recentTPSField, entityPlayerPingField, playerConnectionField;
+    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");
@@ -46,7 +52,6 @@ public final class NMSUtils {

        //METHODS
        try {
-            getServerMethod = minecraftServerClass.getMethod("getServer");
            getCraftWorldHandleMethod = craftWorldsClass.getMethod("getHandle");
            getCraftPlayerHandle = craftPlayerClass.getMethod("getHandle");
            getCraftEntityHandle = craftEntityClass.getMethod("getHandle");
@@ -59,7 +64,6 @@ public final class NMSUtils {


        try {
-            recentTPSField = minecraftServerClass.getField("recentTps");
            entityPlayerPingField = entityPlayerClass.getField("ping");
            playerConnectionField = entityPlayerClass.getField("playerConnection");
        } catch (NoSuchFieldException e) {
@@ -68,13 +72,12 @@ public final class NMSUtils {
    }

    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 {
@@ -98,7 +101,7 @@ public final class NMSUtils {
        return Class.forName(nettyPrefix + "." + name);
    }

-    public static final String getChannelFutureListFieldName() {
+    public static String getChannelFutureListFieldName() {
        if (version.isLowerThan(ServerVersion.v_1_8))
            return "e";
        if (version.isLowerThan(ServerVersion.v_1_13))
@@ -131,7 +134,6 @@ public final class NMSUtils {
    }

    public static Object getEntityPlayer(final Player player) {
-        Object entityPlayer = null;
        try {
            return getCraftPlayerHandle.invoke(getCraftPlayer(player));
        } catch (IllegalAccessException | InvocationTargetException e) {
@@ -180,9 +182,7 @@ public final class NMSUtils {
    public static ItemStack toBukkitItemStack(final Object nmsItemstack) {
        try {
            return (ItemStack) asBukkitCopy.invoke(null, nmsItemstack);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
            e.printStackTrace();
        }
        return null;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.utils.api;

 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.handler.NettyPacketHandler;
@@ -9,10 +9,10 @@ import org.bukkit.entity.Player;
 import java.util.HashMap;
 import java.util.UUID;

-public class PlayerUtils {
-    protected final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();
+public final class PlayerUtils {
+    private final HashMap<UUID, ClientVersion> clientVersionsMap = new HashMap<UUID, ClientVersion>();

-    public int getPlayerPing(final Player player) {
+    public int getPing(final Player player) {
        return NMSUtils.getPlayerPing(player);
    }

@@ -24,6 +24,22 @@ public class PlayerUtils {
        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);
    }
@@ -32,9 +48,11 @@ public class PlayerUtils {
        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);
    }
-
-
 }
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents;
+package io.github.retrooper.packetevents.utils.api;

 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.enums.SystemOS;
@@ -6,12 +6,27 @@ import io.github.retrooper.packetevents.utils.NMSUtils;

 import java.lang.reflect.InvocationTargetException;

-public class ServerUtils {
+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[] getRecentServerTPS() {
+    public double[] getRecentTPS() {
        double[] tpsArray = new double[0];
        try {
            tpsArray = NMSUtils.recentTPS();
@@ -21,11 +36,11 @@ public class ServerUtils {
        return tpsArray;
    }

-    public double getCurrentServerTPS() {
-        return getRecentServerTPS()[0];
+    public double getCurrentTPS() {
+        return getRecentTPS()[0];
    }

-    public SystemOS getPlatform(){
+    public SystemOS getPlatform() {
        return SystemOS.getOperatingSystem();
    }
 }
@@ -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,7 +12,7 @@ import java.lang.reflect.Method;

 public final class EntityFinderUtils {
    @Nullable
-    private static final ServerVersion version = PacketEvents.getAPI().getServerUtilities().getServerVersion();
+    private static final ServerVersion version = ServerVersion.getVersion();
    private static Class<?> worldServerClass;
    private static Class<?> craftWorldClass;
    private static Class<?> entityClass;
@@ -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();
+        }
+    }
+}
@@ -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]);
+    }
+}
@@ -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]);
+    }
+}
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import com.comphenix.protocol.ProtocolLibrary;
 import org.bukkit.entity.Player;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.entity.Player;
 import protocolsupport.api.ProtocolSupportAPI;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.entity.Player;

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.entity.Player;
 import us.myles.ViaVersion.api.Via;
@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.utils.api;
+package io.github.retrooper.packetevents.utils.versionlookup;

 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
Author	SHA1	Message	Date
terrarier2111	3e912f5282	Undo commit	2020-08-09 14:37:19 +02:00
terrarier2111	360562e80e	Fixed NPE	2020-08-09 12:49:18 +02:00
terrarier2111	8ffc8836d6	Fixed NPE	2020-08-09 12:46:23 +02:00
Retrooper	2f629ac77f	Merge remote-tracking branch 'origin/master'	2020-07-24 19:54:52 +08:00
Retrooper	f1ead98a46	1.5.5 stable release	2020-07-24 19:54:22 +08:00
retrooper	c3747cfebd	Merge pull request #23 from undersquire/patch-7 Update WrappedPacketInCustomPayload.java	2020-07-23 18:43:38 +02:00
undersquire	21d6970b0d	Update WrappedPacketInCustomPayload.java Added "getMinecraftKey()" method	2020-07-23 09:42:37 -07:00
retrooper	d9072d54d0	Merge pull request #22 from NikV2/master Not important, small simplifications and information	2020-07-23 16:58:53 +02:00
Nik	a963980f9d	Commit	2020-07-23 17:31:58 +03:00
Retrooper	45f8ce1a44	pre 1.5.5 * optimizations to the packetreceiveevent and packetsendevent * few wrapper corrections	2020-07-23 18:21:03 +08:00
retrooper	eb981ef06a	Merge pull request #18 from undersquire/patch-2 Create WrappedPacketInArmAnimation.java	2020-07-23 02:32:43 +02:00
retrooper	56030945e9	Merge pull request #19 from undersquire/patch-3 Create WrappedPacketInClientCommand.java	2020-07-23 02:31:55 +02:00
retrooper	d4e52967ca	Merge pull request #20 from undersquire/patch-5 Create WrappedPacketInCustomPayload.java	2020-07-23 02:27:33 +02:00
retrooper	4b3a998ae2	Merge pull request #21 from undersquire/patch-6 Create WrappedPacketInHeldItemSlot.java	2020-07-23 02:24:45 +02:00
undersquire	b0dd3dae9b	Create WrappedPacketInHeldItemSlot.java	2020-07-22 17:21:01 -07:00
undersquire	372a802c98	Create WrappedPacketInCustomPayload.java	2020-07-22 17:19:54 -07:00
undersquire	16f2f29bf2	Create WrappedPacketInClientCommand.java	2020-07-22 17:17:15 -07:00
undersquire	e0aba994b6	Create WrappedPacketInArmAnimation.java	2020-07-22 17:14:20 -07:00
retrooper	6aea77cdbc	added discord server	2020-07-23 00:30:54 +02:00
retrooper	07d96cd486	Update README.md	2020-07-23 00:29:52 +02:00
retrooper	9b21a4d07a	license update Starting from Build 1.5.5, the API will be licensed under the MIT license. The API version 1.5.4.2 is still under the GPL3 license.	2020-07-23 00:21:47 +02:00
retrooper	dea483d362	removing license to be updated, read next commit	2020-07-23 00:14:05 +02:00
Retrooper	636e246c70	attempt to fix error	2020-07-20 16:09:18 +08:00
Retrooper	0d5c7b5250	uninject exception error handled	2020-07-20 15:39:39 +08:00
Retrooper	1b5f066eb0	small error fix, this build will be 1.5.4.1 release	2020-07-20 14:33:18 +08:00
Retrooper	ffe224c4bf	1.5.4.1 release * PlayerUninjectEvent#isSync now documented * Shutdown bugs fixed(unending shutdown) * Code cleanup & Imports optimized	2020-07-20 14:20:45 +08:00
Retrooper	792fe16124	1.5.4 release, shutdown bug fix attempt	2020-07-19 19:23:31 +08:00
terrarier2111	3c92108c44	Replaced loop	2020-07-16 13:43:29 +02:00
retrooper	3b71327245	Merge pull request #17 from rbuh/patch-2 Someone forgot something -_-	2020-07-16 08:34:31 +02:00
rbuh	6d70978285	Someone forgot something -_- ur welcome bud!	2020-07-15 21:20:10 -04:00
terrarier2111	953ad680ee	Update ClientVersion.java	2020-07-15 17:42:23 +02:00
terrarier2111	765f2fad92	Prepared lookup	2020-07-15 17:23:16 +02:00
terrarier2111	bede734af7	Update ClientVersion.java	2020-07-15 17:22:10 +02:00
retrooper	31853376d6	Merge pull request #14 from terrarier2111/patch-7 Added missing return	2020-07-15 17:14:19 +02:00
terrarier2111	3a100ce325	Added missing return	2020-07-15 16:54:05 +02:00
retrooper	bbb2ef0668	Merge pull request #13 from terrarier2111/patch-6 Fixed stupid bug	2020-07-15 16:33:25 +02:00
terrarier2111	9f697673c0	Fixed stupid bug	2020-07-15 16:28:14 +02:00
retrooper	b1deb8629b	Merge pull request #12 from terrarier2111/patch-5 Finally added AutoResolveClientProtocolVersion	2020-07-15 16:24:41 +02:00
terrarier2111	70d0400c67	Finally added AutoResolveClientProtocolVersion	2020-07-15 16:19:54 +02:00
retrooper	b0c08ce813	Merge pull request #11 from terrarier2111/patch-4 Added autoResolveClientProtocolVersion setting	2020-07-15 16:14:50 +02:00
retrooper	3af91fcac9	Merge pull request #10 from terrarier2111/patch-3 Added Server Protocol Version Mapping	2020-07-15 16:13:40 +02:00
terrarier2111	d1c2fe4169	Update Settings.java	2020-07-15 16:11:34 +02:00
terrarier2111	1900d37c94	Added Server Protocol Version Mapping	2020-07-15 15:37:35 +02:00
retrooper	5d17a2a613	Merge pull request #8 from rbuh/patch-1 Bro wheres 1.7 my guy	2020-07-15 15:21:16 +02:00
rbuh	4a93603614	Bro wheres 1.7 my guy how u forget the most import part!?!?!?!	2020-07-15 08:33:34 -04:00
retrooper	9a1a59f15f	Merge pull request #7 from terrarier2111/patch-1 Update ClientVersion.java	2020-07-15 14:22:54 +02:00
terrarier2111	0c350a3f27	Update ClientVersion.java Changed to correct protocolversion	2020-07-15 13:17:16 +02:00
Retrooper	c3d75f1e8d	1.5.3 Stable release!!!!	2020-07-12 05:08:47 +08:00
Retrooper	b847e53221	1.5.2 pre release	2020-07-12 02:46:52 +08:00
Retrooper	c9570b0ad7	1.5.1 pre release	2020-07-11 18:52:07 +08:00
Retrooper	ee5caaa81c	Started on player infondo not use	2020-07-08 20:21:42 +08:00
Retrooper	a81976b5a5	1.5 pre release, does spam some errors	2020-07-07 18:02:49 +08:00
retrooper	fd32638787	Merge pull request #5 from GoDead/patch-1 Changed from int to byte	2020-07-06 20:36:06 +02:00
GoDead	816cd945f8	Changed from int to byte	2020-07-06 20:05:21 +02:00
retrooper	07f1f5f426	officially updated to GPL3 license	2020-07-06 19:56:21 +02:00
retrooper	8ac124a19e	Merge pull request #4 from retrooper/add-license-1 GPL3 license file added	2020-07-06 19:55:30 +02:00
retrooper	e90116291f	GPL3 license file added	2020-07-06 19:55:02 +02:00
retrooper	2dbb3f08cb	deleted license file, gpl3 applies	2020-07-06 19:53:26 +02:00
retrooper	71c333af5d	about to update license to gpl3	2020-07-06 19:52:56 +02:00
Retrooper	925eca89d4	version is 1.4.2 not 1.4.20	2020-07-06 13:29:11 +08:00
Retrooper	a712245ebe	Updated veraion in pom.xml to 1.4.2	2020-07-06 13:26:48 +08:00
Retrooper	8c15df942d	Merge remote-tracking branch 'origin/master'	2020-07-06 13:13:56 +08:00
Retrooper	6ce4fbd7fc	IDE files removed	2020-07-06 13:13:18 +08:00
Retrooper	3e4fc70442	1.4.1 Release * ...getPlayerUtilities().getPlayerPing(player); deprecated, use getPing(player); * ServerTickEvent deprecated and it's Bukkit task too, will be removed in the next VersionLookupUtils * PacketEvents.getAPI().getSettings().setDefaultServerVersion(version); added Settings the default version will let PacketEvents use the default version if PacketEvents fails to detect your server version. No idea why this happens in mSpigot, but yea.	2020-07-06 13:11:39 +08:00
retrooper	fc91416ab7	atlas credit removed as their file was removed	2020-07-05 21:32:36 +02:00
Retrooper	0f6ee71733	* Now possible to register/unregister multiple listeners in one method call. PacketEvents.getAPI().getEventManager().registerListeners(LISTENER, LISTENER2); PacketEvents.getAPI().getEventManager().unregisterListeners(LISTENER, LISTENER2);	2020-07-05 18:48:53 +08:00
Retrooper	4dafa959c1	* PacketTypeNames.java deleted * WrappedPacketOutEntity added, UNTESTED	2020-07-05 15:05:25 +08:00
Retrooper	66a6c2d8f9	PacketEvents 1.4 Release * Optimization Update, all packet comparisons now done with integer IDs.	2020-07-04 19:01:32 +08:00
OPtimal	b2654e11a3	All is working, 1.3.9 releasing soon ane about to post on spigotmc	2020-07-03 19:05:14 +03:00
OPtimal	e2cfdda9cf	typo when initiating LOOK field in PacketTypeClasses	2020-07-03 17:31:11 +03:00
OPtimal	b5085a8959	tr sel packet clasa nor found on < 1.16 fixed	2020-07-03 17:25:32 +03:00
OPtimal	dccf01220c	FLYING SUBCLASSES NOT FOUND FIX	2020-07-03 17:18:17 +03:00
OPtimal	12dc5b69c0	PacketType.Client.init() is only called after all PacketTypeClasses.Client.* have been initialized	2020-07-03 16:41:23 +03:00
OPtimal	0423b5f335	* Code optimized * Serverbound Packet comparisons are now done with integer ids UNTESTED, do not use this yet	2020-07-03 16:17:46 +03:00
retrooper	a4c37da10e	Merge pull request #3 from LIWKK/patch-1 1.16 enum missing fix	2020-07-01 21:35:16 +02:00
Johannes	de49279aab	1.16 enum missing fix	2020-07-01 22:18:59 +03:00
retrooper	f651ffddf5	BLOCK_PLACE class has been initialized	2020-06-29 15:48:41 +02:00