Add 1.20.80 support (#2176)

CloudburstMC · Apr 23, 2024 · 86683f2 · 86683f2
1 parent 14e4a77
commit 86683f2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java b/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java
@@ -110,6 +110,7 @@ public void encode() {
                     this.putUUID(shaped.getId());
                     this.putString(CRAFTING_TAG_CRAFTING_TABLE);
                     this.putVarInt(shaped.getPriority());
+                    this.putBoolean(true); // Assume symmetry
                     this.putUnsignedVarInt(recipeNetworkId++);
                     break;
                 case FURNACE:

diff --git a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java b/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("662"); // DO NOT REMOVE BOXING
+    int CURRENT_PROTOCOL = Integer.valueOf("671"); // DO NOT REMOVE BOXING
 
     List<Integer> SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
 
-    String MINECRAFT_VERSION_NETWORK = "1.20.70";
+    String MINECRAFT_VERSION_NETWORK = "1.20.80";
     String MINECRAFT_VERSION = 'v' + MINECRAFT_VERSION_NETWORK;
 
     byte BATCH_PACKET = (byte) 0xff;

diff --git a/src/main/java/cn/nukkit/network/protocol/ResourcePackStackPacket.java b/src/main/java/cn/nukkit/network/protocol/ResourcePackStackPacket.java
@@ -41,6 +41,7 @@ public void encode() {
         this.putString(this.gameVersion);
         this.putLInt(0); // Experiments length
         this.putBoolean(false); // Were experiments previously toggled
+        this.putBoolean(false); // Has editor packs
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java b/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java
@@ -88,6 +88,7 @@ public byte pid() {
     public byte chatRestrictionLevel;
     public boolean disablePlayerInteractions;
     public boolean emoteChatMuted;
+    public boolean hardcore;
 
     @Override
     public void decode() {
@@ -110,6 +111,7 @@ public void encode() {
         this.putVarInt(this.dimension);
         this.putVarInt(this.generator);
         this.putVarInt(this.worldGamemode);
+        this.putBoolean(this.hardcore);
         this.putVarInt(this.difficulty);
         this.putBlockVector3(this.spawnX, this.spawnY, this.spawnZ);
         this.putBoolean(this.hasAchievementsDisabled);

diff --git a/src/main/java/cn/nukkit/network/protocol/UpdatePlayerGameTypePacket.java b/src/main/java/cn/nukkit/network/protocol/UpdatePlayerGameTypePacket.java
@@ -8,6 +8,7 @@ public class UpdatePlayerGameTypePacket extends DataPacket {
 
     public GameType gameType;
     public long entityId;
+    public int tick;
 
     @Override
     public byte pid() {
@@ -24,7 +25,8 @@ public void decode() {
     public void encode() {
         this.reset();
         this.putVarInt(this.gameType.ordinal());
-        this.putVarLong(entityId);
+        this.putVarLong(this.entityId);
+        this.putUnsignedVarInt(this.tick);
     }
 
     public enum GameType {

diff --git a/src/main/resources/creative_items.json b/src/main/resources/creative_items.json
diff --git a/src/main/resources/item_mappings.json b/src/main/resources/item_mappings.json
diff --git a/src/main/resources/runtime_block_states.dat b/src/main/resources/runtime_block_states.dat
diff --git a/src/main/resources/runtime_item_states.json b/src/main/resources/runtime_item_states.json