From 68e4146f3b00b3c9bd704375ee43fc9a767ac72e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Sun, 5 Sep 2021 14:02:33 +0200
Subject: [PATCH] Deprecate cancelClientbound/Serverbound with new id parameter

---
 .../api/protocol/AbstractProtocol.java           | 10 ++++++++++
 .../viaversion/api/protocol/Protocol.java        | 16 ++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/AbstractProtocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/AbstractProtocol.java
index 5f533240b..7e3e0e68a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/AbstractProtocol.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/AbstractProtocol.java
@@ -176,6 +176,11 @@ public abstract class AbstractProtocol<C1 extends ClientboundPacketType, C2 exte
         });
     }
 
+    @Override
+    public void cancelServerbound(State state, int newPacketID) {
+        cancelServerbound(state, -1, newPacketID);
+    }
+
     @Override
     public void cancelClientbound(State state, int oldPacketID, int newPacketID) {
         registerClientbound(state, oldPacketID, newPacketID, new PacketRemapper() {
@@ -186,6 +191,11 @@ public abstract class AbstractProtocol<C1 extends ClientboundPacketType, C2 exte
         });
     }
 
+    @Override
+    public void cancelClientbound(State state, int oldPacketID) {
+        cancelClientbound(state, oldPacketID, -1);
+    }
+
     @Override
     public void registerClientbound(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper, boolean override) {
         ProtocolPacket protocolPacket = new ProtocolPacket(state, oldPacketID, newPacketID, packetRemapper);
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
index 83c6fdcd4..e78fbde6c 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
@@ -67,11 +67,13 @@ public interface Protocol<C1 extends ClientboundPacketType, C2 extends Clientbou
      */
     void registerServerbound(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper, boolean override);
 
+    /**
+     * @deprecated use {@link #cancelServerbound(State, int)}
+     */
+    @Deprecated/*(forRemoval = true)*/
     void cancelServerbound(State state, int oldPacketID, int newPacketID);
 
-    default void cancelServerbound(State state, int newPacketID) {
-        cancelServerbound(state, -1, newPacketID);
-    }
+    void cancelServerbound(State state, int newPacketID);
 
     default void registerClientbound(State state, int oldPacketID, int newPacketID) {
         registerClientbound(state, oldPacketID, newPacketID, null);
@@ -81,11 +83,13 @@ public interface Protocol<C1 extends ClientboundPacketType, C2 extends Clientbou
         registerClientbound(state, oldPacketID, newPacketID, packetRemapper, false);
     }
 
+    /**
+     * @deprecated use {@link #cancelClientbound(State, int)}
+     */
+    @Deprecated/*(forRemoval = true)*/
     void cancelClientbound(State state, int oldPacketID, int newPacketID);
 
-    default void cancelClientbound(State state, int oldPacketID) {
-        cancelClientbound(state, oldPacketID, -1);
-    }
+    void cancelClientbound(State state, int oldPacketID);
 
     /**
      * Registers a clientbound packet, with id transformation and remapper.