mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
25w19a
This commit is contained in:
parent
023260833c
commit
45719d4498
6 changed files with 41 additions and 30 deletions
42
Cargo.lock
generated
42
Cargo.lock
generated
|
|
@ -215,7 +215,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
|
|||
|
||||
[[package]]
|
||||
name = "azalea"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"azalea-auth",
|
||||
|
|
@ -255,7 +255,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-auth"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-crypto",
|
||||
|
|
@ -275,7 +275,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-block"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-block-macros",
|
||||
"azalea-buf",
|
||||
|
|
@ -284,7 +284,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-block-macros"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -293,7 +293,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-brigadier"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
|
@ -304,7 +304,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-buf"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf-macros",
|
||||
"byteorder",
|
||||
|
|
@ -317,7 +317,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-buf-macros"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -326,7 +326,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-chat"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-language",
|
||||
|
|
@ -339,7 +339,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-client"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-compat",
|
||||
|
|
@ -376,7 +376,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-core"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
|
@ -392,7 +392,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-crypto"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"azalea-buf",
|
||||
|
|
@ -409,7 +409,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-entity"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
|
|
@ -432,7 +432,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-inventory"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
|
@ -447,7 +447,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-inventory-macros"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -456,7 +456,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-language"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"compact_str",
|
||||
"serde",
|
||||
|
|
@ -465,7 +465,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-physics"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-core",
|
||||
|
|
@ -483,7 +483,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-protocol"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
|
|
@ -519,7 +519,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-protocol-macros"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -528,7 +528,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-registry"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-registry-macros",
|
||||
|
|
@ -538,7 +538,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-registry-macros"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
|
|
@ -546,7 +546,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-world"
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ resolver = "2"
|
|||
# --- Workspace Settings ---
|
||||
|
||||
[workspace.package]
|
||||
version = "0.12.0+mc25w16a"
|
||||
version = "0.12.0+mc25w19a"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
repository = "https://github.com/azalea-rs/azalea"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,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: `25w16a`._
|
||||
_Currently supported Minecraft version: `25w19a`._
|
||||
|
||||
> [!WARNING]
|
||||
> Azalea is still unfinished, though most crates are in a useable state
|
||||
|
|
|
|||
|
|
@ -4541,6 +4541,8 @@ impl Default for GuardianMetadataBundle {
|
|||
|
||||
#[derive(Component, Deref, DerefMut, Clone)]
|
||||
pub struct IsLeashHolder(pub bool);
|
||||
#[derive(Component, Deref, DerefMut, Clone)]
|
||||
pub struct StaysStill(pub bool);
|
||||
#[derive(Component)]
|
||||
pub struct HappyGhast;
|
||||
impl HappyGhast {
|
||||
|
|
@ -4553,6 +4555,9 @@ impl HappyGhast {
|
|||
17 => {
|
||||
entity.insert(IsLeashHolder(d.value.into_boolean()?));
|
||||
}
|
||||
18 => {
|
||||
entity.insert(StaysStill(d.value.into_boolean()?));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
|
|
@ -4564,6 +4569,7 @@ pub struct HappyGhastMetadataBundle {
|
|||
_marker: HappyGhast,
|
||||
parent: AbstractAnimalMetadataBundle,
|
||||
is_leash_holder: IsLeashHolder,
|
||||
stays_still: StaysStill,
|
||||
}
|
||||
impl Default for HappyGhastMetadataBundle {
|
||||
fn default() -> Self {
|
||||
|
|
@ -4614,6 +4620,7 @@ impl Default for HappyGhastMetadataBundle {
|
|||
},
|
||||
},
|
||||
is_leash_holder: IsLeashHolder(false),
|
||||
stays_still: StaysStill(false),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ pub enum BrigadierString {
|
|||
GreedyPhrase = 2,
|
||||
}
|
||||
|
||||
// see ArgumentTypeInfo
|
||||
// see ArgumentTypeInfos.java
|
||||
#[derive(Debug, Clone, AzBuf, PartialEq)]
|
||||
pub enum BrigadierParser {
|
||||
Bool,
|
||||
|
|
@ -111,6 +111,7 @@ pub enum BrigadierParser {
|
|||
ItemStack,
|
||||
ItemPredicate,
|
||||
Color,
|
||||
HexColor,
|
||||
FormattedText,
|
||||
Style,
|
||||
Message,
|
||||
|
|
@ -184,7 +185,9 @@ impl AzaleaRead for BrigadierNodeStub {
|
|||
fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
|
||||
let flags = FixedBitSet::<{ 8_usize.div_ceil(8) }>::azalea_read(buf)?;
|
||||
if flags.index(5) || flags.index(6) || flags.index(7) {
|
||||
warn!("The flags from a Brigadier node are over 31. This is a bug, BrigadierParser probably needs updating.",);
|
||||
warn!(
|
||||
"The flags from a Brigadier node are over 31. This is a bug, BrigadierParser probably needs updating.",
|
||||
);
|
||||
}
|
||||
|
||||
let node_type = u8::from(flags.index(0)) + (u8::from(flags.index(1)) * 2);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use std::io::{self, Cursor, Write};
|
||||
|
||||
use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite, BufReadError};
|
||||
use azalea_core::{color::RgbColor, position::Vec3i};
|
||||
use azalea_core::{color::RgbColor, position::Vec3i, resource_location::ResourceLocation};
|
||||
use azalea_protocol_macros::ClientboundGamePacket;
|
||||
use uuid::Uuid;
|
||||
|
||||
|
|
@ -33,12 +33,12 @@ pub enum WaypointIdentifier {
|
|||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct WaypointIcon {
|
||||
pub alpha_fade: WaypointIconFade,
|
||||
pub style: ResourceLocation,
|
||||
pub color: Option<RgbColor>,
|
||||
}
|
||||
impl AzaleaWrite for WaypointIcon {
|
||||
fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> {
|
||||
self.alpha_fade.azalea_write(buf)?;
|
||||
self.style.azalea_write(buf)?;
|
||||
let color = self.color.map(|c| CompactRgbColor {
|
||||
r: c.red(),
|
||||
g: c.green(),
|
||||
|
|
@ -50,10 +50,11 @@ impl AzaleaWrite for WaypointIcon {
|
|||
}
|
||||
impl AzaleaRead for WaypointIcon {
|
||||
fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
|
||||
let alpha_fade = WaypointIconFade::azalea_read(buf)?;
|
||||
let style = ResourceLocation::azalea_read(buf)?;
|
||||
let color = Option::<CompactRgbColor>::azalea_read(buf)?;
|
||||
let color = color.map(|c| RgbColor::new(c.r, c.g, c.b));
|
||||
Ok(Self { alpha_fade, color })
|
||||
|
||||
Ok(Self { style, color })
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue