Add 1.21.0 support (#2184)

src/main/java/cn/nukkit/network/protocol/ContainerClosePacket.java

@@ -16,18 +16,21 @@ public byte pid() {
     }
 
     public int windowId;
+    public int type;
     public boolean wasServerInitiated = true;
 
     @Override
     public void decode() {
         this.windowId = (byte) this.getByte();
+        this.type = (byte) this.getByte();
         this.wasServerInitiated = this.getBoolean();
     }
 
     @Override
     public void encode() {
         this.reset();
         this.putByte((byte) this.windowId);
+        this.putByte((byte) this.type);
         this.putBoolean(this.wasServerInitiated);
     }
 }

src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java

@@ -82,11 +82,12 @@ public void encode() {
                     for (Item ingredient : ingredients) {
                         this.putRecipeIngredient(ingredient);
                     }
-                    this.putUnsignedVarInt(1);
+                    this.putUnsignedVarInt(1); // Results length
                     this.putSlot(shapeless.getResult(), true);
                     this.putUUID(shapeless.getId());
                     this.putString(CRAFTING_TAG_CRAFTING_TABLE);
                     this.putVarInt(shapeless.getPriority());
+                    this.putByte((byte) 1); // Requirement ordinal, 1 = ALWAYS_UNLOCKED
                     this.putUnsignedVarInt(recipeNetworkId++);
                     break;
                 case SHAPED:
@@ -111,6 +112,7 @@ public void encode() {
                     this.putString(CRAFTING_TAG_CRAFTING_TABLE);
                     this.putVarInt(shaped.getPriority());
                     this.putBoolean(true); // Assume symmetry
+                    this.putByte((byte) 1); // Requirement ordinal, 1 = ALWAYS_UNLOCKED
                     this.putUnsignedVarInt(recipeNetworkId++);
                     break;
                 case FURNACE:

src/main/java/cn/nukkit/network/protocol/EventPacket.java

@@ -21,9 +21,6 @@ public void decode() {
 
     @Override
     public void encode() {
-        this.reset();
-        this.putVarLong(this.eid);
-        this.putVarInt(this.unknown1);
-        this.putByte(this.unknown2);
+
     }
 }

src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java

@@ -14,11 +14,11 @@ public interface ProtocolInfo {
      * Actual Minecraft: PE protocol version
      */
     @SuppressWarnings("UnnecessaryBoxing")
-    int CURRENT_PROTOCOL = Integer.valueOf("671"); // DO NOT REMOVE BOXING
+    int CURRENT_PROTOCOL = Integer.valueOf("685"); // DO NOT REMOVE BOXING
 
     List<Integer> SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
 
-    String MINECRAFT_VERSION_NETWORK = "1.20.80";
+    String MINECRAFT_VERSION_NETWORK = "1.21.0";
     String MINECRAFT_VERSION = 'v' + MINECRAFT_VERSION_NETWORK;
 
     byte BATCH_PACKET = (byte) 0xff;

src/main/java/cn/nukkit/network/protocol/StartGamePacket.java

@@ -157,6 +157,9 @@ public void encode() {
         this.putBoolean(false); // Experimental Gameplay
         this.putByte(this.chatRestrictionLevel);
         this.putBoolean(this.disablePlayerInteractions);
+        this.putString(""); // ServerId
+        this.putString(""); // WorldId
+        this.putString(""); // ScenarioId
         /* Level settings end */
         this.putString(this.levelId);
         this.putString(this.worldName);

src/main/java/cn/nukkit/network/protocol/TextPacket.java

@@ -35,6 +35,7 @@ public byte pid() {
     public boolean isLocalized = false;
     public String xboxUserId = "";
     public String platformChatId = "";
+    public String filteredMessage = "";
 
     @Override
     public void decode() {
@@ -61,6 +62,7 @@ public void decode() {
         }
         this.xboxUserId = this.getString();
         this.platformChatId = this.getString();
+        this.filteredMessage = this.getString();
     }
 
     @Override
@@ -92,5 +94,6 @@ public void encode() {
         }
         this.putString(this.xboxUserId);
         this.putString(this.platformChatId);
+        this.putString(this.filteredMessage);
     }
 }

src/main/java/cn/nukkit/network/protocol/types/AuthInputAction.java

@@ -73,7 +73,19 @@ public enum AuthInputAction {
     /**
      * @since v649
      */
-    IN_CLIENT_PREDICTED_IN_VEHICLE;
+    IN_CLIENT_PREDICTED_IN_VEHICLE,
+    /**
+     * @since v662
+     */
+    PADDLE_LEFT,
+    /**
+     * @since v662
+     */
+    PADDLE_RIGHT,
+    /**
+     * @since v685
+     */
+    BLOCK_BREAKING_DELAY_ENABLED;
 
     private static final AuthInputAction[] VALUES = values();
 

src/main/resources/report_template.md

@@ -1,5 +1,6 @@
-<!--- Please do not ask questions or create discussion in the bug tracker. Use https://nukkitx.com -->
+<!--- Please do not ask questions or create discussion in the bug tracker. Use cloudburstmc.org forum or Discord for that. -->
 <!--- ONLY POST ISSUES WITH A CLEAN SERVER ON THE LATEST VERSION -->
+
 ## Generated Bug Report
 
 <!--- DO NOT OPEN A ISSUE IF THIS IS A PLUGIN ERROR -->