mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
Compare commits
7 commits
90a761c6d8
...
de433a3e47
Author | SHA1 | Date | |
---|---|---|---|
de433a3e47 | |||
645803a3f1 | |||
6bb614d069 | |||
a060b73915 | |||
5564d475a2 | |||
2064450763 | |||
7b8dc189f7 |
10 changed files with 31 additions and 61 deletions
42
Cargo.lock
generated
42
Cargo.lock
generated
|
@ -209,7 +209,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
|
|||
|
||||
[[package]]
|
||||
name = "azalea"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"azalea-auth",
|
||||
|
@ -249,7 +249,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-auth"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-crypto",
|
||||
|
@ -269,7 +269,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-block"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-block-macros",
|
||||
"azalea-buf",
|
||||
|
@ -278,7 +278,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-block-macros"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
@ -287,7 +287,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-brigadier"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
@ -298,7 +298,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-buf"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf-macros",
|
||||
"byteorder",
|
||||
|
@ -311,7 +311,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-buf-macros"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
@ -320,7 +320,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-chat"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-language",
|
||||
|
@ -333,7 +333,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-client"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-compat",
|
||||
|
@ -370,7 +370,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-core"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
@ -386,7 +386,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-crypto"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"azalea-buf",
|
||||
|
@ -403,7 +403,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-entity"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
|
@ -426,7 +426,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-inventory"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
|
@ -441,7 +441,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-inventory-macros"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
@ -450,7 +450,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-language"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"compact_str",
|
||||
"serde",
|
||||
|
@ -459,7 +459,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-physics"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-core",
|
||||
|
@ -477,7 +477,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-protocol"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
|
@ -513,7 +513,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-protocol-macros"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
@ -522,7 +522,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-registry"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-registry-macros",
|
||||
|
@ -532,7 +532,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-registry-macros"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
|
@ -540,7 +540,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "azalea-world"
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
dependencies = [
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
|
|
|
@ -22,7 +22,7 @@ resolver = "2"
|
|||
# --- Workspace Settings ---
|
||||
|
||||
[workspace.package]
|
||||
version = "0.13.0+mc1.21.7-rc1"
|
||||
version = "0.13.0+mc1.21.7"
|
||||
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: `1.21.7-rc1`._
|
||||
_Currently supported Minecraft version: `1.21.7`._
|
||||
|
||||
> [!WARNING]
|
||||
> Azalea is still unfinished, though most crates are in a useable state.
|
||||
|
|
|
@ -155,7 +155,7 @@ fn parse_incomplete_argument() {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn execute_ambiguious_parent_subcommand() {
|
||||
fn execute_ambiguous_parent_subcommand() {
|
||||
let mut subject = CommandDispatcher::new();
|
||||
|
||||
subject.register(
|
||||
|
@ -168,7 +168,7 @@ fn execute_ambiguious_parent_subcommand() {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn execute_ambiguious_parent_subcommand_via_redirect() {
|
||||
fn execute_ambiguous_parent_subcommand_via_redirect() {
|
||||
let mut subject = CommandDispatcher::new();
|
||||
|
||||
let real = subject.register(
|
||||
|
|
|
@ -23,8 +23,8 @@ impl Plugin for PlayerLoadedPlugin {
|
|||
// this component is removed on respawn or disconnect
|
||||
// (notably, it's not removed on login)
|
||||
|
||||
// mojmap interchangably calls it 'has client loaded' and 'has player loaded', i
|
||||
// prefer the client one because it makes it clear that the component is only
|
||||
// mojmap interchangeably calls it 'has client loaded' and 'has player loaded',
|
||||
// i prefer the client one because it makes it clear that the component is only
|
||||
// present on our own clients
|
||||
|
||||
#[derive(Component)]
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
use azalea_buf::AzBuf;
|
||||
use azalea_protocol_macros::ClientboundConfigPacket;
|
||||
use azalea_registry::Holder;
|
||||
use simdnbt::owned::Nbt;
|
||||
|
||||
#[derive(Clone, Debug, AzBuf, ClientboundConfigPacket)]
|
||||
pub struct ClientboundShowDialog {
|
||||
pub dialog: Holder<azalea_registry::Dialog, Nbt>,
|
||||
pub dialog: Nbt,
|
||||
}
|
||||
|
|
|
@ -11,8 +11,8 @@ use azalea_buf::{AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError};
|
|||
|
||||
use crate::read::ReadPacketError;
|
||||
|
||||
pub const PROTOCOL_VERSION: i32 = 1073742081;
|
||||
pub const VERSION_NAME: &str = "1.21.7-rc1";
|
||||
pub const PROTOCOL_VERSION: i32 = 772;
|
||||
pub const VERSION_NAME: &str = "1.21.7";
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
||||
pub enum ConnectionProtocol {
|
||||
|
|
|
@ -147,7 +147,7 @@ impl PartialEntityInfos {
|
|||
///
|
||||
/// Also see [`PartialInstance`].
|
||||
///
|
||||
/// This is sometimes interchangably called a "world". However, this type is
|
||||
/// This is sometimes interchangeably called a "world". However, this type is
|
||||
/// called `Instance` to avoid colliding with the `World` type from Bevy ECS.
|
||||
#[derive(Default, Debug)]
|
||||
pub struct Instance {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#![doc = include_str!("../README.md")]
|
||||
#![feature(type_changing_struct_update)]
|
||||
#![feature(let_chains)]
|
||||
#![feature(never_type)]
|
||||
|
||||
pub mod accept_resource_packs;
|
||||
|
|
|
@ -32,34 +32,6 @@ def get_pumpkin_extractor():
|
|||
f"cd {get_dir_location('__cache__')} && git clone https://github.com/Pumpkin-MC/Extractor pumpkin-extractor && cd pumpkin-extractor && git pull"
|
||||
)
|
||||
|
||||
GIT_PATCH = """diff --git a/src/main/kotlin/de/snowii/extractor/extractors/Blocks.kt b/src/main/kotlin/de/snowii/extractor/extractors/Blocks.kt
|
||||
index 936cd7b..9876a4b 100644
|
||||
--- a/src/main/kotlin/de/snowii/extractor/extractors/Blocks.kt
|
||||
+++ b/src/main/kotlin/de/snowii/extractor/extractors/Blocks.kt
|
||||
@@ -106,12 +106,18 @@ class Blocks : Extractor.Extractor {
|
||||
}
|
||||
|
||||
val collisionShapeIdxsJson = JsonArray()
|
||||
+ val outlineShapeIdxsJson = JsonArray()
|
||||
for (box in state.getCollisionShape(EmptyBlockView.INSTANCE, BlockPos.ORIGIN).boundingBoxes) {
|
||||
val idx = shapes.putIfAbsent(box, shapes.size)
|
||||
collisionShapeIdxsJson.add(Objects.requireNonNullElseGet(idx) { shapes.size - 1 })
|
||||
}
|
||||
+ for (box in state.getOutlineShape(EmptyBlockView.INSTANCE, BlockPos.ORIGIN).boundingBoxes) {
|
||||
+ val idx = shapes.putIfAbsent(box, shapes.size)
|
||||
+ outlineShapeIdxsJson.add(Objects.requireNonNullElseGet(idx) { shapes.size - 1 })
|
||||
+ }
|
||||
|
||||
stateJson.add("collision_shapes", collisionShapeIdxsJson)
|
||||
+ stateJson.add("outline_shapes", outlineShapeIdxsJson)
|
||||
|
||||
for (blockEntity in Registries.BLOCK_ENTITY_TYPE) {
|
||||
if (blockEntity.supports(state)) {
|
||||
"""
|
||||
os.system(
|
||||
f"cd {get_dir_location('__cache__')}/pumpkin-extractor && git apply - <<EOF\n{GIT_PATCH}\nEOF"
|
||||
)
|
||||
|
||||
return get_dir_location("__cache__/pumpkin-extractor")
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue