Legacy support for old packet structures

.github-actions/maven/deployment.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>sonatype-ossrh</id>
+            <username>${env.SONATYPE_OSSRH_DEPLOYER}</username>
+            <password>${env.SONATYPE_OSSRH_TOKEN}</password>
+        </server>
+    </servers>
+</settings>

.github/workflows/deploy.yml

@@ -0,0 +1,35 @@
+name: Deploy
+
+on: [ push, workflow_dispatch ]
+
+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: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Deploy
+        env:
+          SONATYPE_OSSRH_DEPLOYER: ${{ secrets.SONATYPE_OSSRH_DEPLOYER }}
+          SONATYPE_OSSRH_TOKEN: ${{ secrets.SONATYPE_OSSRH_TOKEN }}
+        run: mvn -B -f ./PacketWrapper/pom.xml deploy -s ./.github-actions/maven/deployment.xml
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: plugin
+          path: PacketWrapper/target/PacketWrapper.jar

PacketWrapper/pom.xml

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.comphenix.packetwrapper</groupId>
-  <artifactId>PacketWrapper</artifactId>
-  <version>1.15.2-R0.1-SNAPSHOT</version>
+  <groupId>ru.progrm-jarvis.minecraft</groupId>
+  <artifactId>packet-wrapper</artifactId>
+  <version>1.16.4-SNAPSHOT</version>
 
   <name>PacketWrapper</name>
 
@@ -27,28 +27,32 @@
   </repositories>
 
   <distributionManagement>
-    <repository>
-      <id>dmulloy2-repo</id>
-      <url>https://repo.dmulloy2.net/content/repositories/releases/</url>
-    </repository>
     <snapshotRepository>
-      <id>dmulloy2-repo</id>
-      <url>https://repo.dmulloy2.net/content/repositories/snapshots/</url>
+      <id>sonatype-ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
 
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>${project.version}</version>
+      <version>1.16.4-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
       <artifactId>ProtocolLib</artifactId>
-      <version>4.5.1-SNAPSHOT</version>
+      <version>4.7.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>20.1.0</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
 
     <!-- Testing dependencies -->

PacketWrapper/src/main/java/com/comphenix/packetwrapper/AbstractPacket.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland
@@ -18,18 +18,30 @@
  */
 package com.comphenix.packetwrapper;
 
-import java.lang.reflect.InvocationTargetException;
-
-import org.bukkit.entity.Player;
-
+import com.comphenix.packetwrapper.util.VersionUtil;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.base.Objects;
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.InvocationTargetException;
 
 public abstract class AbstractPacket {
 	// The packet we will be modifying
-	protected PacketContainer handle;
+	protected final PacketContainer handle;
+	/*
+	 * Note that the following primitive fields are all `static final`
+	 * so that JIT can inline them and even perform static-folding
+	 */
+	protected static final int MAJOR_VERSION = VersionUtil.getMajorVersion();
+	protected static final int MINOR_VERSION = VersionUtil.getMinorVersion();
+	protected static final int VERSION_BUILD = VersionUtil.getBuildVersion();
+
+	static {
+		if (MAJOR_VERSION != 1) throw new Error("Major Minecraft version " + MAJOR_VERSION + " is unsupported");
+	}
 
 	/**
 	 * Constructs a new strongly typed wrapper for the given packet.
@@ -57,6 +69,10 @@ public PacketContainer getHandle() {
 		return handle;
 	}
 
+	protected static ProtocolManager protocolManager() {
+		return ProtocolManagerHolder.PROTOCOL_MANAGER;
+	}
+
 	/**
 	 * Send the current packet to the given receiver.
 	 * 
@@ -65,8 +81,7 @@ public PacketContainer getHandle() {
 	 */
 	public void sendPacket(Player receiver) {
 		try {
-			ProtocolLibrary.getProtocolManager().sendServerPacket(receiver,
-					getHandle());
+			protocolManager().sendServerPacket(receiver, getHandle());
 		} catch (InvocationTargetException e) {
 			throw new RuntimeException("Cannot send packet.", e);
 		}
@@ -76,7 +91,7 @@ public void sendPacket(Player receiver) {
 	 * Send the current packet to all online players.
 	 */
 	public void broadcastPacket() {
-		ProtocolLibrary.getProtocolManager().broadcastServerPacket(getHandle());
+		protocolManager().broadcastServerPacket(getHandle());
 	}
 
 	/**
@@ -89,12 +104,7 @@ public void broadcastPacket() {
 	 */
 	@Deprecated
 	public void recievePacket(Player sender) {
-		try {
-			ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
-					getHandle());
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot recieve packet.", e);
-		}
+		receivePacket(sender);
 	}
 
 	/**
@@ -105,10 +115,18 @@ public void recievePacket(Player sender) {
 	 */
 	public void receivePacket(Player sender) {
 		try {
-			ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
-					getHandle());
+			protocolManager().recieveClientPacket(sender, getHandle());
 		} catch (Exception e) {
 			throw new RuntimeException("Cannot receive packet.", e);
 		}
 	}
+
+	private static final class ProtocolManagerHolder {
+		private static final ProtocolManager PROTOCOL_MANAGER = ProtocolLibrary.getProtocolManager();
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getName() + "{handle=" + handle + '}';
+	}
 }

