1.6.1 release

Merge pull request #31 from NikV2/master
Hotfix - Mistake patching
2020-08-28 16:37:26 +02:00 · 2020-08-28 07:37:06 +02:00 · 2020-08-28 03:54:53 +03:00 · 2020-08-28 03:52:50 +03:00 · 2020-08-28 01:57:42 +02:00 · 2020-08-28 02:46:11 +03:00
36 changed files with 799 additions and 138 deletions
@@ -0,0 +1,32 @@
+name: Generate and deploy JavaDocs
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn install
+    - name: List target/apidocs
+      run: ls target/apidocs
+    - name: GitHub Pages
+      uses: crazy-max/ghaction-github-pages@v2.1.2
+      env:
+        GH_PAT: ${{ secrets.GH_PAT }}
+      with:
+        target_branch: javadocs
+        keep_history: true
+        build_dir: target/apidocs
+        commit_message: Update JavaDocs
@@ -0,0 +1,113 @@
+#
+# JetBrains
+#
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+
+#
+# Java
+#
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+#
+# Maven
+#
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="packetevents" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="packetevents" target="8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="viaversion-repo" />
+      <option name="name" value="viaversion-repo" />
+      <option name="url" value="https://repo.viaversion.com" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="funkemunky-releases" />
+      <option name="name" value="funkemunky-releases" />
+      <option name="url" value="https://nexus.funkemunky.cc/content/repositories/releases/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="dmulloy2-repo" />
+      <option name="name" value="dmulloy2-repo" />
+      <option name="url" value="https://repo.dmulloy2.net/nexus/repository/public/" />
+    </remote-repository>
+  </component>
+</project>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
+    </list>
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK" />
+</project>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/packetevents.iml" filepath="$PROJECT_DIR$/packetevents.iml" />
+    </modules>
+  </component>
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
@@ -0,0 +1,52 @@
+<?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" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea/libraries" />
+      <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.8.8:1.8.8" level="project" />
+    <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: 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: 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.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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT" level="project" />
+  </component>
+</module>
@@ -6,7 +6,7 @@

    <groupId>io.github.retrooper</groupId>
    <artifactId>packetevents</artifactId>
-    <version>1.6</version>
+    <version>1.6.1</version>

    <!-- You can build the project with this: "mvn clean compile assembly:single" -->
    <build>
@@ -27,6 +27,18 @@
                    <target>8</target>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>
    <packaging>jar</packaging>
@@ -110,6 +122,5 @@
            <version>1.8.8-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
-
    </dependencies>
 </project>
@@ -13,11 +13,13 @@ import io.github.retrooper.packetevents.packet.PacketType;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
+import io.github.retrooper.packetevents.utils.NMSUtils;
 import io.github.retrooper.packetevents.utils.nms_entityfinder.EntityFinderUtils;
 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.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
