Skip to content

Commit cf31681

Browse files
committed
1.21.11-pre1
1 parent a767f51 commit cf31681

File tree

10 files changed

+141
-85
lines changed

10 files changed

+141
-85
lines changed

Cargo.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resolver = "3"
2222
# --- Workspace Settings ---
2323

2424
[workspace.package]
25-
version = "0.14.0+mc25w46a"
25+
version = "0.14.0+mc1.21.11-pre1"
2626
edition = "2024"
2727
license = "MIT"
2828
repository = "https://github.com/azalea-rs/azalea"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
1010

1111
<!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
1212

13-
_Currently supported Minecraft version: `25w46a`._
13+
_Currently supported Minecraft version: `1.21.11-pre1`._
1414

1515
> [!WARNING]
1616
> Many parts of Azalea are still unfinished and will receive breaking changes in the future. Most breaking changes will be listed in the [changelog](CHANGELOG.md).

azalea-inventory/src/components/mod.rs

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ define_data_components!(
292292
KineticWeapon,
293293
SwingAnimation,
294294
ZombieNautilusVariant,
295+
AttackRange,
295296
);
296297

297298
#[derive(Clone, PartialEq, AzBuf, Debug, Serialize)]
@@ -1522,9 +1523,6 @@ pub enum DamageType {
15221523

15231524
#[derive(Clone, PartialEq, AzBuf, Debug, Serialize)]
15241525
pub struct PiercingWeapon {
1525-
pub min_reach: f32,
1526-
pub max_reach: f32,
1527-
pub hitbox_margin: f32,
15281526
pub deals_knockback: bool,
15291527
pub dismounts: bool,
15301528
pub sound: Option<Holder<SoundEvent, azalea_core::sound::CustomSound>>,
@@ -1533,9 +1531,6 @@ pub struct PiercingWeapon {
15331531
impl PiercingWeapon {
15341532
pub const fn new() -> Self {
15351533
Self {
1536-
min_reach: 0.,
1537-
max_reach: 3.,
1538-
hitbox_margin: 0.,
15391534
deals_knockback: true,
15401535
dismounts: false,
15411536
sound: None,
@@ -1551,9 +1546,6 @@ impl Default for PiercingWeapon {
15511546

15521547
#[derive(Clone, PartialEq, AzBuf, Debug, Serialize)]
15531548
pub struct KineticWeapon {
1554-
pub min_reach: f32,
1555-
pub max_reach: f32,
1556-
pub hitbox_margin: f32,
15571549
#[var]
15581550
pub contact_cooldown_ticks: i32,
15591551
#[var]
@@ -1569,9 +1561,6 @@ pub struct KineticWeapon {
15691561
impl KineticWeapon {
15701562
pub const fn new() -> Self {
15711563
Self {
1572-
min_reach: 0.,
1573-
max_reach: 3.,
1574-
hitbox_margin: 0.3,
15751564
contact_cooldown_ticks: 10,
15761565
delay_ticks: 0,
15771566
dismount_conditions: None,
@@ -1640,3 +1629,26 @@ pub enum SwingAnimationKind {
16401629
Whack,
16411630
Stab,
16421631
}
1632+
1633+
#[derive(Clone, PartialEq, AzBuf, Debug, Serialize)]
1634+
pub struct AttackRange {
1635+
pub min_reach: f32,
1636+
pub max_reach: f32,
1637+
pub hitbox_margin: f32,
1638+
pub mob_factor: f32,
1639+
}
1640+
impl AttackRange {
1641+
pub const fn new() -> Self {
1642+
Self {
1643+
min_reach: 0.,
1644+
max_reach: 3.,
1645+
hitbox_margin: 0.3,
1646+
mob_factor: 1.,
1647+
}
1648+
}
1649+
}
1650+
impl Default for AttackRange {
1651+
fn default() -> Self {
1652+
Self::new()
1653+
}
1654+
}

0 commit comments

Comments
 (0)