1.21.4 (#189)

* start updating to 1.21.4 * fix block codegen and stop using block data from burger * 1.21.4-rc1 * 1.21.4
azalea-rs · Dec 3, 2024 · b71a7af · b71a7af
1 parent ea5a1c1
commit b71a7af
Show file tree

Hide file tree

Showing 36 changed files with 822 additions and 599 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
 
-_Currently supported Minecraft version: `1.21.3`._
+_Currently supported Minecraft version: `1.21.4`._
 
 > [!WARNING]
 > Azalea is still very unfinished, though most crates are in a somewhat useable state

diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-auth"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-auth"
-version = "0.10.3+mc1.21.3"
+version = "0.10.3+mc1.21.4"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-block"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-block"
-version = "0.10.3+mc1.21.3"
+version = "0.10.3+mc1.21.4"
 
 [lib]
 

diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-block-macros"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-block/azalea-block-macros"
-version = "0.10.3+mc1.21.3"
+version = "0.10.3+mc1.21.4"
 
 [lib]
 proc-macro = true

diff --git a/azalea-block/src/generated.rs b/azalea-block/src/generated.rs
@@ -326,11 +326,8 @@ make_block_states! {
         "south" => South(bool),
         "up" => Up(bool),
         "west" => West(bool),
-        "creaking" => Creaking {
-            Disabled,
-            Dormant,
-            Active,
-        },
+        "active" => Active(bool),
+        "natural" => Natural(bool),
         "half" => TopBottom {
             Top,
             Bottom,
@@ -914,6 +911,31 @@ make_block_states! {
             _7,
         },
         "in_wall" => InWall(bool),
+        "type" => Type {
+            Top,
+            Bottom,
+            Double,
+        },
+        "east" => WallEast {
+            None,
+            Low,
+            Tall,
+        },
+        "north" => WallNorth {
+            None,
+            Low,
+            Tall,
+        },
+        "south" => WallSouth {
+            None,
+            Low,
+            Tall,
+        },
+        "west" => WallWest {
+            None,
+            Low,
+            Tall,
+        },
         "age" => NetherWartAge {
             _0,
             _1,
@@ -941,26 +963,6 @@ make_block_states! {
         },
         "disarmed" => Disarmed(bool),
         "conditional" => Conditional(bool),
-        "east" => WallEast {
-            None,
-            Low,
-            Tall,
-        },
-        "north" => WallNorth {
-            None,
-            Low,
-            Tall,
-        },
-        "south" => WallSouth {
-            None,
-            Low,
-            Tall,
-        },
-        "west" => WallWest {
-            None,
-            Low,
-            Tall,
-        },
         "age" => CarrotsAge {
             _0,
             _1,
@@ -1192,11 +1194,6 @@ make_block_states! {
             _14,
             _15,
         },
-        "type" => Type {
-            Top,
-            Bottom,
-            Double,
-        },
         "rotation" => WhiteBannerRotation {
             _0,
             _1,
@@ -2441,8 +2438,9 @@ make_block_states! {
         soul_fire => BlockBehavior::new(), {},
         spawner => BlockBehavior::new().requires_correct_tool_for_drops().strength(5.0, 5.0), {},
         creaking_heart => BlockBehavior::new(), {
+            "active": Active(false),
             "axis": Axis::Y,
-            "creaking": Creaking::Disabled,
+            "natural": Natural(false),
         },
         oak_stairs => BlockBehavior::new().strength(2.0, 3.0), {
             "facing": FacingCardinal::North,
@@ -2972,6 +2970,15 @@ make_block_states! {
             "waterlogged": Waterlogged(false),
             "west": West(false),
         },
+        resin_clump => BlockBehavior::new(), {
+            "down": Down(false),
+            "east": East(false),
+            "north": North(false),
+            "south": South(false),
+            "up": Up(false),
+            "waterlogged": Waterlogged(false),
+            "west": West(false),
+        },
         oak_fence_gate => BlockBehavior::new().strength(2.0, 3.0), {
             "facing": FacingCardinal::North,
             "in_wall": InWall(false),
@@ -3000,6 +3007,27 @@ make_block_states! {
             "snowy": Snowy(false),
         },
         lily_pad => BlockBehavior::new(), {},
+        resin_block => BlockBehavior::new(), {},
+        resin_bricks => BlockBehavior::new(), {},
+        resin_brick_stairs => BlockBehavior::new(), {
+            "facing": FacingCardinal::North,
+            "half": TopBottom::Bottom,
+            "shape": StairShape::Straight,
+            "waterlogged": Waterlogged(false),
+        },
+        resin_brick_slab => BlockBehavior::new(), {
+            "type": Type::Bottom,
+            "waterlogged": Waterlogged(false),
+        },
+        resin_brick_wall => BlockBehavior::new(), {
+            "east": WallEast::None,
+            "north": WallNorth::None,
+            "south": WallSouth::None,
+            "up": Up(true),
+            "waterlogged": Waterlogged(false),
+            "west": WallWest::None,
+        },
+        chiseled_resin_bricks => BlockBehavior::new(), {},
         nether_bricks => BlockBehavior::new().requires_correct_tool_for_drops().strength(2.0, 6.0), {},
         nether_brick_fence => BlockBehavior::new().requires_correct_tool_for_drops().strength(2.0, 6.0), {
             "east": East(false),
@@ -5546,5 +5574,9 @@ make_block_states! {
         pale_hanging_moss => BlockBehavior::new(), {
             "tip": Tip(true),
         },
+        open_eyeblossom => BlockBehavior::new(), {},
+        closed_eyeblossom => BlockBehavior::new(), {},
+        potted_open_eyeblossom => BlockBehavior::new(), {},
+        potted_closed_eyeblossom => BlockBehavior::new(), {},
     }
 }
diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-brigadier"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-brigadier"
-version = "0.10.3+mc1.21.3"
+version = "0.10.3+mc1.21.4"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-buf"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-buf"
-version = "0.10.3+mc1.21.3"
+version = "0.10.3+mc1.21.4"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html