@@ -25,6 +27,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;

 public final class PacketEvents implements PacketListener, Listener {
+
    private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI();
    private static final PacketEvents instance = new PacketEvents();
    private static final PacketEventsSettings settings = new PacketEventsSettings();
@@ -33,26 +36,38 @@ public final class PacketEvents implements PacketListener, Listener {

    /**
     * Call this before start()
+     *
+     * Recommended on your onLoad() Bukkit Method
     */
    public static void load() {
        //SERVER VERSION LOADING

-        //Server Version reversed values caching
-        ServerVersion.reversedValues = ServerVersion.reverse(ServerVersion.values());
+        //Server Version loading
+        ServerVersion.load();
+
+        ServerVersion version = ServerVersion.getVersion();
+        WrappedPacket.version = version;
+        PacketEvent.version = version;
+        NMSUtils.version = version;
+        EntityFinderUtils.version = version;
+
+        NMSUtils.load();

        PacketTypeClasses.Client.load();
        PacketTypeClasses.Server.load();
-        ServerVersion version= ServerVersion.getVersion();
-        WrappedPacket.version = version;
-        PacketEvent.version = version;
-        EntityFinderUtils.version = version;
+
+        EntityFinderUtils.load();
+
        WrappedPacket.loadAllWrappers();
+
+        VersionLookupUtils.load();
        ClientVersion.prepareLookUp();
        hasLoaded = true;
    }

    /**
     * Loads PacketEvents if you haven't already, Sets everything up, injects all players
+     * @param pl Plugin instance
     */
    public static void start(final Plugin pl) {
        if (!hasLoaded) {
@@ -104,20 +119,20 @@ public final class PacketEvents implements PacketListener, Listener {
    }

    public static String getHandlerName(final String name) {
-        return "pe-" + getSettings().getIdentifier() + "-" + name;
+        return "pe-" + settings.getIdentifier() + "-" + name;
    }

    public static PacketEventsSettings getSettings() {
        return settings;
    }

-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
    public void onJoin(final PlayerJoinEvent e) {
        getAPI().getPlayerUtils().injectPlayer(e.getPlayer());
-        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion(VersionLookupUtils.getProtocolVersion(e.getPlayer())));
+        getAPI().getPlayerUtils().setClientVersion(e.getPlayer(), ClientVersion.fromProtocolVersion((short) VersionLookupUtils.getProtocolVersion(e.getPlayer())));
    }

-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
    public void onQuit(final PlayerQuitEvent e) {
        getAPI().getPlayerUtils().clearClientVersion(e.getPlayer());
        getAPI().getPlayerUtils().uninjectPlayer(e.getPlayer());
@@ -129,4 +144,4 @@ public final class PacketEvents implements PacketListener, Listener {
        getAPI().getEventManager().callEvent(moveEvent);
        e.setCancelled(moveEvent.isCancelled());
    }
-}
+}
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2020 retrooper
+ */
+
+package io.github.retrooper.packetevents.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * This annotation indicates that something might be unstable.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Beta {
+}
@@ -64,6 +64,4 @@ public final class PacketEventsAPI {
    public EventManager getEventManager() {
        return eventManager;
    }
-
-
-}
+}
@@ -65,7 +65,7 @@ public enum ClientVersion {
        VERSION_LOOKUP.put(737, v_1_16_2);
    }

-    public static ClientVersion fromProtocolVersion(int protocolVersion) {
+    public static ClientVersion fromProtocolVersion(short protocolVersion) {
        if (protocolVersion == -1 && PacketEvents.getSettings().doAutoResolveClientProtocolVersion()) {
            protocolVersion = ServerVersion.getVersion().toProtocolVersion();
        }
@@ -79,8 +79,8 @@ public enum ClientVersion {
    /**
     * Returns if the client's version is more up to date than the argument passed version
     *
-     * @param version
-     * @return
+     * @param version The version to compare to the client's value.
+     * @return True if the supplied version is lower, false if it is equal or higher than the client's version.
     */
    public boolean isHigherThan(final ClientVersion version) {
        if (this == version) return false;
@@ -90,8 +90,8 @@ public enum ClientVersion {
    /**
     * Returns if the client's version is more outdated than the argument passed version
     *
-     * @param version
-     * @return
+     * @param version The version to compare to the client's value.
+     * @return True if the supplied version is higher, false if it is equal or lower than the client's version.
     */
    public boolean isLowerThan(final ClientVersion version) {
        if (this == version) return false;
@@ -10,14 +10,22 @@ import org.bukkit.Bukkit;
 * @author retrooper
 */
 public enum ServerVersion {
-    v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15, v_1_16, v_1_16_1, v_1_16_2,
-    ERROR, EMPTY;
+
+    v_1_7_10, v_1_8, v_1_8_3, v_1_8_4, v_1_8_5, v_1_8_6, v_1_8_7, v_1_8_8,
+    v_1_9, v_1_9_2, v_1_9_4, v_1_10, v_1_10_2, v_1_11, v_1_11_1, v_1_11_2,
+    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,
+    v_1_16_2, ERROR, EMPTY;

    private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
    public static ServerVersion[] reversedValues;
    private static ServerVersion cachedVersion;

-    private static ServerVersion getVers() {
+    public static void load() {
+        reversedValues = ServerVersion.reverse(values());
+    }
+
+    private static ServerVersion getVersionNoCache() {
        for (final ServerVersion val : reversedValues) {
            String valName = val.name().substring(2).replace("_", ".");
            if (Bukkit.getBukkitVersion().contains(valName)) {
@@ -31,7 +39,7 @@ public enum ServerVersion {

    public static ServerVersion getVersion() {
        if (cachedVersion == null) {
-            cachedVersion = getVers();
+            cachedVersion = getVersionNoCache();
        }
        return cachedVersion;
    }
@@ -70,8 +78,8 @@ public enum ServerVersion {
    /**
     * Returns if the current version is more up to date than the argument passed version
     *
-     * @param version
-     * @return
+     * @param version The version to compare to the server's value.
+     * @return True if the supplied version is lower, false if it is equal or higher than the server's version.
     */
    public boolean isHigherThan(final ServerVersion version) {
        if (this == version) return false;
@@ -81,8 +89,8 @@ public enum ServerVersion {
    /**
     * Returns if the current version is more outdated than the argument passed version
     *
-     * @param version
-     * @return
+     * @param version The version to compare to the server's value.
+     * @return True if the supplied version is higher, false if it is equal or lower than the server's version.
     */
    public boolean isLowerThan(final ServerVersion version) {
        if (this == version) return false;
@@ -98,49 +106,73 @@ public enum ServerVersion {
        return false;
    }

-    public int toProtocolVersion() {
-        if (this.equals(ServerVersion.v_1_7_10)) {
-            return 5;
+    /**
+     * Converts the server version to a protocol version.
+     * Recommended to cache.
+     * @return protocol version
+     */
+    public short toProtocolVersion() {
+        switch (this) {
+            case v_1_7_10:
+                return 5;
+            case v_1_8:
+            case v_1_8_3:
+            case v_1_8_4:
+            case v_1_8_5:
+            case v_1_8_6:
+            case v_1_8_7:
+            case v_1_8_8:
+                return 47;
+            case v_1_9:
+                return 107;
+            case v_1_9_2:
+                return 109;
+            case v_1_9_4:
+                return 110;
+            case v_1_10:
+            case v_1_10_2:
+                return 210;
+            case v_1_11:
+                return 315;
+            case v_1_11_1:
+            case v_1_11_2:
+                return 316;
+            case v_1_12:
+                return 335;
+            case v_1_12_1:
+                return 338;
+            case v_1_12_2:
+                return 340;
+            case v_1_13:
+                return 393;
+            case v_1_13_1:
+                return 401;
+            case v_1_13_2:
+                return 404;
+            case v_1_14:
+                return 477;
+            case v_1_14_1:
+                return 480;
+            case v_1_14_2:
+                return 485;
+            case v_1_14_3:
+                return 490;
+            case v_1_14_4:
+                return 498;
+            case v_1_15:
+                return 573;
+            case v_1_15_1:
+                return 575;
+            case v_1_15_2:
+                return 578;
+            case v_1_16:
+                return 735;
+            case v_1_16_1:
+                return 736;
+            case v_1_16_2:
+                return 751;
+            default:
+                return -1;
        }
-        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_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)) {
-            return 735;
-        }
-        if (this.equals(ServerVersion.v_1_16_1)) {
-            return 736;
-        }
-        if (this.equals(ServerVersion.v_1_16_2)) {
-            return 737;
-        }
-        return -1;
    }
-}
+}
@@ -13,7 +13,7 @@ public abstract class PacketEvent {
    /**
     * Timestamp of the packet
     *
-     * @return
+     * @return timestamp in milliseconds
     */
    public long getTimestamp() {
        return timestamp;
@@ -20,7 +20,7 @@ public final class PacketReceiveEvent extends PacketEvent {
    /**
     * Get the player sending the packet
     *
-     * @return
+     * @return player
     */
    public Player getPlayer() {
        return this.player;
@@ -28,7 +28,8 @@ public final class PacketReceiveEvent extends PacketEvent {

    /**
     * Get the packet's name (NMS packet class simple name).
-     * Deprecated, it is recommended not to use this for performance reasons.
+     * @deprecated It is recommended not to use this, it is an expensive method to call.
+     * @return Name of the packet
     */
    @Deprecated
    public String getPacketName() {
@@ -76,7 +77,7 @@ public final class PacketReceiveEvent extends PacketEvent {
    /**
     * Cancel the packet
     *
-     * @param cancelled
+     * @param cancelled boolean
     */
    public void setCancelled(boolean cancelled) {
        this.cancelled = cancelled;
@@ -26,7 +26,8 @@ public final class PacketSendEvent extends PacketEvent {

    /**
     * Get the packet's name (NMS packet class simple name)
-     * Deprecated, it is recommended not to use this for performance reasons.
+     * @deprecated It is recommended not to use this, as it is an expensive function to call.
+     * @return Name of the packet
     */
    @Deprecated
    public String getPacketName() {
@@ -4,8 +4,14 @@
 package io.github.retrooper.packetevents.example;

 import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.annotations.PacketHandler;
 import io.github.retrooper.packetevents.enums.ServerVersion;
 import io.github.retrooper.packetevents.event.PacketListener;
+import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent;
+import io.github.retrooper.packetevents.event.impl.PacketSendEvent;
+import io.github.retrooper.packetevents.packet.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.in.useentity.WrappedPacketInUseEntity;
+import io.github.retrooper.packetevents.packetwrappers.out.chat.WrappedPacketOutChat;
 import org.bukkit.plugin.java.JavaPlugin;

 public class MainExample extends JavaPlugin implements PacketListener {
@@ -17,16 +23,25 @@ public class MainExample extends JavaPlugin implements PacketListener {

    @Override
    public void onEnable() {
-        PacketEvents.getSettings().setIdentifier("packetevents_api");

        PacketEvents.getSettings().setDefaultServerVersion(ServerVersion.v_1_7_10);

+        //ClientVersion cannot be resolved, it is the same as the server's.
+        //The clientversion can only not be resolved if
+        // ViaVersion, ProtocolSuppport, or ProtocolLib isn't present.
+        //ClientVersion might be resolvable if the server version is 1.7.10.
+        PacketEvents.getSettings().setDoAutoResolveClientProtocolVersion(true);
+
+        //Deprecated, as it is no longer needed
+        //PacketEvents.getSettings().setIdentifier("packetevents_api");
+
        PacketEvents.start(this);
-        //PacketEvents.getAPI().getEventManager().registerListener(this);
+        PacketEvents.getAPI().getEventManager().registerListener(this);
    }

    @Override
    public void onDisable() {
        PacketEvents.stop();
    }
+
 }
@@ -35,6 +35,23 @@ public class NettyPacketHandler {
        }
    }

+    public static Future<?> uninjectPlayerAsync(final Player player) {
+        try {
+            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
+            PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
+            if (!uninjectEvent.isCancelled()) {
+                if (v1_7_nettyMode) {
+                    return NettyPacketHandler_7.uninjectPlayerAsync(player);
+                } else {
+                    return NettyPacketHandler_8.uninjectPlayerAsync(player);
+                }
+            }
+        } catch (Exception ignored) {
+
+        }
+        return null;
+    }
+
    public static void uninjectPlayer(final Player player) {
        try {
            final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player);
@@ -68,6 +85,4 @@ public class NettyPacketHandler {
        }
        return null;
    }
-
-
-}
+}
@@ -41,4 +41,10 @@ final class NettyPacketHandler_7 {
        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
    }

-}
+    public static Future<?> uninjectPlayerAsync(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        return channel.eventLoop().submit(() -> {
+            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+        });
+    }
+}
@@ -40,4 +40,11 @@ final class NettyPacketHandler_8 {
        final Channel channel = (Channel) NMSUtils.getChannel(player);
        channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
    }
-}
+
+    public static Future<?> uninjectPlayerAsync(final Player player) {
+        final Channel channel = (Channel) NMSUtils.getChannel(player);
+        return channel.eventLoop().submit(() -> {
+            channel.pipeline().remove(PacketEvents.getHandlerName(player.getName()));
+        });
+    }
+}
@@ -46,6 +46,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {

    /**
     * This will return null if the server version is not available in 1.16.x and above
+     *
+     * @return Whether the player is vulnerable to damage or not.
     */
    @Deprecated
    @Nullable
@@ -59,6 +61,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {

    /**
     * This will return null if the server version is not available in 1.16.x and above
+     *
+     * @return Whether or not the player can fly.
     */
    @Deprecated
    @Nullable
@@ -68,6 +72,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {

    /**
     * This will return null if the server version is not available in 1.16.x and above
+     *
+     * @return Whether or not the player can break blocks instantly.
     */
    @Deprecated
    @Nullable
@@ -77,6 +83,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {

    /**
     * This will return null if the server version is not available in 1.16.x and above
+     *
+     * @return The speed at which the player can fly, as a float.
     */
    @Deprecated
    @Nullable
@@ -86,6 +94,8 @@ public final class WrappedPacketInAbilities extends WrappedPacket {

    /**
     * This will return null if the server version is not available in 1.16.x and above
+     *
+     * @return The speed at which the player can walk, as a float.
     */
    @Deprecated
    @Nullable
@@ -39,8 +39,8 @@ public final class WrappedPacketInKeepAlive extends WrappedPacket {
    }

    /**
-     * 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
+     * Optionally Cast this long to an integer if you are using 1.7.10 -&gt; 1.12.2!
+     * In 1.13.2 -&gt; 1.16.1 a long is sent
     *
     * @return response is
     */
@@ -111,6 +111,8 @@ public class WrappedPacketInSettings extends WrappedPacket {
     * It is possible for some keys to not exist.
     * If that is the case, the server version is 1.7.10.
     * 1.7.10 only sends the cape skin part.
+     *
+     * @return A map associating skin parts with whether or not they are enabled.
     */
    @Nullable
    public HashMap<DisplayedSkinPart, Boolean> getDisplayedSkinPartsMap() {
@@ -121,8 +123,8 @@ public class WrappedPacketInSettings extends WrappedPacket {
     * On 1.7.10, some skin parts will default to 'false' as 1.7.10
     * only sends the 'cape' skin part.
     *
-     * @param part
-     * @return
+     * @param part The skin part to check the status of.
+     * @return True if the specified skin part is enabled, otherwise false.
     */
    public boolean isDisplaySkinPartEnabled(DisplayedSkinPart part) {
        //1.7.10, we will default the other skin parts to return false.
@@ -3,6 +3,7 @@
 */
 package io.github.retrooper.packetevents.packetwrappers.out.chat;

+import io.github.retrooper.packetevents.annotations.Beta;
 import io.github.retrooper.packetevents.packet.PacketTypeClasses;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
 import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket;
@@ -11,21 +12,54 @@ import io.github.retrooper.packetevents.utils.NMSUtils;

 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.UUID;

+/**
+ * This wrapper MIGHT not be stable
+ */
+@Beta
 public final class WrappedPacketOutChat extends WrappedPacket implements Sendable {
    private static Constructor<?> chatClassConstructor;
-    private static Class<?> packetClass, iChatBaseComponentClass, chatSerializerClass;
+    private static Class<?> packetClass, iChatBaseComponentClass, chatSerializerClass, chatMessageTypeEnum;
+    private static Method chatMessageTypeCreatorMethod;
+    //0 = IChatBaseComponent, Byte
+    //1 = IChatBaseComponent, Int
+    //2 = IChatBaseComponent, ChatMessageType
+    //3 = IChatBaseComponent, ChatMessageType, UUID
+    private static byte constructorMode;
+
+    //0 = Byte
+    //1 = Byte, Boolean
+    private static byte chatTypeMessageEnumConstructorMode;
+    private static final HashMap<ChatPosition, Byte> cachedChatPositions = new HashMap<ChatPosition, Byte>();
+    private static final HashMap<Byte, ChatPosition> cachedChatPositionIntegers = new HashMap<Byte, ChatPosition>();
+    private static final HashMap<String, Byte> cachedChatMessageTypeIntegers = new HashMap<String, Byte>();
    private String message;
+    private ChatPosition chatPosition;
+    private UUID uuid;

    public WrappedPacketOutChat(final Object packet) {
        super(packet);
    }

-    public WrappedPacketOutChat(final String message) {
-        super();
-        this.message = "{\"text\": \"" + message + "\"}";
+    public WrappedPacketOutChat(String message, UUID uuid) {
+        this(message, ChatPosition.CHAT, uuid);
    }

+    public WrappedPacketOutChat(String message, ChatPosition chatPosition, UUID uuid) {
+        super();
+        this.uuid = uuid;
+        this.message = message;
+        this.chatPosition = chatPosition;
+    }
+
+    public enum ChatPosition {
+        CHAT, SYSTEM_MESSAGE, GAME_INFO
+    }
+
+
    public static void load() {
        try {
            packetClass = PacketTypeClasses.Server.CHAT;
@@ -42,13 +76,62 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
            chatSerializerClass = Reflection.getSubClass(iChatBaseComponentClass, "ChatSerializer");
        }

+
+        boolean isVeryOutdated = false;
        try {
-            chatClassConstructor = packetClass.getConstructor(iChatBaseComponentClass);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
+            chatMessageTypeEnum = NMSUtils.getNMSClass("ChatMessageType");
+        } catch (ClassNotFoundException e) {
+            isVeryOutdated = true;
        }

+        if (!isVeryOutdated) {
+            chatMessageTypeCreatorMethod = Reflection.getMethod(chatMessageTypeEnum, 0, byte.class);

+            try {
+                chatClassConstructor = packetClass.getConstructor(iChatBaseComponentClass, chatMessageTypeEnum);
+                constructorMode = 2;
+            } catch (NoSuchMethodException e) {
+                //Just a much newer version(1.16.x and above right now)
+                try {
+                    chatClassConstructor = packetClass.getConstructor(iChatBaseComponentClass, chatMessageTypeEnum, UUID.class);
+                    constructorMode = 3;
+                } catch (NoSuchMethodException e2) {
+                    //Failed to resolve the constructor
+                    e2.printStackTrace();
+                }
+            }
+        } else {
+            try {
+                chatClassConstructor = packetClass.getConstructor(iChatBaseComponentClass, byte.class);
+                constructorMode = 0;
+            } catch (NoSuchMethodException e) {
+                //That is fine, they are most likely on an older version.
+                try {
+                    chatClassConstructor = packetClass.getConstructor(iChatBaseComponentClass, int.class);
+                    constructorMode = 1;
+                } catch (NoSuchMethodException e2) {
+                    e2.printStackTrace();
+                }
+            }
+        }
+
+        cachedChatPositions.put(ChatPosition.CHAT, (byte) 0);
+        cachedChatPositions.put(ChatPosition.SYSTEM_MESSAGE, (byte) 1);
+        cachedChatPositions.put(ChatPosition.GAME_INFO, (byte) 2);
+
+        cachedChatPositionIntegers.put((byte) 0, ChatPosition.CHAT);
+        cachedChatPositionIntegers.put((byte) 1, ChatPosition.SYSTEM_MESSAGE);
+        cachedChatPositionIntegers.put((byte) 2, ChatPosition.GAME_INFO);
+
+
+        cachedChatMessageTypeIntegers.put("CHAT", (byte) 0);
+        cachedChatMessageTypeIntegers.put("SYSTEM", (byte) 1);
+        cachedChatMessageTypeIntegers.put("GAME_INFO", (byte) 2);
+
+    }
+
+    public static String fromStringToJSON(String message) {
+        return "{\"text\": \"" + "use entity action name: " + message + "\"}";
    }

    public static String toStringFromIChatBaseComponent(Object obj) {
@@ -78,6 +161,22 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl
            final Object contentString = Reflection.getMethod(iChatBaseComponentClass, String.class, 0).invoke(iChatBaseObj);

            this.message = contentString.toString();
+
+            byte chatPosInteger = 0;
+            switch (constructorMode) {
+                case 0:
+                    chatPosInteger = Reflection.getField(packetClass, byte.class, 0).getByte(packet);
+                    break;
+                case 1:
+                    chatPosInteger = (byte) Reflection.getField(packetClass, int.class, 0).getInt(packet);
+                    break;
+                case 2:
+                case 3:
+                    Object chatTypeEnumInstance = Reflection.getField(packetClass, chatMessageTypeEnum, 0).get(packet);
+                    chatPosInteger = cachedChatMessageTypeIntegers.get(chatTypeEnumInstance.toString());
+                    break;
+            }
+            this.chatPosition = cachedChatPositionIntegers.get(chatPosInteger);
        } catch (IllegalAccessException | InvocationTargetException e) {
            e.printStackTrace();
        }
@@ -85,16 +184,64 @@ public final class WrappedPacketOutChat extends WrappedPacket implements Sendabl

    @Override
    public Object asNMSPacket() {
-        try {
-            return chatClassConstructor.newInstance(toIChatBaseComponent(this.message));
-        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            e.printStackTrace();
+        int integerChatPos = cachedChatPositions.get(chatPosition);
+        Object chatMessageTypeInstance = null;
+        if (chatMessageTypeEnum != null) {
+            if (chatTypeMessageEnumConstructorMode == 0) {
+                try {
+                    chatMessageTypeInstance = chatMessageTypeCreatorMethod.invoke(null, (byte) integerChatPos);
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+            } else if (chatTypeMessageEnumConstructorMode == 1) {
+                try {
+                    chatMessageTypeInstance = chatMessageTypeCreatorMethod.invoke(null, (byte) integerChatPos);
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        switch (constructorMode) {
+            case 0:
+                try {
+                    return chatClassConstructor.newInstance(toIChatBaseComponent(this.message), (byte) integerChatPos);
+                } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 1:
+                try {
+                    return chatClassConstructor.newInstance(toIChatBaseComponent(this.message), integerChatPos);
+                } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 2:
+                try {
+                    return chatClassConstructor.newInstance(toIChatBaseComponent(this.message), chatMessageTypeInstance);
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 3:
+                try {
+                    return chatClassConstructor.newInstance(toIChatBaseComponent(this.message), chatMessageTypeInstance, uuid);
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+                break;
        }
-
        return null;
    }

    public String getMessage() {
        return this.message;
    }
+
+    public ChatPosition getChatPosition() {
+        if(this.chatPosition == null) {
+            this.chatPosition = ChatPosition.CHAT;
+        }
+        return this.chatPosition;
+    }
 }
@@ -36,7 +36,7 @@ public final class WrappedPacketOutEntityVelocity extends WrappedPacket implemen

    /**
     * Velocity Constructor parameter types:
-     * 1.7.10->1.13.2 use int, double, double, double style,
+     * 1.7.10 -&gt; 1.13.2 use int, double, double, double style,
     * 1.14+ use int, Vec3D style
     */
    public static void load() {
@@ -62,8 +62,8 @@ public class WrappedPacketOutKeepAlive extends WrappedPacket implements Sendable
    }

    /**
-     * You can cast this long to an integer if you are using 1.7.10->1.12.2!
-     * In 1.13.2->1.16.2 a long is sent
+     * You can cast this long to an integer if you are using 1.7.10 -&gt; 1.12.2!
+     * In 1.13.2 -&gt; 1.16.2 a long is sent
     *
     * @return Keep Alive ID
     */
@@ -23,9 +23,9 @@ public final class WrappedPacketOutUpdateHealth extends WrappedPacket implements
    /**
     * See https://wiki.vg/Protocol#Update_Health
     *
-     * @param health
-     * @param food
-     * @param foodSaturation
+     * @param health 0 or less = dead, 20 = full HP
+     * @param food 0–20
+     * @param foodSaturation Seems to vary from 0.0 to 5.0 in integer increments
     */
    public WrappedPacketOutUpdateHealth(final float health, final int food, final float foodSaturation) {
        super();
@@ -5,10 +5,14 @@ package io.github.retrooper.packetevents.settings;

 import io.github.retrooper.packetevents.enums.ServerVersion;

+import java.util.Random;
+
 public class PacketEventsSettings {
+
    private ServerVersion defaultServerVersion;
    private String identifier = "";
    private boolean autoResolveClientProtocolVersion;
+    private boolean uninjectAsync = false;

    /**
     * If PacketEvents fails to detect your server version, it will use the recommended version
@@ -16,28 +20,50 @@ public class PacketEventsSettings {
     * @return Recommended version
     */
    public ServerVersion getDefaultServerVersion() {
-        return defaultServerVersion;
+        return this.defaultServerVersion;
    }

    /**
     * Set the default version
     *
-     * @param version
+     * @param version ServerVersion
     */
    public void setDefaultServerVersion(final ServerVersion version) {
-        defaultServerVersion = version;
+        this.defaultServerVersion = version;
    }

+    /**
+     * The identifier is a unique string that is used to generate a player's handler name.
+     * Two plugins cannot have the same handler name.
+     * If you manually set the identifier using its setter '#setIdentifier(String)'.
+     * We will use that identifier to generate each player's handler name.
+     * If you do not set the identifier manually, we automatically generate one for you.
+     * @return stored identifier or new generated identifier
+     */
    public String getIdentifier() {
-        return identifier;
+        if (this.identifier.isEmpty()) {
+            String alphabet = "abcdefghijklmnopqrstuvwxyz";
+            StringBuilder sb = new StringBuilder();
+            Random random = new Random();
+            while (sb.length() < 13) {
+                int index = (int) (random.nextFloat() * alphabet.length());
+                sb.append(alphabet.charAt(index));
+            }
+
+            this.identifier = sb.toString();
+        }
+        return this.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
+     * If another present plugin uses the same Identifier, It will cause incompatibilities.
     *
-     * @param identifier
+     * @param identifier Unique string
+     * @deprecated This method is deprecated as you no longer need to set an identifier,
+     * a unique identifier is already automatically generated for you.
     */
+    @Deprecated
    public void setIdentifier(final String identifier) {
        this.identifier = identifier;
    }
@@ -48,12 +74,26 @@ public class PacketEventsSettings {

    /**
     * If PacketEvents fails to detect a client's version
-     * Should it assume that the client is using the same version that the server is?
-     * Returns ACCESS_FAILURE if false
-     *
-     * @param autoResolveClientProtocolVersion
+     * (when ViaVersion, ProtocolLib or ProtocolSupport can't be found on the server),
+     * should it assume that the client is using the same version as the server?
+     * Returns ACCESS_FAILURE if this is set to FALSE(default value is false).
+     * @param autoResolveClientProtocolVersion boolean
     */
    public void setDoAutoResolveClientProtocolVersion(boolean autoResolveClientProtocolVersion) {
        this.autoResolveClientProtocolVersion = autoResolveClientProtocolVersion;
    }
-}
+
+    /**
+     * Would you like PacketEvents to Uninject players Asynchronously?
+     * WARNING! This might make reloading unsupported
+     *
+     * @param uninjectAsync boolean
+     */
+    public void setUninjectAsync(boolean uninjectAsync) {
+        this.uninjectAsync = uninjectAsync;
+    }
+
+    public boolean isUninjectAsync() {
+        return this.uninjectAsync;
+    }
+}
@@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

 public final class NMSUtils {
-    private static final ServerVersion version = ServerVersion.getVersion();
+    public static ServerVersion version;
    private static final String nmsDir = ServerVersion.getNMSDirectory();
    private static final String obcDir = ServerVersion.getOBCDirectory();
    public static String nettyPrefix;
@@ -29,7 +29,7 @@ public final class NMSUtils {
    private static Method getCraftWorldHandleMethod, getServerConnection, getCraftPlayerHandle, getCraftEntityHandle, sendPacketMethod, asBukkitCopy;
    private static Field entityPlayerPingField, playerConnectionField;

-    static {
+    public static void load() {
        try {
            nettyPrefix = "io.netty";
            Class.forName("io.netty.channel.Channel");
@@ -191,13 +191,8 @@ public final class NMSUtils {
        return null;
    }

-    public static boolean is_1_8() {
-        return version.isHigherThan(ServerVersion.v_1_7_10)
-                && version.isLowerThan(ServerVersion.v_1_9);
-    }
-
    public static void sendSendableWrapper(final Player player, final Sendable sendable) {
-        sendNMSPacket(player, sendable.asNMSPacket());
+        NMSUtils.sendNMSPacket(player, sendable.asNMSPacket());
    }

    public static void sendNMSPacket(final Player player, final Object nmsPacket) {
@@ -6,14 +6,18 @@ package io.github.retrooper.packetevents.utils.api;
 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.handler.NettyPacketHandler;
 import io.github.retrooper.packetevents.packetwrappers.Sendable;
+import io.github.retrooper.packetevents.settings.PacketEventsSettings;
 import io.github.retrooper.packetevents.utils.NMSUtils;
+import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils;
 import org.bukkit.entity.Player;

 import java.util.HashMap;
 import java.util.UUID;

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

    public int getPing(final Player player) {
        return NMSUtils.getPlayerPing(player);
@@ -23,6 +27,10 @@ public final class PlayerUtils {
        return clientVersionsMap.get(uuid);
    }

+    public int getProtocolVersion(Player player) {
+        return VersionLookupUtils.getProtocolVersion(player);
+    }
+
    public ClientVersion getClientVersion(final Player player) {
        return getClientVersion(player.getUniqueId());
    }
@@ -48,10 +56,18 @@ public final class PlayerUtils {
    }

    public void uninjectPlayer(final Player player) {
-        NettyPacketHandler.uninjectPlayer(player);
+        if (settings.isUninjectAsync()) {
+            NettyPacketHandler.uninjectPlayerAsync(player);
+        } else {
+            NettyPacketHandler.uninjectPlayer(player);
+        }
    }

    public void sendPacket(final Player player, final Sendable sendable) {
        NMSUtils.sendSendableWrapper(player, sendable);
    }
-}
+
+    public void sendNMSPacket(final Player player, Object nmsPacket) {
+        NMSUtils.sendNMSPacket(player, nmsPacket);
+    }
+}
@@ -59,6 +59,10 @@ public final class EntityFinderUtils {
        if (world == null) {
            return null;
        }
+        else if(craftWorldClass == null) {
+            System.out.println("Craft World class is null wtf");
+            return null;
+        }
        Object craftWorld = craftWorldClass.cast(world);

        Object worldServer = null;
@@ -87,7 +91,7 @@ public final class EntityFinderUtils {

    /**
     * This is the name of the method that returns the NMS entity when you pass in its ID.
-     * On 1.8->1.8.8 the name is called 'a', on 1.7.10 & 1.9+ the name is called 'getEntity'.
+     * On 1.8-1.8.8 the function name is called 'a', on 1.7.10 and 1.9 and above the name is called 'getEntity'.
     * @return entity by ID method name
     */
    public static String getEntityByIDMethodName() {
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2020 retrooper
+ */
+
+package io.github.retrooper.packetevents.utils.versionlookup;
+
+import org.bukkit.entity.Player;
+
+public class ProtocolVersionAccessor_v_1_7 {
+    public static int getProtocolVersion(Player player) {
+        net.minecraft.server.v1_7_R4.EntityPlayer entityPlayer = ((org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer) player).getHandle();
+        return entityPlayer.playerConnection.networkManager.getVersion();
+    }
+}
@@ -1,28 +1,46 @@
-/**
+/*
 * Copyright (c) 2020 retrooper
 */
 package io.github.retrooper.packetevents.utils.versionlookup;

+import io.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.enums.ServerVersion;
 import org.bukkit.entity.Player;

 public class VersionLookupUtils {
+
+    private static byte protocolAccessMode;
+
+    public static void load() {
+        protocolAccessMode = (byte) (ViaUtils.isAvailable() ?
+                0 : ProtocolSupportUtils.isAvailable() ?
+                1 : ProtocolLibUtils.isAvailable() ?
+                2 : PacketEvents.getAPI().getServerUtils().getVersion() == ServerVersion.v_1_7_10 ?
+                3 : -1);
+
+    }
+
    /**
     * If ViaVersion is present, we get the protocol version with the ViaVersion API.
     * If ProtocolSupport is present, we get the protocol version with the ProtocolSupport API.
     * If ProtocolLib is present, we get the protocol version with the ProtocolLib API.
     * Otherwise return -1
     *
-     * @param player
+     * @param player target player
     * @return protocol version of the player if ViaVersion or ProtocolSupport or ProtocolLib is present. Otherwise -1
     */
    public static int getProtocolVersion(final Player player) {
-        if (ViaUtils.isAvailable()) {
-            return ViaUtils.getProtocolVersion(player);
-        } else if (ProtocolSupportUtils.isAvailable()) {
-            return ProtocolSupportUtils.getProtocolVersion(player);
-        } else if (ProtocolLibUtils.isAvailable()) {
-            return ProtocolLibUtils.getProtocolVersion(player);
+        switch(protocolAccessMode) {
+            case 0:
+                return ViaUtils.getProtocolVersion(player);
+            case 1:
+                return ProtocolSupportUtils.getProtocolVersion(player);
+            case 2:
+                return ProtocolLibUtils.getProtocolVersion(player);
+            case 3:
+                return ProtocolVersionAccessor_v_1_7.getProtocolVersion(player);
+            default:
+                return -1;
        }
-        return -1;
    }
 }
Author	SHA1	Message	Date
retrooper	4799fb67c4	1.6.1 release	2020-08-28 16:37:26 +02:00
retrooper	8c1cd4b824	Merge pull request #31 from NikV2/master Hotfix - Mistake patching	2020-08-28 07:37:06 +02:00
Nik	50a09de212	Sorry i just can't watch it be like that:") IT HURTS	2020-08-28 03:54:53 +03:00
Nik	e66710f5ed	commit	2020-08-28 03:52:50 +03:00
retrooper	33131f4fcd	Merge pull request #30 from NikV2/master Uninjections async are now configurable in the settings(can cause reload bugs), I’d rather have setIdentifier() deprecated for one patch version(1.6.1) then in 1.16.2 we remove it completely, basically if then user doesn’t set identifier to anything, we will generate a random one, low priority for injecting and uninjecting players in PacketEvents class.	2020-08-28 01:57:42 +02:00
Nik	9834787279	commit	2020-08-28 02:46:11 +03:00
retrooper	227b569138	Merge pull request #29 from SamJakob/patch-3 Remove committer from javadoc workflow	2020-08-28 01:37:32 +02:00
SamJakob	ad1a8a3dba	Remove committer from workflow	2020-08-28 00:32:56 +01:00
Nik	262c470031	commit	2020-08-28 02:22:10 +03:00
retrooper	4c9b9be23f	Merge pull request #27 from SamJakob/patch-2 Use GitHub Actions to deploy JavaDocs to GH Pages	2020-08-28 01:14:31 +02:00
SamJakob	d1c04d39d2	Use GitHub Actions to deploy JavaDocs to GH Pages	2020-08-28 00:13:58 +01:00
retrooper	afbe7b44b6	Merge pull request #26 from SamJakob/master Add JavaDoc to build (and cleanup)	2020-08-28 00:38:39 +02:00
SamJakob	f76f1687fb	Add JavaDoc to build and fix JavaDoc HTML entities, add .gitignore (cleanup)	2020-08-27 23:32:37 +01:00