1.20.40-R1 Protocol Release (#1401)

* Made BlockWood use the same WoodType Block state as the other blocks (OLD_LOG_TYPE was deprecated) * Fixed BlockRedstoneRepeater Direction * Fixed block_mappings for log axis * Removed doubled log2 section * Updated Release Version to 1.20.30-r2 * release +u * Updated Release Version to 1.20.30-r2 (#1399) * Made BlockWood use the same WoodType Block state as the other blocks (OLD_LOG_TYPE was deprecated) * Fixed BlockRedstoneRepeater Direction * Fixed block_mappings for log axis * Removed doubled log2 section * Updated Release Version to 1.20.30-r2 * release +u * Fixed UPDATE blocks causing a lot of issues in World generation * Fixed Facing Direction property error on BlockAmethystBud * Realized that BLOCK_FACE is required instead of FACING_DIRECTION * Fixed AmethystBud Block FACING_DIRECTION property (#1400) * Made BlockWood use the same WoodType Block state as the other blocks (OLD_LOG_TYPE was deprecated) * Fixed BlockRedstoneRepeater Direction * Fixed block_mappings for log axis * Removed doubled log2 section * Updated Release Version to 1.20.30-r2 * release +u * Fixed UPDATE blocks causing a lot of issues in World generation * Fixed Facing Direction property error on BlockAmethystBud * Realized that BLOCK_FACE is required instead of FACING_DIRECTION * release +u * Updated Block Direction states from Chest, EnderChest and StoneCutter to CARDINAL_DIRECTION TODO: Update Hashes in creativeitems.json
PowerNukkitX · Oct 27, 2023 · b07e656 · b07e656
1 parent 31fc989
commit b07e656
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Join US:
 
 What's new in PowerNukkitX? Let's See：
 
-1. Support for 1.20.30 protocol.
+1. Support for 1.20.40 protocol.
 2. Support for 384 world height.
 3. Support for The Nether world, no need to install additional plugin.
 4. Support 3D biomes.<!--Custom dimension interface TODO-->
@@ -146,7 +146,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'cn.powernukkitx', name: 'powernukkitx', version: '1.20.30-r1'
+    compile group: 'cn.powernukkitx', name: 'powernukkitx', version: '1.20.40-r1'
 }
 ```
 
@@ -156,7 +156,7 @@ dependencies {
     <dependency>
         <groupId>cn.powernukkitx</groupId>
         <artifactId>powernukkitx</artifactId>
-        <version>1.20.30-r1</version>
+        <version>1.20.40-r1</version>
     </dependency>
 </dependencies>
 ```

diff --git a/dumps/block-states.ini b/dumps/block-states.ini
@@ -497,7 +497,7 @@ pillar_axis=x,y,z
 stripped_bit=0,1
 
 [minecraft:chest]
-facing_direction=0,1,2,3,4,5
+minecraft:cardinal_direction=east,north,south,west
 
 [minecraft:chiseled_bookshelf]
 books_stored=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63
@@ -1161,7 +1161,7 @@ facing_direction=0,1,2,3,4,5
 [minecraft:end_stone]
 
 [minecraft:ender_chest]
-facing_direction=0,1,2,3,4,5
+minecraft:cardinal_direction=east,north,south,west
 
 [minecraft:exposed_copper]
 
@@ -2312,7 +2312,7 @@ stone_brick_type=chiseled,cracked,default,mossy,smooth
 [minecraft:stonecutter]
 
 [minecraft:stonecutter_block]
-facing_direction=0,1,2,3,4,5
+minecraft:cardinal_direction=east,north,south,west
 
 [minecraft:stripped_acacia_log]
 pillar_axis=x,y,z
@@ -2401,7 +2401,7 @@ open_bit=0,1
 upside_down_bit=0,1
 
 [minecraft:trapped_chest]
-facing_direction=0,1,2,3,4,5
+minecraft:cardinal_direction=east,north,south,west
 
 [minecraft:trip_wire]
 attached_bit=0,1

diff --git a/src/main/java/cn/nukkit/block/BlockAmethystBud.java b/src/main/java/cn/nukkit/block/BlockAmethystBud.java
@@ -16,14 +16,15 @@
 import javax.annotation.Nullable;
 import java.util.Arrays;
 
+import static cn.nukkit.blockproperty.CommonBlockProperties.BLOCK_FACE;
 import static cn.nukkit.blockproperty.CommonBlockProperties.FACING_DIRECTION;
 
 @Since("1.6.0.0-PNX")
 @PowerNukkitOnly
 public abstract class BlockAmethystBud extends BlockTransparentMeta implements Faceable {
     @PowerNukkitXOnly
     @Since("1.6.0.0-PNX")
-    public static final BlockProperties PROPERTIES = new BlockProperties(CommonBlockProperties.BLOCK_FACE);
+    public static final BlockProperties PROPERTIES = new BlockProperties(BLOCK_FACE);
 
     @Override
     public String getName() {
@@ -86,14 +87,14 @@ public BlockProperties getProperties() {
 
     @Override
     public BlockFace getBlockFace() {
-        return getPropertyValue(FACING_DIRECTION);
+        return getPropertyValue(BLOCK_FACE);
     }
 
     @PowerNukkitXOnly
     @Since("1.6.0.0-PNX")
     @Override
     public void setBlockFace(BlockFace face) {
-        setPropertyValue(FACING_DIRECTION, face);
+        setPropertyValue(BLOCK_FACE, face);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockChest.java b/src/main/java/cn/nukkit/block/BlockChest.java
@@ -33,7 +33,7 @@ public class BlockChest extends BlockTransparentMeta implements Faceable, BlockE
 
     @PowerNukkitOnly
     @Since("1.5.0.0-PN")
-    public static final BlockProperties PROPERTIES = CommonBlockProperties.FACING_DIRECTION_BLOCK_PROPERTIES;
+    public static final BlockProperties PROPERTIES = new BlockProperties(CommonBlockProperties.CARDINAL_DIRECTION);
 
     public BlockChest() {
         this(0);

diff --git a/src/main/java/cn/nukkit/block/BlockEnderChest.java b/src/main/java/cn/nukkit/block/BlockEnderChest.java
@@ -7,6 +7,7 @@
 import cn.nukkit.blockentity.BlockEntity;
 import cn.nukkit.blockentity.BlockEntityEnderChest;
 import cn.nukkit.blockproperty.BlockProperties;
+import cn.nukkit.blockproperty.CommonBlockProperties;
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemBlock;
 import cn.nukkit.item.ItemTool;
@@ -27,7 +28,7 @@ public class BlockEnderChest extends BlockTransparentMeta implements Faceable, B
 
     @PowerNukkitOnly
     @Since("1.5.0.0-PN")
-    public static final BlockProperties PROPERTIES = BlockChest.PROPERTIES;
+    public static final BlockProperties PROPERTIES = new BlockProperties(CommonBlockProperties.CARDINAL_DIRECTION);
 
     private final Set<Player> viewers = new HashSet<>();
 

diff --git a/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java b/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java
@@ -22,7 +22,7 @@ public class BlockStonecutterBlock extends BlockTransparentMeta implements Facea
 
     @PowerNukkitOnly
     @Since("1.5.0.0-PN")
-    public static final BlockProperties PROPERTIES = CommonBlockProperties.FACING_DIRECTION_BLOCK_PROPERTIES;
+    public static final BlockProperties PROPERTIES = new BlockProperties(CommonBlockProperties.CARDINAL_DIRECTION);
 
     @PowerNukkitOnly
     public BlockStonecutterBlock() {

diff --git a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java
@@ -18,11 +18,11 @@ public interface ProtocolInfo {
     /**
      * Actual Minecraft: PE protocol version
      */
-    int CURRENT_PROTOCOL = dynamic(618);
+    int CURRENT_PROTOCOL = dynamic(622);
 
     List<Integer> SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
 
-    String MINECRAFT_VERSION_NETWORK = dynamic("1.20.30");
+    String MINECRAFT_VERSION_NETWORK = dynamic("1.20.40");
 
     String MINECRAFT_VERSION = 'v' + MINECRAFT_VERSION_NETWORK;