cleanup some azalea-client tests

16 files changed, 44 insertions, 216 deletions

diff --git a/azalea-client/src/test_utils/simulation.rs b/azalea-client/src/test_utils/simulation.rs
index 4eff4454..1fcc80b0 100644
--- a/azalea-client/src/test_utils/simulation.rs
+++ b/azalea-client/src/test_utils/simulation.rs
@@ -128,7 +128,7 @@ impl Simulation {
         self.app.world().get::<T>(self.entity).is_some()
     }
     pub fn with_component<T: Component>(&self, f: impl FnOnce(&T)) {
-        f(&mut self.app.world().entity(self.entity).get::<T>().unwrap());
+        f(self.app.world().entity(self.entity).get::<T>().unwrap());
     }
     pub fn with_component_mut<T: Component<Mutability = Mutable>>(
         &mut self,
diff --git a/azalea-client/tests/correct_movement.rs b/azalea-client/tests/correct_movement.rs
index c20fdb85..52682bbb 100644
--- a/azalea-client/tests/correct_movement.rs
+++ b/azalea-client/tests/correct_movement.rs
@@ -1,50 +1,26 @@
 use azalea_client::{StartWalkEvent, WalkDirection, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos, Vec3};
 use azalea_entity::LookDirection;
 use azalea_protocol::{
     common::movements::{MoveFlags, PositionMoveRotation, RelativeMovements},
     packets::{
         ConnectionProtocol,
-        config::{ClientboundFinishConfiguration, ClientboundRegistryData},
         game::{
             ClientboundBlockUpdate, ClientboundPlayerPosition, ClientboundSetChunkCacheCenter,
             ServerboundGamePacket, ServerboundMovePlayerPos,
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
-use simdnbt::owned::{NbtCompound, NbtTag};
+use azalea_registry::Block;
 
 #[test]
 fn test_correct_movement() {
     init_tracing();
 
-    let mut simulation = Simulation::new(ConnectionProtocol::Configuration);
+    let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
 
-    simulation.receive_packet(ClientboundRegistryData {
-        registry_id: ResourceLocation::new("minecraft:dimension_type"),
-        entries: vec![(
-            ResourceLocation::new("minecraft:overworld"),
-            Some(NbtCompound::from_values(vec![
-                ("height".into(), NbtTag::Int(384)),
-                ("min_y".into(), NbtTag::Int(-64)),
-            ])),
-        )]
-        .into_iter()
-        .collect(),
-    });
-    simulation.tick();
-    simulation.receive_packet(ClientboundFinishConfiguration);
-    simulation.tick();
-
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     sent_packets.expect_tick_end();
diff --git a/azalea-client/tests/correct_sneak_movement.rs b/azalea-client/tests/correct_sneak_movement.rs
index 9a9e8f4f..c486ac0a 100644
--- a/azalea-client/tests/correct_sneak_movement.rs
+++ b/azalea-client/tests/correct_sneak_movement.rs
@@ -1,8 +1,5 @@
 use azalea_client::{PhysicsState, StartWalkEvent, WalkDirection, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos, Vec3};
 use azalea_entity::LookDirection;
 use azalea_protocol::{
     common::movements::{PositionMoveRotation, RelativeMovements},
@@ -14,7 +11,7 @@ use azalea_protocol::{
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 
 #[test]
 fn test_correct_sneak_movement() {
@@ -23,10 +20,7 @@ fn test_correct_sneak_movement() {
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
 
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     sent_packets.expect_tick_end();
diff --git a/azalea-client/tests/correct_sprint_sneak_movement.rs b/azalea-client/tests/correct_sprint_sneak_movement.rs
index 5b26a8a3..10ff29ad 100644
--- a/azalea-client/tests/correct_sprint_sneak_movement.rs
+++ b/azalea-client/tests/correct_sprint_sneak_movement.rs
@@ -1,50 +1,26 @@
 use azalea_client::{PhysicsState, SprintDirection, StartSprintEvent, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos, Vec3};
 use azalea_entity::LookDirection;
 use azalea_protocol::{
     common::movements::{PositionMoveRotation, RelativeMovements},
     packets::{
         ConnectionProtocol,
-        config::{ClientboundFinishConfiguration, ClientboundRegistryData},
         game::{
             ClientboundBlockUpdate, ClientboundPlayerPosition, ServerboundGamePacket,
             ServerboundPlayerInput,
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
-use simdnbt::owned::{NbtCompound, NbtTag};
+use azalea_registry::Block;
 
 #[test]
 fn test_correct_sprint_sneak_movement() {
     init_tracing();
 
-    let mut simulation = Simulation::new(ConnectionProtocol::Configuration);
+    let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
 
-    simulation.receive_packet(ClientboundRegistryData {
-        registry_id: ResourceLocation::new("minecraft:dimension_type"),
-        entries: vec![(
-            ResourceLocation::new("minecraft:overworld"),
-            Some(NbtCompound::from_values(vec![
-                ("height".into(), NbtTag::Int(384)),
-                ("min_y".into(), NbtTag::Int(-64)),
-            ])),
-        )]
-        .into_iter()
-        .collect(),
-    });
-    simulation.tick();
-    simulation.receive_packet(ClientboundFinishConfiguration);
-    simulation.tick();
-
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     sent_packets.expect_tick_end();
diff --git a/azalea-client/tests/mine_block_rollback.rs b/azalea-client/tests/mine_block_rollback.rs
index e9b46d13..edbd1741 100644
--- a/azalea-client/tests/mine_block_rollback.rs
+++ b/azalea-client/tests/mine_block_rollback.rs
@@ -1,23 +1,17 @@
 use azalea_client::{mining::StartMiningBlockEvent, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos};
 use azalea_protocol::packets::{
     ConnectionProtocol,
     game::{ClientboundBlockChangedAck, ClientboundBlockUpdate},
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 
 #[test]
 fn test_mine_block_rollback() {
     init_tracing();
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
diff --git a/azalea-client/tests/mine_block_timing.rs b/azalea-client/tests/mine_block_timing.rs
index 45648a83..920f3a84 100644
--- a/azalea-client/tests/mine_block_timing.rs
+++ b/azalea-client/tests/mine_block_timing.rs
@@ -2,7 +2,6 @@ use azalea_client::{mining::StartMiningBlockEvent, test_utils::prelude::*};
 use azalea_core::{
     direction::Direction,
     position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
 };
 use azalea_entity::LookDirection;
 use azalea_protocol::{
@@ -16,7 +15,7 @@ use azalea_protocol::{
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 
 #[test]
 fn test_mine_block_timing() {
@@ -24,10 +23,7 @@ fn test_mine_block_timing() {
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
diff --git a/azalea-client/tests/mine_block_without_rollback.rs b/azalea-client/tests/mine_block_without_rollback.rs
index 02fb1a77..cf6b5a5c 100644
--- a/azalea-client/tests/mine_block_without_rollback.rs
+++ b/azalea-client/tests/mine_block_without_rollback.rs
@@ -1,23 +1,17 @@
 use azalea_client::{mining::StartMiningBlockEvent, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos};
 use azalea_protocol::packets::{
     ConnectionProtocol,
     game::{ClientboundBlockChangedAck, ClientboundBlockUpdate},
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 
 #[test]
 fn test_mine_block_without_rollback() {
     init_tracing();
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
diff --git a/azalea-client/tests/move_and_despawn_entity.rs b/azalea-client/tests/move_and_despawn_entity.rs
index d8298ff2..c05c3f0e 100644
--- a/azalea-client/tests/move_and_despawn_entity.rs
+++ b/azalea-client/tests/move_and_despawn_entity.rs
@@ -1,8 +1,5 @@
 use azalea_client::test_utils::prelude::*;
-use azalea_core::{
-    position::{ChunkPos, Vec3},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{ChunkPos, Vec3};
 use azalea_protocol::{
     common::movements::{PositionMoveRotation, RelativeMovements},
     packets::{
@@ -10,7 +7,7 @@ use azalea_protocol::{
         game::{ClientboundRemoveEntities, ClientboundTeleportEntity},
     },
 };
-use azalea_registry::{DataRegistry, DimensionType, EntityKind};
+use azalea_registry::EntityKind;
 use azalea_world::MinecraftEntityId;
 
 #[test]
@@ -18,10 +15,7 @@ fn test_move_and_despawn_entity() {
     init_tracing();
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
diff --git a/azalea-client/tests/move_despawned_entity.rs b/azalea-client/tests/move_despawned_entity.rs
index 8c33566b..8407bfe1 100644
--- a/azalea-client/tests/move_despawned_entity.rs
+++ b/azalea-client/tests/move_despawned_entity.rs
@@ -1,8 +1,8 @@
 use azalea_client::test_utils::prelude::*;
-use azalea_core::{position::ChunkPos, resource_location::ResourceLocation};
+use azalea_core::position::ChunkPos;
 use azalea_entity::metadata::Cow;
 use azalea_protocol::packets::{ConnectionProtocol, game::ClientboundMoveEntityRot};
-use azalea_registry::{DataRegistry, DimensionType, EntityKind};
+use azalea_registry::EntityKind;
 use azalea_world::MinecraftEntityId;
 use bevy_ecs::query::With;
 use tracing::Level;
@@ -12,10 +12,7 @@ fn test_move_despawned_entity() {
     init_tracing_with_level(Level::ERROR); // a warning is expected here
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
@@ -29,10 +26,7 @@ fn test_move_despawned_entity() {
     assert_eq!(cow_iter.count(), 1, "cow should be spawned");
 
     // despawn the cow by receiving a login packet
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     // make sure it's despawned
diff --git a/azalea-client/tests/packet_order.rs b/azalea-client/tests/packet_order.rs
index f9e3f43b..1fd01934 100644
--- a/azalea-client/tests/packet_order.rs
+++ b/azalea-client/tests/packet_order.rs
@@ -1,50 +1,26 @@
 use azalea_client::{SprintDirection, StartSprintEvent, test_utils::prelude::*};
-use azalea_core::{
-    position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
-};
+use azalea_core::position::{BlockPos, ChunkPos, Vec3};
 use azalea_entity::LookDirection;
 use azalea_protocol::{
     common::movements::{MoveFlags, PositionMoveRotation, RelativeMovements},
     packets::{
         ConnectionProtocol,
-        config::{ClientboundFinishConfiguration, ClientboundRegistryData},
         game::{
             ClientboundBlockUpdate, ClientboundPlayerPosition, ServerboundAcceptTeleportation,
             ServerboundGamePacket, ServerboundMovePlayerPosRot, ServerboundMovePlayerStatusOnly,
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
-use simdnbt::owned::{NbtCompound, NbtTag};
+use azalea_registry::Block;
 
 #[test]
 fn test_packet_order() {
     init_tracing();
 
-    let mut simulation = Simulation::new(ConnectionProtocol::Configuration);
+    let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
 
-    simulation.receive_packet(ClientboundRegistryData {
-        registry_id: ResourceLocation::new("minecraft:dimension_type"),
-        entries: vec![(
-            ResourceLocation::new("minecraft:overworld"),
-            Some(NbtCompound::from_values(vec![
-                ("height".into(), NbtTag::Int(384)),
-                ("min_y".into(), NbtTag::Int(-64)),
-            ])),
-        )]
-        .into_iter()
-        .collect(),
-    });
-    simulation.tick();
-    simulation.receive_packet(ClientboundFinishConfiguration);
-    simulation.tick();
-
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     sent_packets.expect_tick_end();
diff --git a/azalea-client/tests/packet_order_set_carried_item.rs b/azalea-client/tests/packet_order_set_carried_item.rs
index 358b7b73..18a75fc5 100644
--- a/azalea-client/tests/packet_order_set_carried_item.rs
+++ b/azalea-client/tests/packet_order_set_carried_item.rs
@@ -4,7 +4,6 @@ use azalea_client::{
 use azalea_core::{
     direction::Direction,
     position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
 };
 use azalea_entity::LookDirection;
 use azalea_protocol::{
@@ -18,7 +17,7 @@ use azalea_protocol::{
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 
 #[test]
 fn test_packet_order_set_carried_item() {
@@ -26,10 +25,7 @@ fn test_packet_order_set_carried_item() {
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("azalea:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
 
     simulation.receive_packet(make_basic_empty_chunk(ChunkPos::new(0, 0), (384 + 64) / 16));
     simulation.tick();
diff --git a/azalea-client/tests/receive_spawn_entity_and_start_config_packet.rs b/azalea-client/tests/receive_spawn_entity_and_start_config_packet.rs
index 8e14f731..5acb5f0b 100644
--- a/azalea-client/tests/receive_spawn_entity_and_start_config_packet.rs
+++ b/azalea-client/tests/receive_spawn_entity_and_start_config_packet.rs
@@ -1,10 +1,10 @@
 use azalea_client::{InConfigState, test_utils::prelude::*};
-use azalea_core::{position::Vec3, resource_location::ResourceLocation};
+use azalea_core::position::Vec3;
 use azalea_protocol::packets::{
     ConnectionProtocol,
     game::{ClientboundAddEntity, ClientboundStartConfiguration},
 };
-use azalea_registry::{DataRegistry, DimensionType, EntityKind};
+use azalea_registry::EntityKind;
 use azalea_world::InstanceName;
 use uuid::Uuid;
 
@@ -13,10 +13,7 @@ fn test_receive_spawn_entity_and_start_config_packet() {
     init_tracing();
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
     assert!(simulation.has_component::<InstanceName>());
     simulation.tick();
diff --git a/azalea-client/tests/receive_start_config_packet.rs b/azalea-client/tests/receive_start_config_packet.rs
index 485204e4..fb847769 100644
--- a/azalea-client/tests/receive_start_config_packet.rs
+++ b/azalea-client/tests/receive_start_config_packet.rs
@@ -1,7 +1,5 @@
 use azalea_client::{InConfigState, packet::game::SendPacketEvent, test_utils::prelude::*};
-use azalea_core::resource_location::ResourceLocation;
 use azalea_protocol::packets::{ConnectionProtocol, game::ClientboundStartConfiguration};
-use azalea_registry::{DataRegistry, DimensionType};
 use azalea_world::InstanceName;
 use bevy_ecs::event::Events;
 
@@ -10,10 +8,7 @@ fn test_receive_start_config_packet() {
     init_tracing();
 
     let mut simulation = Simulation::new(ConnectionProtocol::Game);
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0),
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
     assert!(simulation.has_component::<InstanceName>());
     simulation.tick();
diff --git a/azalea-client/tests/set_health_before_login.rs b/azalea-client/tests/set_health_before_login.rs
index 60735781..367bd10c 100644
--- a/azalea-client/tests/set_health_before_login.rs
+++ b/azalea-client/tests/set_health_before_login.rs
@@ -6,7 +6,6 @@ use azalea_protocol::packets::{
     config::{ClientboundFinishConfiguration, ClientboundRegistryData},
     game::ClientboundSetHealth,
 };
-use azalea_registry::{DataRegistry, DimensionType};
 use simdnbt::owned::{NbtCompound, NbtTag};
 
 #[test]
@@ -43,10 +42,7 @@ fn test_set_health_before_login() {
     simulation.tick();
     assert_eq!(*simulation.component::<Health>(), 15.);
 
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     // health should stay the same
diff --git a/azalea-client/tests/teleport_movement.rs b/azalea-client/tests/teleport_movement.rs
index a03e730c..f8f747b0 100644
--- a/azalea-client/tests/teleport_movement.rs
+++ b/azalea-client/tests/teleport_movement.rs
@@ -2,14 +2,12 @@ use azalea_client::test_utils::prelude::*;
 use azalea_core::{
     delta::PositionDelta8,
     position::{BlockPos, ChunkPos, Vec3},
-    resource_location::ResourceLocation,
 };
 use azalea_entity::LookDirection;
 use azalea_protocol::{
     common::movements::{MoveFlags, PositionMoveRotation, RelativeMovements},
     packets::{
         ConnectionProtocol,
-        config::{ClientboundFinishConfiguration, ClientboundRegistryData},
         game::{
             ClientboundBlockUpdate, ClientboundForgetLevelChunk, ClientboundPing,
             ClientboundPlayerPosition, ClientboundSetChunkCacheCenter, ClientboundSetEntityMotion,
@@ -17,37 +15,17 @@ use azalea_protocol::{
         },
     },
 };
-use azalea_registry::{Block, DataRegistry, DimensionType};
+use azalea_registry::Block;
 use azalea_world::MinecraftEntityId;
-use simdnbt::owned::{NbtCompound, NbtTag};
 
 #[test]
 fn test_teleport_movement() {
     init_tracing();
 
-    let mut simulation = Simulation::new(ConnectionProtocol::Configuration);
+    let mut simulation = Simulation::new(ConnectionProtocol::Game);
     let sent_packets = SentPackets::new(&mut simulation);
 
-    simulation.receive_packet(ClientboundRegistryData {
-        registry_id: ResourceLocation::new("minecraft:dimension_type"),
-        entries: vec![(
-            ResourceLocation::new("minecraft:overworld"),
-            Some(NbtCompound::from_values(vec![
-                ("height".into(), NbtTag::Int(384)),
-                ("min_y".into(), NbtTag::Int(-64)),
-            ])),
-        )]
-        .into_iter()
-        .collect(),
-    });
-    simulation.tick();
-    simulation.receive_packet(ClientboundFinishConfiguration);
-    simulation.tick();
-
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     sent_packets.expect_tick_end();
diff --git a/azalea-client/tests/ticks_alive.rs b/azalea-client/tests/ticks_alive.rs
index 1ce8adad..f2081002 100644
--- a/azalea-client/tests/ticks_alive.rs
+++ b/azalea-client/tests/ticks_alive.rs
@@ -1,43 +1,15 @@
 use azalea_client::{test_utils::prelude::*, tick_counter::TicksConnected};
-use azalea_core::resource_location::ResourceLocation;
-use azalea_protocol::packets::{
-    ConnectionProtocol,
-    config::{ClientboundFinishConfiguration, ClientboundRegistryData},
-};
-use azalea_registry::{DataRegistry, DimensionType};
-use simdnbt::owned::{NbtCompound, NbtTag};
+use azalea_protocol::packets::ConnectionProtocol;
 
 #[test]
 fn counter_increments_and_resets_on_disconnect() {
     init_tracing();
 
-    let mut simulation = Simulation::new(ConnectionProtocol::Configuration);
-
-    simulation.receive_packet(ClientboundRegistryData {
-        registry_id: ResourceLocation::new("minecraft:dimension_type"),
-        entries: vec![(
-            ResourceLocation::new("minecraft:overworld"),
-            Some(NbtCompound::from_values(vec![
-                ("height".into(), NbtTag::Int(384)),
-                ("min_y".into(), NbtTag::Int(-64)),
-            ])),
-        )]
-        .into_iter()
-        .collect(),
-    });
-
-    simulation.receive_packet(ClientboundFinishConfiguration);
-
-    simulation.tick();
-    // we need a second tick to handle the state switch properly
+    let mut simulation = Simulation::new(ConnectionProtocol::Game);
     simulation.tick();
 
     assert!(!simulation.has_component::<TicksConnected>());
-
-    simulation.receive_packet(make_basic_login_packet(
-        DimensionType::new_raw(0), // overworld
-        ResourceLocation::new("minecraft:overworld"),
-    ));
+    simulation.receive_packet(default_login_packet());
     simulation.tick();
 
     assert!(simulation.has_component::<TicksConnected>());