Support for 1.20.40 (#2156)

CloudburstMC · Oct 24, 2023 · 3328245 · 3328245
1 parent e4fde13
commit 3328245
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/cn/nukkit/blockentity/BlockEntityJukebox.java b/src/main/java/cn/nukkit/blockentity/BlockEntityJukebox.java
@@ -121,8 +121,7 @@ public void saveNBT() {
 
     @Override
     public CompoundTag getSpawnCompound() {
-        return getDefaultCompound(this, JUKEBOX)
-                .putCompound("RecordItem", NBTIO.putItemHelper(this.recordItem));
+        return getDefaultCompound(this, JUKEBOX);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/network/protocol/DisconnectPacket.java b/src/main/java/cn/nukkit/network/protocol/DisconnectPacket.java
@@ -19,13 +19,15 @@ public byte pid() {
 
     @Override
     public void decode() {
+        this.getVarInt(); // Disconnect fail reason
         this.hideDisconnectionScreen = this.getBoolean();
         this.message = this.getString();
     }
 
     @Override
     public void encode() {
         this.reset();
+        this.putVarInt(0); // Disconnect fail reason UNKNOWN
         this.putBoolean(this.hideDisconnectionScreen);
         if (!this.hideDisconnectionScreen) {
             this.putString(this.message);

diff --git a/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java b/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java
@@ -478,7 +478,8 @@ public class LevelSoundEventPacket extends DataPacket {
     public static final int SOUND_HOGLIN_CONVERT_TO_ZOMBIE = 474;
     public static final int SOUND_AMBIENT_UNDERWATER_ENTER = 475;
     public static final int SOUND_AMBIENT_UNDERWATER_EXIT = 476;
-    public static final int SOUND_UNDEFINED = 477;
+    public static final int SOUND_BOTTLE_FILL = 477;
+    public static final int SOUND_BOTTLE_EMPTY = 478;
 
     public int sound;
     public float x;

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("618"); // DO NOT REMOVE BOXING
+    int CURRENT_PROTOCOL = Integer.valueOf("622"); // DO NOT REMOVE BOXING
 
     List<Integer> SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
 
-    String MINECRAFT_VERSION_NETWORK = "1.20.30";
+    String MINECRAFT_VERSION_NETWORK = "1.20.40";
     String MINECRAFT_VERSION = 'v' + MINECRAFT_VERSION_NETWORK;
 
     byte BATCH_PACKET = (byte) 0xff;

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