Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extractor 1.21 #635

Closed
wants to merge 3 commits into from
Closed

Extractor 1.21 #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0df823
Update extractor to mc1.20.4
Bafbi Jan 23, 2024
3fc19b4
merge the 1.20.4 extractor
Bafbi Jul 24, 2024
22da1e8
upgrade for 1.21
Bafbi Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,059 changes: 1,766 additions & 1,293 deletions crates/valence_entity/extracted/entities.json
View file
Open in desktop

Large diffs are not rendered by default.

383 changes: 197 additions & 186 deletions crates/valence_entity/extracted/misc.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions crates/valence_generated/build/status_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub enum StatusEffectCategory {
pub struct AttributeModifiers {
attribute: u8,
operation: u8,
value: f64,
base_value: f64,
uuid: String,
}

Expand Down Expand Up @@ -143,14 +143,14 @@ pub fn build() -> anyhow::Result<TokenStream> {
let modifiers = modifiers.iter().map(|modifier| {
let attribute = &modifier.attribute;
let operation = &modifier.operation;
let value = &modifier.value;
let base_value = &modifier.base_value;
let uuid = &modifier.uuid;

quote! {
AttributeModifier {
attribute: EntityAttribute::from_id(#attribute).unwrap(),
operation: EntityAttributeOperation::from_raw(#operation).unwrap(),
value: #value,
base_value: #base_value,
uuid: Uuid::parse_str(#uuid).unwrap(),
}
}
Expand Down Expand Up @@ -180,8 +180,8 @@ pub fn build() -> anyhow::Result<TokenStream> {
pub attribute: EntityAttribute,
/// The operation that this modifier applies.
pub operation: EntityAttributeOperation,
/// The value of this modifier.
pub value: f64,
/// The base value of this modifier.
pub base_value: f64,
/// The UUID of this modifier.
pub uuid: Uuid,
}
Expand Down
135 changes: 72 additions & 63 deletions crates/valence_generated/extracted/attributes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,24 @@
{
"generic.max_health": {
"generic.armor": {
"id": 0,
"name": "generic.max_health",
"default_value": 20.0,
"translation_key": "attribute.name.generic.max_health",
"tracked": true,
"min_value": 1.0,
"max_value": 1024.0
},
"generic.follow_range": {
"id": 1,
"name": "generic.follow_range",
"default_value": 32.0,
"translation_key": "attribute.name.generic.follow_range",
"tracked": false,
"min_value": 0.0,
"max_value": 2048.0
},
"generic.knockback_resistance": {
"id": 2,
"name": "generic.knockback_resistance",
"name": "generic.armor",
"default_value": 0.0,
"translation_key": "attribute.name.generic.knockback_resistance",
"tracked": false,
"min_value": 0.0,
"max_value": 1.0
},
"generic.movement_speed": {
"id": 3,
"name": "generic.movement_speed",
"default_value": 0.699999988079071,
"translation_key": "attribute.name.generic.movement_speed",
"translation_key": "attribute.name.generic.armor",
"tracked": true,
"min_value": 0.0,
"max_value": 1024.0
"max_value": 30.0
},
"generic.flying_speed": {
"id": 4,
"name": "generic.flying_speed",
"default_value": 0.4000000059604645,
"translation_key": "attribute.name.generic.flying_speed",
"generic.armor_toughness": {
"id": 1,
"name": "generic.armor_toughness",
"default_value": 0.0,
"translation_key": "attribute.name.generic.armor_toughness",
"tracked": true,
"min_value": 0.0,
"max_value": 1024.0
"max_value": 20.0
},
"generic.attack_damage": {
"id": 5,
"id": 2,
"name": "generic.attack_damage",
"default_value": 2.0,
"translation_key": "attribute.name.generic.attack_damage",
Expand All @@ -54,7 +27,7 @@
"max_value": 2048.0
},
"generic.attack_knockback": {
"id": 6,
"id": 3,
"name": "generic.attack_knockback",
"default_value": 0.0,
"translation_key": "attribute.name.generic.attack_knockback",
Expand All @@ -63,57 +36,93 @@
"max_value": 5.0
},
"generic.attack_speed": {
"id": 7,
"id": 4,
"name": "generic.attack_speed",
"default_value": 4.0,
"translation_key": "attribute.name.generic.attack_speed",
"tracked": true,
"min_value": 0.0,
"max_value": 1024.0
},
"generic.armor": {
"id": 8,
"name": "generic.armor",
"default_value": 0.0,
"translation_key": "attribute.name.generic.armor",
"generic.flying_speed": {
"id": 5,
"name": "generic.flying_speed",
"default_value": 0.4000000059604645,
"translation_key": "attribute.name.generic.flying_speed",
"tracked": true,
"min_value": 0.0,
"max_value": 30.0
"max_value": 1024.0
},
"generic.armor_toughness": {
"id": 9,
"name": "generic.armor_toughness",
"default_value": 0.0,
"translation_key": "attribute.name.generic.armor_toughness",
"generic.follow_range": {
"id": 6,
"name": "generic.follow_range",
"default_value": 32.0,
"translation_key": "attribute.name.generic.follow_range",
"tracked": false,
"min_value": 0.0,
"max_value": 2048.0
},
"horse.jump_strength": {
"id": 7,
"name": "horse.jump_strength",
"default_value": 0.7,
"translation_key": "attribute.name.horse.jump_strength",
"tracked": true,
"min_value": 0.0,
"max_value": 20.0
"max_value": 2.0
},
"generic.knockback_resistance": {
"id": 8,
"name": "generic.knockback_resistance",
"default_value": 0.0,
"translation_key": "attribute.name.generic.knockback_resistance",
"tracked": false,
"min_value": 0.0,
"max_value": 1.0
},
"generic.luck": {
"id": 10,
"id": 9,
"name": "generic.luck",
"default_value": 0.0,
"translation_key": "attribute.name.generic.luck",
"tracked": true,
"min_value": -1024.0,
"max_value": 1024.0
},
"zombie.spawn_reinforcements": {
"generic.max_absorption": {
"id": 10,
"name": "generic.max_absorption",
"default_value": 0.0,
"translation_key": "attribute.name.generic.max_absorption",
"tracked": true,
"min_value": 0.0,
"max_value": 2048.0
},
"generic.max_health": {
"id": 11,
"name": "generic.max_health",
"default_value": 20.0,
"translation_key": "attribute.name.generic.max_health",
"tracked": true,
"min_value": 1.0,
"max_value": 1024.0
},
"generic.movement_speed": {
"id": 12,
"name": "generic.movement_speed",
"default_value": 0.699999988079071,
"translation_key": "attribute.name.generic.movement_speed",
"tracked": true,
"min_value": 0.0,
"max_value": 1024.0
},
"zombie.spawn_reinforcements": {
"id": 13,
"name": "zombie.spawn_reinforcements",
"default_value": 0.0,
"translation_key": "attribute.name.zombie.spawn_reinforcements",
"tracked": false,
"min_value": 0.0,
"max_value": 1.0
},
"horse.jump_strength": {
"id": 12,
"name": "horse.jump_strength",
"default_value": 0.7,
"translation_key": "attribute.name.horse.jump_strength",
"tracked": true,
"min_value": 0.0,
"max_value": 2.0
}
}
Loading
Loading