PacketWrapper/src/main/java/com/comphenix/packetwrapper/ChunkPacketProcessor.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland
@@ -187,21 +187,22 @@ public void processBiomeArray(Location origin, byte[] data,
 	protected static final int CHUNK_SEGMENTS = 16;
 	protected static final int NIBBLES_REQUIRED = 4;
 
+	public static final int BLOCK_ID_LENGTH = 4096;
+
 	/**Misspelled.
 	 * @see #BLOCK_ID_LENGTH
 	 */
 	@Deprecated
-	public static final int BLOCK_ID_LENGHT = 4096;
+	public static final int BLOCK_ID_LENGHT = BLOCK_ID_LENGTH;
 
-	public static final int BLOCK_ID_LENGTH = 4096;
+	public static final int DATA_LENGTH = 2048;
 
     /**Misspelled.
      * @see #DATA_LENGTH
      */
 	@Deprecated
-	public static final int DATA_LENGHT = 2048;
+	public static final int DATA_LENGHT = DATA_LENGTH;
 
-    public static final int DATA_LENGTH = 2048;
 	public static final int BIOME_ARRAY_LENGTH = 256;
 
 	private int chunkX;

PacketWrapper/src/main/java/com/comphenix/packetwrapper/ConversionUtil.java

@@ -0,0 +1,64 @@
+/*
+ * PacketWrapper - ProtocolLib wrappers for Minecraft packets
+ * Copyright (C) dmulloy2 <http://dmulloy2.net>
+ * Copyright (C) Kristian S. Strangeland
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.comphenix.packetwrapper;
+
+/**
+ * Faster conversions based on those used by Minecraft server which are required for packet dada conversions.
+ */
+public final class ConversionUtil {
+
+    private ConversionUtil() {
+        throw new IllegalStateException("No instances of ConversionUtil for you");
+    }
+
+    /**
+     * Performs a fast flooring operation on a double.
+     *
+     * @param number number to floor to int
+     * @return number floored
+     */
+    public static int floor(double number) {
+        final int intNumber;
+        return number < (double) (intNumber = (int) number) ? intNumber - 1 : intNumber;
+    }
+
+    /**
+     * Performs a fast flooring operation on a float.
+     *
+     * @param number number to floor to int
+     * @return number floored
+     */
+    public static int floor(float number) {
+        final int intNumber;
+        return number < (float) (intNumber = (int) number) ? intNumber - 1 : intNumber;
+    }
+
+    /**
+     * Fits the specified number between the given bounds.
+     *
+     * @param number number to fit between the other two
+     * @param min minimal allowed number
+     * @param max maximal allowed number
+     * @return number fitting between the specified ones
+     */
+    public static double fitBetween(final double number, final double min, final double max) {
+        final int intNumber;
+        return number < (double) (intNumber = (int) number) ? intNumber - 1 : intNumber;
+    }
+}

PacketWrapper/src/main/java/com/comphenix/packetwrapper/PacketWrapper.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland

PacketWrapper/src/main/java/com/comphenix/packetwrapper/WrapperHandshakingClientSetProtocol.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland
@@ -23,8 +23,7 @@
 import com.comphenix.protocol.events.PacketContainer;
 
 public class WrapperHandshakingClientSetProtocol extends AbstractPacket {
-	public static final PacketType TYPE =
-			PacketType.Handshake.Client.SET_PROTOCOL;
+	public static final PacketType TYPE = PacketType.Handshake.Client.SET_PROTOCOL;
 
 	public WrapperHandshakingClientSetProtocol() {
 		super(new PacketContainer(TYPE), TYPE);

PacketWrapper/src/main/java/com/comphenix/packetwrapper/WrapperLoginClientCustomPayload.java

@@ -1,20 +1,20 @@
-/**
- * This file is part of PacketWrapper.
- * Copyright (C) 2012-2015 Kristian S. Strangeland
- * Copyright (C) 2015 dmulloy2
+/*
+ * PacketWrapper - ProtocolLib wrappers for Minecraft packets
+ * Copyright (C) dmulloy2 <http://dmulloy2.net>
+ * Copyright (C) Kristian S. Strangeland
  *
- * PacketWrapper is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * PacketWrapper is distributed in the hope that it will be useful,
+ * 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 Lesser General Public License
- * along with PacketWrapper.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.comphenix.packetwrapper;
 

PacketWrapper/src/main/java/com/comphenix/packetwrapper/WrapperLoginClientEncryptionBegin.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland
@@ -22,8 +22,7 @@
 import com.comphenix.protocol.events.PacketContainer;
 
 public class WrapperLoginClientEncryptionBegin extends AbstractPacket {
-	public static final PacketType TYPE =
-			PacketType.Login.Client.ENCRYPTION_BEGIN;
+	public static final PacketType TYPE = PacketType.Login.Client.ENCRYPTION_BEGIN;
 
 	public WrapperLoginClientEncryptionBegin() {
 		super(new PacketContainer(TYPE), TYPE);

PacketWrapper/src/main/java/com/comphenix/packetwrapper/WrapperLoginClientStart.java

@@ -1,4 +1,4 @@
-/**
+/*
  * PacketWrapper - ProtocolLib wrappers for Minecraft packets
  * Copyright (C) dmulloy2 <http://dmulloy2.net>
  * Copyright (C) Kristian S. Strangeland