From cdc9ebf72de8dc1bf77fde41c5ee34667ed145f3 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sun, 9 May 2021 03:56:26 -0400
Subject: [PATCH] Fix merge issues

---
 .../com/velocitypowered/api/proxy/connection/Player.java    | 6 +++---
 native/build.gradle                                         | 4 ++--
 .../pipeline/MinecraftCompressorAndLengthEncoder.java       | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java b/api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java
index 9aa7daf70..f08131743 100644
--- a/api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java
+++ b/api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java
@@ -9,9 +9,9 @@ package com.velocitypowered.api.proxy.connection;
 
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.player.PlayerResourcePackStatusEvent;
-import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
+import com.velocitypowered.api.proxy.messages.PluginChannelId;
 import com.velocitypowered.api.proxy.player.ClientSettings;
 import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
 import com.velocitypowered.api.proxy.player.TabList;
@@ -145,10 +145,10 @@ public interface Player extends CommandSource, Identified, InboundConnection,
    * is connected to.</strong> You should only use this method if you are trying to communicate
    * with a mod that is installed on the player's client. To send a plugin message to the server
    * from the player, you should use the equivalent method on the instance returned by
-   * {@link #getCurrentServer()}.
+   * {@link #connectedServer()}.
    *
    * @inheritDoc
    */
   @Override
-  boolean sendPluginMessage(ChannelIdentifier identifier, byte[] data);
+  boolean sendPluginMessage(PluginChannelId identifier, byte[] data);
 }
diff --git a/native/build.gradle b/native/build.gradle
index 03f7f2423..b58547459 100644
--- a/native/build.gradle
+++ b/native/build.gradle
@@ -9,8 +9,8 @@ apply from: '../gradle/checkstyle.gradle'
 apply from: '../gradle/publish.gradle'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 license {
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java b/proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java
index 28d005161..e174250db 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.velocitypowered.proxy.protocol.netty;
+package com.velocitypowered.proxy.network.pipeline;
 
-import static com.velocitypowered.proxy.protocol.netty.MinecraftVarintLengthEncoder.IS_JAVA_CIPHER;
+import static com.velocitypowered.proxy.network.pipeline.MinecraftVarintLengthEncoder.IS_JAVA_CIPHER;
 
 import com.velocitypowered.natives.compression.VelocityCompressor;
 import com.velocitypowered.natives.util.MoreByteBufUtils;
-import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import com.velocitypowered.proxy.network.ProtocolUtils;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;