Skip to content

Commit d439d5e

Browse files
committed
chore: next round of fixes
1 parent 9e9f1b5 commit d439d5e

61 files changed

Lines changed: 3746 additions & 1008 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

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

assets/entities.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

crates/pumpkin-data/src/blocks.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@ impl FromResourceLocation for &'static Block {
123123
}
124124

125125
impl Block {
126+
#[must_use]
127+
pub const fn get_speed_factor(&self) -> f32 {
128+
self.velocity_multiplier
129+
}
130+
131+
#[must_use]
132+
pub const fn get_jump_velocity_multiplier(&self) -> f32 {
133+
self.jump_velocity_multiplier
134+
}
135+
126136
pub(crate) fn shape_offset_delta(&self, pos: &BlockPos) -> Vector3<f64> {
127137
let Some(shape_offset) = self.shape_offset() else {
128138
return Vector3::new(0.0, 0.0, 0.0);

crates/pumpkin-data/src/generated/configured_features_generated.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,13 +1541,21 @@ fn build_configured_features()
15411541
map.insert(
15421542
pumpkin_data::configured_feature::ConfiguredFeature::EndGatewayDelayed,
15431543
ConfiguredFeature::EndGateway(
1544-
crate::generation::feature::features::end_gateway::EndGatewayFeature {},
1544+
crate::generation::feature::features::end_gateway::EndGatewayFeature {
1545+
exit: None,
1546+
exact: false,
1547+
},
15451548
),
15461549
);
15471550
map.insert(
15481551
pumpkin_data::configured_feature::ConfiguredFeature::EndGatewayReturn,
15491552
ConfiguredFeature::EndGateway(
1550-
crate::generation::feature::features::end_gateway::EndGatewayFeature {},
1553+
crate::generation::feature::features::end_gateway::EndGatewayFeature {
1554+
exit: Some(pumpkin_util::math::position::BlockPos::new(
1555+
100i32, 50i32, 0i32,
1556+
)),
1557+
exact: true,
1558+
},
15511559
),
15521560
);
15531561
map.insert(

crates/pumpkin-data/src/generated/entity_type.rs

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6550,7 +6550,44 @@ impl EntityType {
65506550
};
65516551
pub const PLAYER: EntityType = EntityType {
65526552
id: 156,
6553-
attributes: &[],
6553+
attributes: &[
6554+
(Attributes::AIR_DRAG_MODIFIER, 1f64),
6555+
(Attributes::ARMOR, 0f64),
6556+
(Attributes::ARMOR_TOUGHNESS, 0f64),
6557+
(Attributes::ATTACK_DAMAGE, 1f64),
6558+
(Attributes::ATTACK_KNOCKBACK, 0f64),
6559+
(Attributes::ATTACK_SPEED, 4f64),
6560+
(Attributes::BELOW_NAME_DISTANCE, 10f64),
6561+
(Attributes::BLOCK_BREAK_SPEED, 1f64),
6562+
(Attributes::BLOCK_INTERACTION_RANGE, 4.5f64),
6563+
(Attributes::BOUNCINESS, 0f64),
6564+
(Attributes::BURNING_TIME, 1f64),
6565+
(Attributes::CAMERA_DISTANCE, 4f64),
6566+
(Attributes::EXPLOSION_KNOCKBACK_RESISTANCE, 0f64),
6567+
(Attributes::ENTITY_INTERACTION_RANGE, 3f64),
6568+
(Attributes::FALL_DAMAGE_MULTIPLIER, 1f64),
6569+
(Attributes::FRICTION_MODIFIER, 1f64),
6570+
(Attributes::GRAVITY, 0.08f64),
6571+
(Attributes::JUMP_STRENGTH, 0.41999998688697815f64),
6572+
(Attributes::KNOCKBACK_RESISTANCE, 0f64),
6573+
(Attributes::LUCK, 0f64),
6574+
(Attributes::MAX_ABSORPTION, 0f64),
6575+
(Attributes::MAX_HEALTH, 20f64),
6576+
(Attributes::MINING_EFFICIENCY, 0f64),
6577+
(Attributes::MOVEMENT_EFFICIENCY, 0f64),
6578+
(Attributes::MOVEMENT_SPEED, 0.1f64),
6579+
(Attributes::NAME_TAG_DISTANCE, 64f64),
6580+
(Attributes::OXYGEN_BONUS, 0f64),
6581+
(Attributes::SAFE_FALL_DISTANCE, 3f64),
6582+
(Attributes::SCALE, 1f64),
6583+
(Attributes::SNEAKING_SPEED, 0.3f64),
6584+
(Attributes::STEP_HEIGHT, 0.6f64),
6585+
(Attributes::SUBMERGED_MINING_SPEED, 0.2f64),
6586+
(Attributes::SWEEPING_DAMAGE_RATIO, 0f64),
6587+
(Attributes::WATER_MOVEMENT_EFFICIENCY, 0f64),
6588+
(Attributes::WAYPOINT_TRANSMIT_RANGE, 0f64),
6589+
(Attributes::WAYPOINT_RECEIVE_RANGE, 0f64),
6590+
],
65546591
experience_reward: 0u32,
65556592
hurt_sound: None,
65566593
attackable: None,

crates/pumpkin-data/src/generated/item.rs

Lines changed: 76 additions & 76 deletions
Large diffs are not rendered by default.

crates/pumpkin-data/src/generated/registry.rs

Lines changed: 17 additions & 17 deletions
Large diffs are not rendered by default.

crates/pumpkin-protocol/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pumpkin-world.workspace = true
1919
pumpkin-util.workspace = true
2020
serde = { workspace = true, features = ["derive"] }
2121
serde_json.workspace = true
22+
cesu8.workspace = true
2223

2324
uuid.workspace = true
2425
thiserror.workspace = true

0 commit comments

Comments
 (0)