fix: v1_21_70_24

lt-name · lt-name · commit 7a2b15255f34 · 2025-03-29T10:18:50.000+08:00
diff --git a/src/main/java/cn/nukkit/form/window/FormWindow.java b/src/main/java/cn/nukkit/form/window/FormWindow.java
@@ -26,7 +26,7 @@ public String getJSONData() {
 
     public String getJSONData(int protocol) {
         if (this instanceof FormWindowSimple) {
-            if (protocol >= ProtocolInfo.v1_21_70_25) {
+            if (protocol >= ProtocolInfo.v1_21_70_24) {
                 return GSON_FORM_WINDOW_SIMPLE_785.toJson(this);
             }
             return GSON_FORM_WINDOW_SIMPLE.toJson(this);
diff --git a/src/main/java/cn/nukkit/form/window/FormWindowCustom.java b/src/main/java/cn/nukkit/form/window/FormWindowCustom.java
@@ -97,7 +97,7 @@ public void setResponse(int protocol, String data) {
             if (e instanceof ElementLabel) {
                 labelResponses.put(i, ((ElementLabel) e).getText());
                 responses.put(i, ((ElementLabel) e).getText());
-                if (protocol < ProtocolInfo.v1_21_70_25) {
+                if (protocol < ProtocolInfo.v1_21_70_24) {
                     // to be compatible with the older response before 1.21.70
                     responseIndex++;
                 }
diff --git a/src/main/java/cn/nukkit/item/Item.java b/src/main/java/cn/nukkit/item/Item.java
@@ -830,6 +830,7 @@ public static CreativeItems getCreativeItemsAndGroups(int protocol) {
                 return Item.creative766;
             case v1_21_60:
                 return Item.creative776;
+            case v1_21_70_24:
             case v1_21_70:
                 return Item.creative786;
             // TODO Multiversion
diff --git a/src/main/java/cn/nukkit/item/RuntimeItems.java b/src/main/java/cn/nukkit/item/RuntimeItems.java
@@ -154,7 +154,7 @@ public static void init() {
     }
 
     public static RuntimeItemMapping getMapping(int protocolId) {
-        if (protocolId >= ProtocolInfo.v1_21_70) {
+        if (protocolId >= ProtocolInfo.v1_21_70_24) {
             return mapping786;
         } else if (protocolId >= ProtocolInfo.v1_21_60) {
             return mapping776;
diff --git a/src/main/java/cn/nukkit/level/GlobalBlockPalette.java b/src/main/java/cn/nukkit/level/GlobalBlockPalette.java
@@ -298,7 +298,7 @@ public static void init() {
     }
 
     public static BlockPalette getPaletteByProtocol(int protocol) {
-        if (protocol >= ProtocolInfo.v1_21_70) {
+        if (protocol >= ProtocolInfo.v1_21_70_24) {
             if (blockPalette786 == null) {
                 blockPalette786 = new BlockPalette(ProtocolInfo.v1_21_70);
             }
diff --git a/src/main/java/cn/nukkit/level/Level.java b/src/main/java/cn/nukkit/level/Level.java
@@ -5084,7 +5084,7 @@ private LongSet getChunkSendTasks(int protocol) {
     }
 
     private int getChunkProtocol(int protocol) {
-        if (protocol >= ProtocolInfo.v1_21_70) {
+        if (protocol >= ProtocolInfo.v1_21_70_24) {
             return ProtocolInfo.v1_21_70;
         } else if (protocol >= ProtocolInfo.v1_21_60) {
             return ProtocolInfo.v1_21_60;
@@ -5212,7 +5212,7 @@ private static boolean matchMVChunkProtocol(int chunk, int player) {
         if (chunk == ProtocolInfo.v1_21_40) if (player < ProtocolInfo.v1_21_50_26) return true;
         if (chunk == ProtocolInfo.v1_21_50) if (player < ProtocolInfo.v1_21_60) return true;
         if (chunk == ProtocolInfo.v1_21_60) if (player < ProtocolInfo.v1_21_70) return true;
-        if (chunk == ProtocolInfo.v1_21_70) if (player >= ProtocolInfo.v1_21_70) return true;
+        if (chunk == ProtocolInfo.v1_21_70) if (player >= ProtocolInfo.v1_21_70_24) return true;
         return false; //TODO Multiversion  Remember to update when block palette changes
     }
 
diff --git a/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java b/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java
@@ -647,7 +647,7 @@ public void decode() {
         this.entityIdentifier = this.getString();
         this.isBabyMob = this.getBoolean();
         this.isGlobal = this.getBoolean();
-        if (this.protocol >= ProtocolInfo.v1_21_70) {
+        if (this.protocol >= ProtocolInfo.v1_21_70_24) {
             this.entityUniqueId = this.getLLong();
         }
     }
@@ -661,7 +661,7 @@ public void encode() {
         this.putString(this.entityIdentifier);
         this.putBoolean(this.isBabyMob);
         this.putBoolean(this.isGlobal);
-        if (this.protocol >= ProtocolInfo.v1_21_70) {
+        if (this.protocol >= ProtocolInfo.v1_21_70_24) {
             this.putLLong(this.entityUniqueId);
         }
     }
diff --git a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java
@@ -92,7 +92,7 @@ public interface ProtocolInfo {
     int v1_21_50_26 = 765;
     int v1_21_50 = 766;
     int v1_21_60 = 776;
-    int v1_21_70_25 = 785; //TODO
+    int v1_21_70_24 = 785; //TODO
     int v1_21_70 = 786;
 
     int CURRENT_PROTOCOL = Utils.dynamic(v1_21_70);
@@ -104,7 +104,7 @@ public interface ProtocolInfo {
             v1_16_230_54, v1_17_0, v1_17_10, v1_17_20_20, v1_17_30, v1_17_40, v1_18_0, v1_18_10, v1_18_30, v1_19_0_29, v1_19_0_31, v1_19_0,
             v1_19_10, v1_19_20, v1_19_21, v1_19_30_23, v1_19_30, v1_19_40, v1_19_50_20, v1_19_50, v1_19_60, v1_19_63, v1_19_70_24, v1_19_70,
             v1_19_80, v1_20_0_23, v1_20_0, v1_20_10_21, v1_20_10, v1_20_30_24, v1_20_30, v1_20_40, v1_20_50, v1_20_60, v1_20_70, v1_20_80,
-            v1_21_0, v1_21_2, v1_21_20, v1_21_30, v1_21_40, v1_21_50_26, v1_21_50, v1_21_60, v1_21_70
+            v1_21_0, v1_21_2, v1_21_20, v1_21_30, v1_21_40, v1_21_50_26, v1_21_50, v1_21_60, v1_21_70_24, v1_21_70
     );
 
     String MINECRAFT_VERSION_NETWORK = Utils.getVersionByProtocol(CURRENT_PROTOCOL);
diff --git a/src/main/java/cn/nukkit/network/protocol/SetHudPacket.java b/src/main/java/cn/nukkit/network/protocol/SetHudPacket.java
@@ -35,7 +35,7 @@ public byte pid() {
     @Override
     public void decode() {
         this.elements.clear();
-        if (this.protocol >= ProtocolInfo.v1_21_70) {
+        if (this.protocol >= ProtocolInfo.v1_21_70_24) {
             this.getArray(this.elements, value -> HudElement.values()[(int) this.getVarInt()]);
             this.visibility = HudVisibility.values()[this.getInt()];
         } else {
@@ -47,7 +47,7 @@ public void decode() {
     @Override
     public void encode() {
         this.reset();
-        if (this.protocol >= ProtocolInfo.v1_21_70) {
+        if (this.protocol >= ProtocolInfo.v1_21_70_24) {
             this.putArray(this.elements, (buf, element) -> this.putVarInt(element.ordinal()));
             this.putInt(this.visibility.ordinal());
         } else {
diff --git a/src/main/java/cn/nukkit/utils/Utils.java b/src/main/java/cn/nukkit/utils/Utils.java
@@ -504,7 +504,7 @@ public static String getVersionByProtocol(int protocol) {
             case ProtocolInfo.v1_21_40 -> "1.21.40";
             case ProtocolInfo.v1_21_50_26, ProtocolInfo.v1_21_50 -> "1.21.50";
             case ProtocolInfo.v1_21_60 -> "1.21.60";
-            case ProtocolInfo.v1_21_70 -> "1.21.70";
+            case ProtocolInfo.v1_21_70_24, ProtocolInfo.v1_21_70 -> "1.21.70";
             //TODO Multiversion 添加新版本支持时修改这里
             default -> throw new IllegalStateException("Invalid protocol: " + protocol);
         };

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public String getJSONData() {`
`26`	`26`
`27`	`27`	`public String getJSONData(int protocol) {`
`28`	`28`	`if (this instanceof FormWindowSimple) {`
`29`		`- if (protocol >= ProtocolInfo.v1_21_70_25) {`
	`29`	`+ if (protocol >= ProtocolInfo.v1_21_70_24) {`
`30`	`30`	`return GSON_FORM_WINDOW_SIMPLE_785.toJson(this);`
`31`	`31`	`}`
`32`	`32`	`return GSON_FORM_WINDOW_SIMPLE.toJson(this);`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void setResponse(int protocol, String data) {`
`97`	`97`	`if (e instanceof ElementLabel) {`
`98`	`98`	`labelResponses.put(i, ((ElementLabel) e).getText());`
`99`	`99`	`responses.put(i, ((ElementLabel) e).getText());`
`100`		`- if (protocol < ProtocolInfo.v1_21_70_25) {`
	`100`	`+ if (protocol < ProtocolInfo.v1_21_70_24) {`
`101`	`101`	`// to be compatible with the older response before 1.21.70`
`102`	`102`	`responseIndex++;`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public static void init() {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`public static RuntimeItemMapping getMapping(int protocolId) {`
`157`		`- if (protocolId >= ProtocolInfo.v1_21_70) {`
	`157`	`+ if (protocolId >= ProtocolInfo.v1_21_70_24) {`
`158`	`158`	`return mapping786;`
`159`	`159`	`} else if (protocolId >= ProtocolInfo.v1_21_60) {`
`160`	`160`	`return mapping776;`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public static void init() {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`public static BlockPalette getPaletteByProtocol(int protocol) {`
`301`		`- if (protocol >= ProtocolInfo.v1_21_70) {`
	`301`	`+ if (protocol >= ProtocolInfo.v1_21_70_24) {`
`302`	`302`	`if (blockPalette786 == null) {`
`303`	`303`	`blockPalette786 = new BlockPalette(ProtocolInfo.v1_21_70);`
`304`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ public void decode() {`
`647`	`647`	`this.entityIdentifier = this.getString();`
`648`	`648`	`this.isBabyMob = this.getBoolean();`
`649`	`649`	`this.isGlobal = this.getBoolean();`
`650`		`- if (this.protocol >= ProtocolInfo.v1_21_70) {`
	`650`	`+ if (this.protocol >= ProtocolInfo.v1_21_70_24) {`
`651`	`651`	`this.entityUniqueId = this.getLLong();`
`652`	`652`	`}`
`653`	`653`	`}`
`@@ -661,7 +661,7 @@ public void encode() {`
`661`	`661`	`this.putString(this.entityIdentifier);`
`662`	`662`	`this.putBoolean(this.isBabyMob);`
`663`	`663`	`this.putBoolean(this.isGlobal);`
`664`		`- if (this.protocol >= ProtocolInfo.v1_21_70) {`
	`664`	`+ if (this.protocol >= ProtocolInfo.v1_21_70_24) {`
`665`	`665`	`this.putLLong(this.entityUniqueId);`
`666`	`666`	`}`
`667`	`667`	`}`