diff --git a/Cargo.lock b/Cargo.lock
index 78a5f24..514aa75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -242,21 +242,20 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.16"
+version = "0.9.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
+checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.17"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
+checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
 dependencies = [
  "cfg-if",
 ]
@@ -312,7 +311,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -499,18 +498,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "miniz_oxide"
@@ -523,13 +513,13 @@ dependencies = [
 
 [[package]]
 name = "no-panic"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf98081e1af7145ec0f77baf9ec845903ccb6ae4a8b1e881265d5487f37f90a2"
+checksum = "fc56831a2ae584dc43a8b0b33f496e71fb4d43cf8c1c0a3fd932e6340bea1f81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -650,9 +640,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -704,7 +694,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.7.5",
  "structmeta",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -787,18 +777,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -926,22 +916,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -957,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -968,13 +958,13 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -988,9 +978,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
 
 [[package]]
 name = "smallvec"
@@ -1028,7 +1018,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -1039,7 +1029,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -1055,9 +1045,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.42"
+version = "2.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8"
+checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1148,22 +1138,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.51"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.51"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -1222,7 +1212,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
 ]
 
 [[package]]
@@ -1319,7 +1309,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
  "wasm-bindgen-shared",
 ]
 
@@ -1341,7 +1331,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.47",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1461,9 +1451,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "winnow"
-version = "0.5.30"
+version = "0.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5"
+checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6"
 dependencies = [
  "memchr",
 ]
diff --git a/src/demo/data/mod.rs b/src/demo/data/mod.rs
index d2d2372..35a31f4 100644
--- a/src/demo/data/mod.rs
+++ b/src/demo/data/mod.rs
@@ -1,11 +1,11 @@
 pub mod userinfo;
 
 use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, Endianness};
+use parse_display::Display;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::cmp::Ordering;
 use std::fmt::{Debug, Display, Formatter};
 use std::ops::{Add, Sub};
-use parse_display::Display;
 
 pub use userinfo::UserInfo;
 
diff --git a/src/demo/gameevent_gen.rs b/src/demo/gameevent_gen.rs
index 2798161..5785254 100644
--- a/src/demo/gameevent_gen.rs
+++ b/src/demo/gameevent_gen.rs
@@ -1,9 +1,9 @@
 use super::gamevent::{EventValue, GameEventDefinition, GameEventEntry, RawGameEvent};
+use crate::demo::data::MaybeUtf8String;
 use crate::demo::Stream;
 use crate::{ParseError, Result};
-use bitbuffer::{BitRead, LittleEndian, BitWrite, BitWriteStream};
+use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
 use serde::{Deserialize, Serialize};
-use crate::demo::data::MaybeUtf8String;
 fn read_value<'a, T: EventValue + BitRead<'a, LittleEndian> + Default>(
     stream: &mut Stream<'a>,
     entry: Option<&GameEventEntry>,
@@ -132,9 +132,7 @@ impl ServerAddBanEvent {
         Ok(ServerAddBanEvent {
             name: read_value::<MaybeUtf8String>(stream, iter.next(), "name")?,
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             ip: read_value::<MaybeUtf8String>(stream, iter.next(), "ip")?,
             duration: read_value::<MaybeUtf8String>(stream, iter.next(), "duration")?,
             by: read_value::<MaybeUtf8String>(stream, iter.next(), "by")?,
@@ -154,9 +152,7 @@ impl ServerRemoveBanEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(ServerRemoveBanEvent {
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             ip: read_value::<MaybeUtf8String>(stream, iter.next(), "ip")?,
             by: read_value::<MaybeUtf8String>(stream, iter.next(), "by")?,
         })
@@ -180,9 +176,7 @@ impl PlayerConnectEvent {
             name: read_value::<MaybeUtf8String>(stream, iter.next(), "name")?,
             index: read_value::<u8>(stream, iter.next(), "index")?,
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             address: read_value::<MaybeUtf8String>(stream, iter.next(), "address")?,
             bot: read_value::<u16>(stream, iter.next(), "bot")?,
         })
@@ -205,9 +199,7 @@ impl PlayerConnectClientEvent {
             name: read_value::<MaybeUtf8String>(stream, iter.next(), "name")?,
             index: read_value::<u8>(stream, iter.next(), "index")?,
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             bot: read_value::<u16>(stream, iter.next(), "bot")?,
         })
     }
@@ -229,9 +221,7 @@ impl PlayerInfoEvent {
             name: read_value::<MaybeUtf8String>(stream, iter.next(), "name")?,
             index: read_value::<u8>(stream, iter.next(), "index")?,
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             bot: read_value::<bool>(stream, iter.next(), "bot")?,
         })
     }
@@ -253,9 +243,7 @@ impl PlayerDisconnectEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
             reason: read_value::<MaybeUtf8String>(stream, iter.next(), "reason")?,
             name: read_value::<MaybeUtf8String>(stream, iter.next(), "name")?,
-            network_id: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "network_id")?,
+            network_id: read_value::<MaybeUtf8String>(stream, iter.next(), "network_id")?,
             bot: read_value::<u16>(stream, iter.next(), "bot")?,
         })
     }
@@ -497,54 +485,42 @@ impl PlayerDeathEvent {
         let mut iter = definition.entries.iter();
         Ok(PlayerDeathEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
             assister: read_value::<u16>(stream, iter.next(), "assister")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
             stun_flags: read_value::<u16>(stream, iter.next(), "stun_flags")?,
             death_flags: read_value::<u16>(stream, iter.next(), "death_flags")?,
             silent_kill: read_value::<bool>(stream, iter.next(), "silent_kill")?,
-            player_penetrate_count: read_value::<
-                u16,
-            >(stream, iter.next(), "player_penetrate_count")?,
-            assister_fallback: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "assister_fallback")?,
-            kill_streak_total: read_value::<
-                u16,
-            >(stream, iter.next(), "kill_streak_total")?,
+            player_penetrate_count: read_value::<u16>(
+                stream,
+                iter.next(),
+                "player_penetrate_count",
+            )?,
+            assister_fallback: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "assister_fallback",
+            )?,
+            kill_streak_total: read_value::<u16>(stream, iter.next(), "kill_streak_total")?,
             kill_streak_wep: read_value::<u16>(stream, iter.next(), "kill_streak_wep")?,
-            kill_streak_assist: read_value::<
-                u16,
-            >(stream, iter.next(), "kill_streak_assist")?,
-            kill_streak_victim: read_value::<
-                u16,
-            >(stream, iter.next(), "kill_streak_victim")?,
+            kill_streak_assist: read_value::<u16>(stream, iter.next(), "kill_streak_assist")?,
+            kill_streak_victim: read_value::<u16>(stream, iter.next(), "kill_streak_victim")?,
             ducks_streaked: read_value::<u16>(stream, iter.next(), "ducks_streaked")?,
-            duck_streak_total: read_value::<
-                u16,
-            >(stream, iter.next(), "duck_streak_total")?,
-            duck_streak_assist: read_value::<
-                u16,
-            >(stream, iter.next(), "duck_streak_assist")?,
-            duck_streak_victim: read_value::<
-                u16,
-            >(stream, iter.next(), "duck_streak_victim")?,
+            duck_streak_total: read_value::<u16>(stream, iter.next(), "duck_streak_total")?,
+            duck_streak_assist: read_value::<u16>(stream, iter.next(), "duck_streak_assist")?,
+            duck_streak_victim: read_value::<u16>(stream, iter.next(), "duck_streak_victim")?,
             rocket_jump: read_value::<bool>(stream, iter.next(), "rocket_jump")?,
-            weapon_def_index: read_value::<
-                u32,
-            >(stream, iter.next(), "weapon_def_index")?,
+            weapon_def_index: read_value::<u32>(stream, iter.next(), "weapon_def_index")?,
             crit_type: read_value::<u16>(stream, iter.next(), "crit_type")?,
         })
     }
@@ -574,9 +550,7 @@ impl PlayerHurtEvent {
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             damage_amount: read_value::<u16>(stream, iter.next(), "damage_amount")?,
             custom: read_value::<u16>(stream, iter.next(), "custom")?,
-            show_disguised_crit: read_value::<
-                bool,
-            >(stream, iter.next(), "show_disguised_crit")?,
+            show_disguised_crit: read_value::<bool>(stream, iter.next(), "show_disguised_crit")?,
             crit: read_value::<bool>(stream, iter.next(), "crit")?,
             mini_crit: read_value::<bool>(stream, iter.next(), "mini_crit")?,
             all_see_crit: read_value::<bool>(stream, iter.next(), "all_see_crit")?,
@@ -703,9 +677,7 @@ impl PlayerHintMessageEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(PlayerHintMessageEvent {
-            hint_message: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "hint_message")?,
+            hint_message: read_value::<MaybeUtf8String>(stream, iter.next(), "hint_message")?,
         })
     }
 }
@@ -879,15 +851,9 @@ impl EntityKilledEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(EntityKilledEvent {
-            ent_index_killed: read_value::<
-                u32,
-            >(stream, iter.next(), "ent_index_killed")?,
-            ent_index_attacker: read_value::<
-                u32,
-            >(stream, iter.next(), "ent_index_attacker")?,
-            ent_index_inflictor: read_value::<
-                u32,
-            >(stream, iter.next(), "ent_index_inflictor")?,
+            ent_index_killed: read_value::<u32>(stream, iter.next(), "ent_index_killed")?,
+            ent_index_attacker: read_value::<u32>(stream, iter.next(), "ent_index_attacker")?,
+            ent_index_inflictor: read_value::<u32>(stream, iter.next(), "ent_index_inflictor")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
         })
     }
@@ -924,9 +890,11 @@ impl AchievementEventEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(AchievementEventEvent {
-            achievement_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "achievement_name")?,
+            achievement_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "achievement_name",
+            )?,
             cur_val: read_value::<u16>(stream, iter.next(), "cur_val")?,
             max_val: read_value::<u16>(stream, iter.next(), "max_val")?,
         })
@@ -1365,9 +1333,7 @@ impl CtfFlagCapturedEvent {
         let mut iter = definition.entries.iter();
         Ok(CtfFlagCapturedEvent {
             capping_team: read_value::<u16>(stream, iter.next(), "capping_team")?,
-            capping_team_score: read_value::<
-                u16,
-            >(stream, iter.next(), "capping_team_score")?,
+            capping_team_score: read_value::<u16>(stream, iter.next(), "capping_team_score")?,
         })
     }
 }
@@ -1645,9 +1611,7 @@ impl TeamPlayRoundWinEvent {
             flag_cap_limit: read_value::<u16>(stream, iter.next(), "flag_cap_limit")?,
             full_round: read_value::<u16>(stream, iter.next(), "full_round")?,
             round_time: read_value::<f32>(stream, iter.next(), "round_time")?,
-            losing_team_num_caps: read_value::<
-                u16,
-            >(stream, iter.next(), "losing_team_num_caps")?,
+            losing_team_num_caps: read_value::<u16>(stream, iter.next(), "losing_team_num_caps")?,
             was_sudden_death: read_value::<u8>(stream, iter.next(), "was_sudden_death")?,
         })
     }
@@ -1948,21 +1912,19 @@ impl TeamPlayWinPanelEvent {
             blue_score_prev: read_value::<u16>(stream, iter.next(), "blue_score_prev")?,
             red_score_prev: read_value::<u16>(stream, iter.next(), "red_score_prev")?,
             round_complete: read_value::<u16>(stream, iter.next(), "round_complete")?,
-            rounds_remaining: read_value::<
-                u16,
-            >(stream, iter.next(), "rounds_remaining")?,
+            rounds_remaining: read_value::<u16>(stream, iter.next(), "rounds_remaining")?,
             player_1: read_value::<u16>(stream, iter.next(), "player_1")?,
             player_1_points: read_value::<u16>(stream, iter.next(), "player_1_points")?,
             player_2: read_value::<u16>(stream, iter.next(), "player_2")?,
             player_2_points: read_value::<u16>(stream, iter.next(), "player_2_points")?,
             player_3: read_value::<u16>(stream, iter.next(), "player_3")?,
             player_3_points: read_value::<u16>(stream, iter.next(), "player_3_points")?,
-            kill_stream_player_1: read_value::<
-                u16,
-            >(stream, iter.next(), "kill_stream_player_1")?,
-            kill_stream_player_1_count: read_value::<
-                u16,
-            >(stream, iter.next(), "kill_stream_player_1_count")?,
+            kill_stream_player_1: read_value::<u16>(stream, iter.next(), "kill_stream_player_1")?,
+            kill_stream_player_1_count: read_value::<u16>(
+                stream,
+                iter.next(),
+                "kill_stream_player_1_count",
+            )?,
             game_over: read_value::<u8>(stream, iter.next(), "game_over")?,
         })
     }
@@ -2488,9 +2450,7 @@ impl PlayerExtinguishedEvent {
         Ok(PlayerExtinguishedEvent {
             victim: read_value::<u8>(stream, iter.next(), "victim")?,
             healer: read_value::<u8>(stream, iter.next(), "healer")?,
-            item_definition_index: read_value::<
-                u16,
-            >(stream, iter.next(), "item_definition_index")?,
+            item_definition_index: read_value::<u16>(stream, iter.next(), "item_definition_index")?,
         })
     }
 }
@@ -2826,57 +2786,33 @@ impl ArenaWinPanelEvent {
             round_complete: read_value::<u16>(stream, iter.next(), "round_complete")?,
             player_1: read_value::<u16>(stream, iter.next(), "player_1")?,
             player_1_damage: read_value::<u16>(stream, iter.next(), "player_1_damage")?,
-            player_1_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_1_healing")?,
-            player_1_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_1_lifetime")?,
+            player_1_healing: read_value::<u16>(stream, iter.next(), "player_1_healing")?,
+            player_1_lifetime: read_value::<u16>(stream, iter.next(), "player_1_lifetime")?,
             player_1_kills: read_value::<u16>(stream, iter.next(), "player_1_kills")?,
             player_2: read_value::<u16>(stream, iter.next(), "player_2")?,
             player_2_damage: read_value::<u16>(stream, iter.next(), "player_2_damage")?,
-            player_2_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_2_healing")?,
-            player_2_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_2_lifetime")?,
+            player_2_healing: read_value::<u16>(stream, iter.next(), "player_2_healing")?,
+            player_2_lifetime: read_value::<u16>(stream, iter.next(), "player_2_lifetime")?,
             player_2_kills: read_value::<u16>(stream, iter.next(), "player_2_kills")?,
             player_3: read_value::<u16>(stream, iter.next(), "player_3")?,
             player_3_damage: read_value::<u16>(stream, iter.next(), "player_3_damage")?,
-            player_3_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_3_healing")?,
-            player_3_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_3_lifetime")?,
+            player_3_healing: read_value::<u16>(stream, iter.next(), "player_3_healing")?,
+            player_3_lifetime: read_value::<u16>(stream, iter.next(), "player_3_lifetime")?,
             player_3_kills: read_value::<u16>(stream, iter.next(), "player_3_kills")?,
             player_4: read_value::<u16>(stream, iter.next(), "player_4")?,
             player_4_damage: read_value::<u16>(stream, iter.next(), "player_4_damage")?,
-            player_4_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_4_healing")?,
-            player_4_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_4_lifetime")?,
+            player_4_healing: read_value::<u16>(stream, iter.next(), "player_4_healing")?,
+            player_4_lifetime: read_value::<u16>(stream, iter.next(), "player_4_lifetime")?,
             player_4_kills: read_value::<u16>(stream, iter.next(), "player_4_kills")?,
             player_5: read_value::<u16>(stream, iter.next(), "player_5")?,
             player_5_damage: read_value::<u16>(stream, iter.next(), "player_5_damage")?,
-            player_5_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_5_healing")?,
-            player_5_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_5_lifetime")?,
+            player_5_healing: read_value::<u16>(stream, iter.next(), "player_5_healing")?,
+            player_5_lifetime: read_value::<u16>(stream, iter.next(), "player_5_lifetime")?,
             player_5_kills: read_value::<u16>(stream, iter.next(), "player_5_kills")?,
             player_6: read_value::<u16>(stream, iter.next(), "player_6")?,
             player_6_damage: read_value::<u16>(stream, iter.next(), "player_6_damage")?,
-            player_6_healing: read_value::<
-                u16,
-            >(stream, iter.next(), "player_6_healing")?,
-            player_6_lifetime: read_value::<
-                u16,
-            >(stream, iter.next(), "player_6_lifetime")?,
+            player_6_healing: read_value::<u16>(stream, iter.next(), "player_6_healing")?,
+            player_6_lifetime: read_value::<u16>(stream, iter.next(), "player_6_lifetime")?,
             player_6_kills: read_value::<u16>(stream, iter.next(), "player_6_kills")?,
         })
     }
@@ -3019,9 +2955,7 @@ impl ArrowImpactEvent {
         Ok(ArrowImpactEvent {
             attached_entity: read_value::<u16>(stream, iter.next(), "attached_entity")?,
             shooter: read_value::<u16>(stream, iter.next(), "shooter")?,
-            bone_index_attached: read_value::<
-                u16,
-            >(stream, iter.next(), "bone_index_attached")?,
+            bone_index_attached: read_value::<u16>(stream, iter.next(), "bone_index_attached")?,
             bone_position_x: read_value::<f32>(stream, iter.next(), "bone_position_x")?,
             bone_position_y: read_value::<f32>(stream, iter.next(), "bone_position_y")?,
             bone_position_z: read_value::<f32>(stream, iter.next(), "bone_position_z")?,
@@ -3044,9 +2978,7 @@ impl PlayerJaratedEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(PlayerJaratedEvent {
-            thrower_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "thrower_ent_index")?,
+            thrower_ent_index: read_value::<u8>(stream, iter.next(), "thrower_ent_index")?,
             victim_ent_index: read_value::<u8>(stream, iter.next(), "victim_ent_index")?,
         })
     }
@@ -3062,9 +2994,7 @@ impl PlayerJaratedFadeEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(PlayerJaratedFadeEvent {
-            thrower_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "thrower_ent_index")?,
+            thrower_ent_index: read_value::<u8>(stream, iter.next(), "thrower_ent_index")?,
             victim_ent_index: read_value::<u8>(stream, iter.next(), "victim_ent_index")?,
         })
     }
@@ -3080,12 +3010,8 @@ impl PlayerShieldBlockedEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(PlayerShieldBlockedEvent {
-            attacker_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "attacker_ent_index")?,
-            blocker_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "blocker_ent_index")?,
+            attacker_ent_index: read_value::<u8>(stream, iter.next(), "attacker_ent_index")?,
+            blocker_ent_index: read_value::<u8>(stream, iter.next(), "blocker_ent_index")?,
         })
     }
 }
@@ -3195,16 +3121,10 @@ impl ShowAnnotationEvent {
             id: read_value::<u32>(stream, iter.next(), "id")?,
             text: read_value::<MaybeUtf8String>(stream, iter.next(), "text")?,
             lifetime: read_value::<f32>(stream, iter.next(), "lifetime")?,
-            visibility_bit_field: read_value::<
-                u32,
-            >(stream, iter.next(), "visibility_bit_field")?,
-            follow_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "follow_ent_index")?,
+            visibility_bit_field: read_value::<u32>(stream, iter.next(), "visibility_bit_field")?,
+            follow_ent_index: read_value::<u32>(stream, iter.next(), "follow_ent_index")?,
             show_distance: read_value::<bool>(stream, iter.next(), "show_distance")?,
-            play_sound: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "play_sound")?,
+            play_sound: read_value::<MaybeUtf8String>(stream, iter.next(), "play_sound")?,
             show_effect: read_value::<bool>(stream, iter.next(), "show_effect")?,
         })
     }
@@ -3611,8 +3531,7 @@ pub struct ScoreStatsAccumulatedUpdateEvent {}
 impl ScoreStatsAccumulatedUpdateEvent {
     #[allow(unused_variables)]
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
-        Ok(ScoreStatsAccumulatedUpdateEvent {
-        })
+        Ok(ScoreStatsAccumulatedUpdateEvent {})
     }
 }
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
@@ -3738,27 +3657,27 @@ impl FishNoticeEvent {
         let mut iter = definition.entries.iter();
         Ok(FishNoticeEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
             assister: read_value::<u16>(stream, iter.next(), "assister")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
             stun_flags: read_value::<u16>(stream, iter.next(), "stun_flags")?,
             death_flags: read_value::<u16>(stream, iter.next(), "death_flags")?,
             silent_kill: read_value::<bool>(stream, iter.next(), "silent_kill")?,
-            assister_fallback: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "assister_fallback")?,
+            assister_fallback: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "assister_fallback",
+            )?,
         })
     }
 }
@@ -3786,27 +3705,27 @@ impl FishNoticeArmEvent {
         let mut iter = definition.entries.iter();
         Ok(FishNoticeArmEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
             assister: read_value::<u16>(stream, iter.next(), "assister")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
             stun_flags: read_value::<u16>(stream, iter.next(), "stun_flags")?,
             death_flags: read_value::<u16>(stream, iter.next(), "death_flags")?,
             silent_kill: read_value::<bool>(stream, iter.next(), "silent_kill")?,
-            assister_fallback: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "assister_fallback")?,
+            assister_fallback: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "assister_fallback",
+            )?,
         })
     }
 }
@@ -3834,27 +3753,27 @@ impl SlapNoticeEvent {
         let mut iter = definition.entries.iter();
         Ok(SlapNoticeEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
             assister: read_value::<u16>(stream, iter.next(), "assister")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
             stun_flags: read_value::<u16>(stream, iter.next(), "stun_flags")?,
             death_flags: read_value::<u16>(stream, iter.next(), "death_flags")?,
             silent_kill: read_value::<bool>(stream, iter.next(), "silent_kill")?,
-            assister_fallback: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "assister_fallback")?,
+            assister_fallback: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "assister_fallback",
+            )?,
         })
     }
 }
@@ -3883,27 +3802,27 @@ impl ThrowableHitEvent {
         let mut iter = definition.entries.iter();
         Ok(ThrowableHitEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
             assister: read_value::<u16>(stream, iter.next(), "assister")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
             stun_flags: read_value::<u16>(stream, iter.next(), "stun_flags")?,
             death_flags: read_value::<u16>(stream, iter.next(), "death_flags")?,
             silent_kill: read_value::<bool>(stream, iter.next(), "silent_kill")?,
-            assister_fallback: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "assister_fallback")?,
+            assister_fallback: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "assister_fallback",
+            )?,
             total_hits: read_value::<u16>(stream, iter.next(), "total_hits")?,
         })
     }
@@ -4155,12 +4074,8 @@ impl PlayerHighFiveSuccessEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(PlayerHighFiveSuccessEvent {
-            initiator_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "initiator_ent_index")?,
-            partner_ent_index: read_value::<
-                u8,
-            >(stream, iter.next(), "partner_ent_index")?,
+            initiator_ent_index: read_value::<u8>(stream, iter.next(), "initiator_ent_index")?,
+            partner_ent_index: read_value::<u8>(stream, iter.next(), "partner_ent_index")?,
         })
     }
 }
@@ -4177,9 +4092,7 @@ impl PlayerBonusPointsEvent {
         let mut iter = definition.entries.iter();
         Ok(PlayerBonusPointsEvent {
             points: read_value::<u16>(stream, iter.next(), "points")?,
-            player_ent_index: read_value::<
-                u16,
-            >(stream, iter.next(), "player_ent_index")?,
+            player_ent_index: read_value::<u16>(stream, iter.next(), "player_ent_index")?,
             source_ent_index: read_value::<u16>(stream, iter.next(), "source_ent_index")?,
         })
     }
@@ -4918,20 +4831,18 @@ impl RdRobotKilledEvent {
         let mut iter = definition.entries.iter();
         Ok(RdRobotKilledEvent {
             user_id: read_value::<u16>(stream, iter.next(), "user_id")?,
-            victim_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "victim_ent_index")?,
-            inflictor_ent_index: read_value::<
-                u32,
-            >(stream, iter.next(), "inflictor_ent_index")?,
+            victim_ent_index: read_value::<u32>(stream, iter.next(), "victim_ent_index")?,
+            inflictor_ent_index: read_value::<u32>(stream, iter.next(), "inflictor_ent_index")?,
             attacker: read_value::<u16>(stream, iter.next(), "attacker")?,
             weapon: read_value::<MaybeUtf8String>(stream, iter.next(), "weapon")?,
             weapon_id: read_value::<u16>(stream, iter.next(), "weapon_id")?,
             damage_bits: read_value::<u32>(stream, iter.next(), "damage_bits")?,
             custom_kill: read_value::<u16>(stream, iter.next(), "custom_kill")?,
-            weapon_log_class_name: read_value::<
-                MaybeUtf8String,
-            >(stream, iter.next(), "weapon_log_class_name")?,
+            weapon_log_class_name: read_value::<MaybeUtf8String>(
+                stream,
+                iter.next(),
+                "weapon_log_class_name",
+            )?,
         })
     }
 }
@@ -5208,15 +5119,9 @@ impl QuestObjectiveCompletedEvent {
     fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
         let mut iter = definition.entries.iter();
         Ok(QuestObjectiveCompletedEvent {
-            quest_item_id_low: read_value::<
-                u32,
-            >(stream, iter.next(), "quest_item_id_low")?,
-            quest_item_id_hi: read_value::<
-                u32,
-            >(stream, iter.next(), "quest_item_id_hi")?,
-            quest_objective_id: read_value::<
-                u32,
-            >(stream, iter.next(), "quest_objective_id")?,
+            quest_item_id_low: read_value::<u32>(stream, iter.next(), "quest_item_id_low")?,
+            quest_item_id_hi: read_value::<u32>(stream, iter.next(), "quest_item_id_hi")?,
+            quest_objective_id: read_value::<u32>(stream, iter.next(), "quest_objective_id")?,
             scorer_user_id: read_value::<u16>(stream, iter.next(), "scorer_user_id")?,
         })
     }
@@ -5630,9 +5535,7 @@ impl HalloweenSoulCollectedEvent {
         let mut iter = definition.entries.iter();
         Ok(HalloweenSoulCollectedEvent {
             intended_target: read_value::<u8>(stream, iter.next(), "intended_target")?,
-            collecting_player: read_value::<
-                u8,
-            >(stream, iter.next(), "collecting_player")?,
+            collecting_player: read_value::<u8>(stream, iter.next(), "collecting_player")?,
             soul_count: read_value::<u8>(stream, iter.next(), "soul_count")?,
         })
     }
@@ -5696,9 +5599,7 @@ impl DamageMitigatedEvent {
             mitigator: read_value::<u8>(stream, iter.next(), "mitigator")?,
             damaged: read_value::<u8>(stream, iter.next(), "damaged")?,
             amount: read_value::<u16>(stream, iter.next(), "amount")?,
-            item_definition_index: read_value::<
-                u16,
-            >(stream, iter.next(), "item_definition_index")?,
+            item_definition_index: read_value::<u16>(stream, iter.next(), "item_definition_index")?,
         })
     }
 }
@@ -5971,9 +5872,7 @@ impl ProtoDefChangedEvent {
         let mut iter = definition.entries.iter();
         Ok(ProtoDefChangedEvent {
             kind: read_value::<u8>(stream, iter.next(), "kind")?,
-            definition_index: read_value::<
-                u32,
-            >(stream, iter.next(), "definition_index")?,
+            definition_index: read_value::<u32>(stream, iter.next(), "definition_index")?,
             created: read_value::<bool>(stream, iter.next(), "created")?,
             deleted: read_value::<bool>(stream, iter.next(), "deleted")?,
             erase_history: read_value::<bool>(stream, iter.next(), "erase_history")?,
@@ -6066,9 +5965,11 @@ impl QuestProgressEvent {
             scorer: read_value::<u16>(stream, iter.next(), "scorer")?,
             kind: read_value::<u8>(stream, iter.next(), "kind")?,
             completed: read_value::<bool>(stream, iter.next(), "completed")?,
-            quest_definition_index: read_value::<
-                u32,
-            >(stream, iter.next(), "quest_definition_index")?,
+            quest_definition_index: read_value::<u32>(
+                stream,
+                iter.next(),
+                "quest_definition_index",
+            )?,
         })
     }
 }
@@ -6086,9 +5987,7 @@ impl ProjectileRemovedEvent {
         let mut iter = definition.entries.iter();
         Ok(ProjectileRemovedEvent {
             attacker: read_value::<u8>(stream, iter.next(), "attacker")?,
-            weapon_def_index: read_value::<
-                u32,
-            >(stream, iter.next(), "weapon_def_index")?,
+            weapon_def_index: read_value::<u32>(stream, iter.next(), "weapon_def_index")?,
             num_hit: read_value::<u8>(stream, iter.next(), "num_hit")?,
             num_direct_hit: read_value::<u8>(stream, iter.next(), "num_direct_hit")?,
         })
@@ -7307,9 +7206,7 @@ impl GameEventType {
             "controlpoint_endtouch" => GameEventType::ControlPointEndTouch,
             "controlpoint_pulse_element" => GameEventType::ControlPointPulseElement,
             "controlpoint_fake_capture" => GameEventType::ControlPointFakeCapture,
-            "controlpoint_fake_capture_mult" => {
-                GameEventType::ControlPointFakeCaptureMultiplier
-            }
+            "controlpoint_fake_capture_mult" => GameEventType::ControlPointFakeCaptureMultiplier,
             "teamplay_round_selected" => GameEventType::TeamPlayRoundSelected,
             "teamplay_round_start" => GameEventType::TeamPlayRoundStart,
             "teamplay_round_active" => GameEventType::TeamPlayRoundActive,
@@ -7318,9 +7215,7 @@ impl GameEventType {
             "teamplay_waiting_abouttoend" => GameEventType::TeamPlayWaitingAboutToEnd,
             "teamplay_restart_round" => GameEventType::TeamPlayRestartRound,
             "teamplay_ready_restart" => GameEventType::TeamPlayReadyRestart,
-            "teamplay_round_restart_seconds" => {
-                GameEventType::TeamPlayRoundRestartSeconds
-            }
+            "teamplay_round_restart_seconds" => GameEventType::TeamPlayRoundRestartSeconds,
             "teamplay_team_ready" => GameEventType::TeamPlayTeamReady,
             "teamplay_round_win" => GameEventType::TeamPlayRoundWin,
             "teamplay_update_timer" => GameEventType::TeamPlayUpdateTimer,
@@ -7474,9 +7369,7 @@ impl GameEventType {
             "player_buyback" => GameEventType::PlayerBuyback,
             "player_used_powerup_bottle" => GameEventType::PlayerUsedPowerUpBottle,
             "christmas_gift_grab" => GameEventType::ChristmasGiftGrab,
-            "player_killed_achievement_zone" => {
-                GameEventType::PlayerKilledAchievementZone
-            }
+            "player_killed_achievement_zone" => GameEventType::PlayerKilledAchievementZone,
             "party_updated" => GameEventType::PartyUpdated,
             "party_pref_changed" => GameEventType::PartyPrefChanged,
             "party_criteria_changed" => GameEventType::PartyCriteriaChanged,
@@ -7508,9 +7401,7 @@ impl GameEventType {
             "mvm_mission_complete" => GameEventType::MvmMissionComplete,
             "mvm_bomb_reset_by_player" => GameEventType::MvmBombResetByPlayer,
             "mvm_bomb_alarm_triggered" => GameEventType::MvmBombAlarmTriggered,
-            "mvm_bomb_deploy_reset_by_player" => {
-                GameEventType::MvmBombDeployResetByPlayer
-            }
+            "mvm_bomb_deploy_reset_by_player" => GameEventType::MvmBombDeployResetByPlayer,
             "mvm_wave_failed" => GameEventType::MvmWaveFailed,
             "mvm_reset_stats" => GameEventType::MvmResetStats,
             "damage_resisted" => GameEventType::DamageResisted,
@@ -7721,9 +7612,7 @@ impl GameEventType {
             GameEventType::ControlPointEndTouch => "controlpoint_endtouch",
             GameEventType::ControlPointPulseElement => "controlpoint_pulse_element",
             GameEventType::ControlPointFakeCapture => "controlpoint_fake_capture",
-            GameEventType::ControlPointFakeCaptureMultiplier => {
-                "controlpoint_fake_capture_mult"
-            }
+            GameEventType::ControlPointFakeCaptureMultiplier => "controlpoint_fake_capture_mult",
             GameEventType::TeamPlayRoundSelected => "teamplay_round_selected",
             GameEventType::TeamPlayRoundStart => "teamplay_round_start",
             GameEventType::TeamPlayRoundActive => "teamplay_round_active",
@@ -7732,9 +7621,7 @@ impl GameEventType {
             GameEventType::TeamPlayWaitingAboutToEnd => "teamplay_waiting_abouttoend",
             GameEventType::TeamPlayRestartRound => "teamplay_restart_round",
             GameEventType::TeamPlayReadyRestart => "teamplay_ready_restart",
-            GameEventType::TeamPlayRoundRestartSeconds => {
-                "teamplay_round_restart_seconds"
-            }
+            GameEventType::TeamPlayRoundRestartSeconds => "teamplay_round_restart_seconds",
             GameEventType::TeamPlayTeamReady => "teamplay_team_ready",
             GameEventType::TeamPlayRoundWin => "teamplay_round_win",
             GameEventType::TeamPlayUpdateTimer => "teamplay_update_timer",
@@ -7888,9 +7775,7 @@ impl GameEventType {
             GameEventType::PlayerBuyback => "player_buyback",
             GameEventType::PlayerUsedPowerUpBottle => "player_used_powerup_bottle",
             GameEventType::ChristmasGiftGrab => "christmas_gift_grab",
-            GameEventType::PlayerKilledAchievementZone => {
-                "player_killed_achievement_zone"
-            }
+            GameEventType::PlayerKilledAchievementZone => "player_killed_achievement_zone",
             GameEventType::PartyUpdated => "party_updated",
             GameEventType::PartyPrefChanged => "party_pref_changed",
             GameEventType::PartyCriteriaChanged => "party_criteria_changed",
@@ -7922,9 +7807,7 @@ impl GameEventType {
             GameEventType::MvmMissionComplete => "mvm_mission_complete",
             GameEventType::MvmBombResetByPlayer => "mvm_bomb_reset_by_player",
             GameEventType::MvmBombAlarmTriggered => "mvm_bomb_alarm_triggered",
-            GameEventType::MvmBombDeployResetByPlayer => {
-                "mvm_bomb_deploy_reset_by_player"
-            }
+            GameEventType::MvmBombDeployResetByPlayer => "mvm_bomb_deploy_reset_by_player",
             GameEventType::MvmWaveFailed => "mvm_wave_failed",
             GameEventType::MvmResetStats => "mvm_reset_stats",
             GameEventType::DamageResisted => "damage_resisted",
@@ -8050,1849 +7933,1206 @@ impl GameEventType {
 }
 impl GameEvent {
     pub fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
-        Ok(
-            match definition.event_type {
-                GameEventType::ServerSpawn => {
-                    GameEvent::ServerSpawn(
-                        Box::new(<ServerSpawnEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::ServerChangeLevelFailed => {
-                    GameEvent::ServerChangeLevelFailed(
-                        ServerChangeLevelFailedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ServerShutdown => {
-                    GameEvent::ServerShutdown(
-                        ServerShutdownEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ServerCvar => {
-                    GameEvent::ServerCvar(ServerCvarEvent::read(stream, definition)?)
-                }
-                GameEventType::ServerMessage => {
-                    GameEvent::ServerMessage(
-                        ServerMessageEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ServerAddBan => {
-                    GameEvent::ServerAddBan(
-                        Box::new(<ServerAddBanEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::ServerRemoveBan => {
-                    GameEvent::ServerRemoveBan(
-                        ServerRemoveBanEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerConnect => {
-                    GameEvent::PlayerConnect(
-                        PlayerConnectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerConnectClient => {
-                    GameEvent::PlayerConnectClient(
-                        PlayerConnectClientEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerInfo => {
-                    GameEvent::PlayerInfo(PlayerInfoEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerDisconnect => {
-                    GameEvent::PlayerDisconnect(
-                        PlayerDisconnectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerActivate => {
-                    GameEvent::PlayerActivate(
-                        PlayerActivateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerSay => {
-                    GameEvent::PlayerSay(PlayerSayEvent::read(stream, definition)?)
-                }
-                GameEventType::ClientDisconnect => {
-                    GameEvent::ClientDisconnect(
-                        ClientDisconnectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ClientBeginConnect => {
-                    GameEvent::ClientBeginConnect(
-                        ClientBeginConnectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ClientConnected => {
-                    GameEvent::ClientConnected(
-                        ClientConnectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ClientFullConnect => {
-                    GameEvent::ClientFullConnect(
-                        ClientFullConnectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HostQuit => {
-                    GameEvent::HostQuit(HostQuitEvent::read(stream, definition)?)
-                }
-                GameEventType::TeamInfo => {
-                    GameEvent::TeamInfo(TeamInfoEvent::read(stream, definition)?)
-                }
-                GameEventType::TeamScore => {
-                    GameEvent::TeamScore(TeamScoreEvent::read(stream, definition)?)
-                }
-                GameEventType::TeamPlayBroadcastAudio => {
-                    GameEvent::TeamPlayBroadcastAudio(
-                        TeamPlayBroadcastAudioEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerTeam => {
-                    GameEvent::PlayerTeam(PlayerTeamEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerClass => {
-                    GameEvent::PlayerClass(PlayerClassEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerDeath => {
-                    GameEvent::PlayerDeath(
-                        Box::new(<PlayerDeathEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::PlayerHurt => {
-                    GameEvent::PlayerHurt(PlayerHurtEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerChat => {
-                    GameEvent::PlayerChat(PlayerChatEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerScore => {
-                    GameEvent::PlayerScore(PlayerScoreEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerSpawn => {
-                    GameEvent::PlayerSpawn(PlayerSpawnEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerShoot => {
-                    GameEvent::PlayerShoot(PlayerShootEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerUse => {
-                    GameEvent::PlayerUse(PlayerUseEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerChangeName => {
-                    GameEvent::PlayerChangeName(
-                        PlayerChangeNameEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHintMessage => {
-                    GameEvent::PlayerHintMessage(
-                        PlayerHintMessageEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::BasePlayerTeleported => {
-                    GameEvent::BasePlayerTeleported(
-                        BasePlayerTeleportedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::GameInit => {
-                    GameEvent::GameInit(GameInitEvent::read(stream, definition)?)
-                }
-                GameEventType::GameNewMap => {
-                    GameEvent::GameNewMap(GameNewMapEvent::read(stream, definition)?)
-                }
-                GameEventType::GameStart => {
-                    GameEvent::GameStart(GameStartEvent::read(stream, definition)?)
-                }
-                GameEventType::GameEnd => {
-                    GameEvent::GameEnd(GameEndEvent::read(stream, definition)?)
-                }
-                GameEventType::RoundStart => {
-                    GameEvent::RoundStart(RoundStartEvent::read(stream, definition)?)
-                }
-                GameEventType::RoundEnd => {
-                    GameEvent::RoundEnd(RoundEndEvent::read(stream, definition)?)
-                }
-                GameEventType::GameMessage => {
-                    GameEvent::GameMessage(GameMessageEvent::read(stream, definition)?)
-                }
-                GameEventType::BreakBreakable => {
-                    GameEvent::BreakBreakable(
-                        BreakBreakableEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::BreakProp => {
-                    GameEvent::BreakProp(BreakPropEvent::read(stream, definition)?)
-                }
-                GameEventType::EntityKilled => {
-                    GameEvent::EntityKilled(EntityKilledEvent::read(stream, definition)?)
-                }
-                GameEventType::BonusUpdated => {
-                    GameEvent::BonusUpdated(BonusUpdatedEvent::read(stream, definition)?)
-                }
-                GameEventType::AchievementEvent => {
-                    GameEvent::AchievementEvent(
-                        AchievementEventEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::AchievementIncrement => {
-                    GameEvent::AchievementIncrement(
-                        AchievementIncrementEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PhysgunPickup => {
-                    GameEvent::PhysgunPickup(
-                        PhysgunPickupEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::FlareIgniteNpc => {
-                    GameEvent::FlareIgniteNpc(
-                        FlareIgniteNpcEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HelicopterGrenadePuntMiss => {
-                    GameEvent::HelicopterGrenadePuntMiss(
-                        HelicopterGrenadePuntMissEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::UserDataDownloaded => {
-                    GameEvent::UserDataDownloaded(
-                        UserDataDownloadedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RagdollDissolved => {
-                    GameEvent::RagdollDissolved(
-                        RagdollDissolvedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVChangedMode => {
-                    GameEvent::HLTVChangedMode(
-                        HLTVChangedModeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVChangedTarget => {
-                    GameEvent::HLTVChangedTarget(
-                        HLTVChangedTargetEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::VoteEnded => {
-                    GameEvent::VoteEnded(VoteEndedEvent::read(stream, definition)?)
-                }
-                GameEventType::VoteStarted => {
-                    GameEvent::VoteStarted(VoteStartedEvent::read(stream, definition)?)
-                }
-                GameEventType::VoteChanged => {
-                    GameEvent::VoteChanged(VoteChangedEvent::read(stream, definition)?)
-                }
-                GameEventType::VotePassed => {
-                    GameEvent::VotePassed(VotePassedEvent::read(stream, definition)?)
-                }
-                GameEventType::VoteFailed => {
-                    GameEvent::VoteFailed(VoteFailedEvent::read(stream, definition)?)
-                }
-                GameEventType::VoteCast => {
-                    GameEvent::VoteCast(VoteCastEvent::read(stream, definition)?)
-                }
-                GameEventType::VoteOptions => {
-                    GameEvent::VoteOptions(
-                        Box::new(<VoteOptionsEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::ReplaySaved => {
-                    GameEvent::ReplaySaved(ReplaySavedEvent::read(stream, definition)?)
-                }
-                GameEventType::EnteredPerformanceMode => {
-                    GameEvent::EnteredPerformanceMode(
-                        EnteredPerformanceModeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::BrowseReplays => {
-                    GameEvent::BrowseReplays(
-                        BrowseReplaysEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ReplayYoutubeStats => {
-                    GameEvent::ReplayYoutubeStats(
-                        ReplayYoutubeStatsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::InventoryUpdated => {
-                    GameEvent::InventoryUpdated(
-                        InventoryUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CartUpdated => {
-                    GameEvent::CartUpdated(CartUpdatedEvent::read(stream, definition)?)
-                }
-                GameEventType::StorePriceSheetUpdated => {
-                    GameEvent::StorePriceSheetUpdated(
-                        StorePriceSheetUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EconInventoryConnected => {
-                    GameEvent::EconInventoryConnected(
-                        EconInventoryConnectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ItemSchemaInitialized => {
-                    GameEvent::ItemSchemaInitialized(
-                        ItemSchemaInitializedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::GcNewSession => {
-                    GameEvent::GcNewSession(GcNewSessionEvent::read(stream, definition)?)
-                }
-                GameEventType::GcLostSession => {
-                    GameEvent::GcLostSession(
-                        GcLostSessionEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::IntroFinish => {
-                    GameEvent::IntroFinish(IntroFinishEvent::read(stream, definition)?)
-                }
-                GameEventType::IntroNextCamera => {
-                    GameEvent::IntroNextCamera(
-                        IntroNextCameraEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerChangeClass => {
-                    GameEvent::PlayerChangeClass(
-                        PlayerChangeClassEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TfMapTimeRemaining => {
-                    GameEvent::TfMapTimeRemaining(
-                        TfMapTimeRemainingEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TfGameOver => {
-                    GameEvent::TfGameOver(TfGameOverEvent::read(stream, definition)?)
-                }
-                GameEventType::CtfFlagCaptured => {
-                    GameEvent::CtfFlagCaptured(
-                        CtfFlagCapturedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointInitialized => {
-                    GameEvent::ControlPointInitialized(
-                        ControlPointInitializedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointUpdateImages => {
-                    GameEvent::ControlPointUpdateImages(
-                        ControlPointUpdateImagesEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointUpdateLayout => {
-                    GameEvent::ControlPointUpdateLayout(
-                        ControlPointUpdateLayoutEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointUpdateCapping => {
-                    GameEvent::ControlPointUpdateCapping(
-                        ControlPointUpdateCappingEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointUpdateOwner => {
-                    GameEvent::ControlPointUpdateOwner(
-                        ControlPointUpdateOwnerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointStartTouch => {
-                    GameEvent::ControlPointStartTouch(
-                        ControlPointStartTouchEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointEndTouch => {
-                    GameEvent::ControlPointEndTouch(
-                        ControlPointEndTouchEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointPulseElement => {
-                    GameEvent::ControlPointPulseElement(
-                        ControlPointPulseElementEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointFakeCapture => {
-                    GameEvent::ControlPointFakeCapture(
-                        ControlPointFakeCaptureEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointFakeCaptureMultiplier => {
-                    GameEvent::ControlPointFakeCaptureMultiplier(
-                        ControlPointFakeCaptureMultiplierEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundSelected => {
-                    GameEvent::TeamPlayRoundSelected(
-                        TeamPlayRoundSelectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundStart => {
-                    GameEvent::TeamPlayRoundStart(
-                        TeamPlayRoundStartEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundActive => {
-                    GameEvent::TeamPlayRoundActive(
-                        TeamPlayRoundActiveEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayWaitingBegins => {
-                    GameEvent::TeamPlayWaitingBegins(
-                        TeamPlayWaitingBeginsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayWaitingEnds => {
-                    GameEvent::TeamPlayWaitingEnds(
-                        TeamPlayWaitingEndsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayWaitingAboutToEnd => {
-                    GameEvent::TeamPlayWaitingAboutToEnd(
-                        TeamPlayWaitingAboutToEndEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRestartRound => {
-                    GameEvent::TeamPlayRestartRound(
-                        TeamPlayRestartRoundEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayReadyRestart => {
-                    GameEvent::TeamPlayReadyRestart(
-                        TeamPlayReadyRestartEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundRestartSeconds => {
-                    GameEvent::TeamPlayRoundRestartSeconds(
-                        TeamPlayRoundRestartSecondsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayTeamReady => {
-                    GameEvent::TeamPlayTeamReady(
-                        TeamPlayTeamReadyEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundWin => {
-                    GameEvent::TeamPlayRoundWin(
-                        TeamPlayRoundWinEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayUpdateTimer => {
-                    GameEvent::TeamPlayUpdateTimer(
-                        TeamPlayUpdateTimerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayRoundStalemate => {
-                    GameEvent::TeamPlayRoundStalemate(
-                        TeamPlayRoundStalemateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayOvertimeBegin => {
-                    GameEvent::TeamPlayOvertimeBegin(
-                        TeamPlayOvertimeBeginEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayOvertimeEnd => {
-                    GameEvent::TeamPlayOvertimeEnd(
-                        TeamPlayOvertimeEndEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlaySuddenDeathBegin => {
-                    GameEvent::TeamPlaySuddenDeathBegin(
-                        TeamPlaySuddenDeathBeginEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlaySuddenDeathEnd => {
-                    GameEvent::TeamPlaySuddenDeathEnd(
-                        TeamPlaySuddenDeathEndEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayGameOver => {
-                    GameEvent::TeamPlayGameOver(
-                        TeamPlayGameOverEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayMapTimeRemaining => {
-                    GameEvent::TeamPlayMapTimeRemaining(
-                        TeamPlayMapTimeRemainingEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayTimerFlash => {
-                    GameEvent::TeamPlayTimerFlash(
-                        TeamPlayTimerFlashEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayTimerTimeAdded => {
-                    GameEvent::TeamPlayTimerTimeAdded(
-                        TeamPlayTimerTimeAddedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayPointStartCapture => {
-                    GameEvent::TeamPlayPointStartCapture(
-                        TeamPlayPointStartCaptureEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayPointCaptured => {
-                    GameEvent::TeamPlayPointCaptured(
-                        TeamPlayPointCapturedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayPointLocked => {
-                    GameEvent::TeamPlayPointLocked(
-                        TeamPlayPointLockedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayPointUnlocked => {
-                    GameEvent::TeamPlayPointUnlocked(
-                        TeamPlayPointUnlockedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayCaptureBroken => {
-                    GameEvent::TeamPlayCaptureBroken(
-                        TeamPlayCaptureBrokenEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayCaptureBlocked => {
-                    GameEvent::TeamPlayCaptureBlocked(
-                        TeamPlayCaptureBlockedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayFlagEvent => {
-                    GameEvent::TeamPlayFlagEvent(
-                        TeamPlayFlagEventEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayWinPanel => {
-                    GameEvent::TeamPlayWinPanel(
-                        TeamPlayWinPanelEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayTeamBalancedPlayer => {
-                    GameEvent::TeamPlayTeamBalancedPlayer(
-                        TeamPlayTeamBalancedPlayerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlaySetupFinished => {
-                    GameEvent::TeamPlaySetupFinished(
-                        TeamPlaySetupFinishedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayAlert => {
-                    GameEvent::TeamPlayAlert(
-                        TeamPlayAlertEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TrainingComplete => {
-                    GameEvent::TrainingComplete(
-                        TrainingCompleteEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ShowFreezePanel => {
-                    GameEvent::ShowFreezePanel(
-                        ShowFreezePanelEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HideFreezePanel => {
-                    GameEvent::HideFreezePanel(
-                        HideFreezePanelEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::FreezeCamStarted => {
-                    GameEvent::FreezeCamStarted(
-                        FreezeCamStartedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerChangeTeam => {
-                    GameEvent::LocalPlayerChangeTeam(
-                        LocalPlayerChangeTeamEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerScoreChanged => {
-                    GameEvent::LocalPlayerScoreChanged(
-                        LocalPlayerScoreChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerChangeClass => {
-                    GameEvent::LocalPlayerChangeClass(
-                        LocalPlayerChangeClassEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerRespawn => {
-                    GameEvent::LocalPlayerRespawn(
-                        LocalPlayerRespawnEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::BuildingInfoChanged => {
-                    GameEvent::BuildingInfoChanged(
-                        BuildingInfoChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerChangeDisguise => {
-                    GameEvent::LocalPlayerChangeDisguise(
-                        LocalPlayerChangeDisguiseEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerAccountChanged => {
-                    GameEvent::PlayerAccountChanged(
-                        PlayerAccountChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::SpyPdaReset => {
-                    GameEvent::SpyPdaReset(SpyPdaResetEvent::read(stream, definition)?)
-                }
-                GameEventType::FlagStatusUpdate => {
-                    GameEvent::FlagStatusUpdate(
-                        FlagStatusUpdateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerStatsUpdated => {
-                    GameEvent::PlayerStatsUpdated(
-                        PlayerStatsUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayingCommentary => {
-                    GameEvent::PlayingCommentary(
-                        PlayingCommentaryEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerChargeDeployed => {
-                    GameEvent::PlayerChargeDeployed(
-                        PlayerChargeDeployedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerBuiltObject => {
-                    GameEvent::PlayerBuiltObject(
-                        PlayerBuiltObjectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerUpgradedObject => {
-                    GameEvent::PlayerUpgradedObject(
-                        PlayerUpgradedObjectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerCarryObject => {
-                    GameEvent::PlayerCarryObject(
-                        PlayerCarryObjectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerDropObject => {
-                    GameEvent::PlayerDropObject(
-                        PlayerDropObjectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ObjectRemoved => {
-                    GameEvent::ObjectRemoved(
-                        ObjectRemovedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ObjectDestroyed => {
-                    GameEvent::ObjectDestroyed(
-                        ObjectDestroyedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ObjectDetonated => {
-                    GameEvent::ObjectDetonated(
-                        ObjectDetonatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::AchievementEarned => {
-                    GameEvent::AchievementEarned(
-                        AchievementEarnedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::SpecTargetUpdated => {
-                    GameEvent::SpecTargetUpdated(
-                        SpecTargetUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TournamentStateUpdate => {
-                    GameEvent::TournamentStateUpdate(
-                        TournamentStateUpdateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TournamentEnableCountdown => {
-                    GameEvent::TournamentEnableCountdown(
-                        TournamentEnableCountdownEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerCalledForMedic => {
-                    GameEvent::PlayerCalledForMedic(
-                        PlayerCalledForMedicEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerAskedForBall => {
-                    GameEvent::PlayerAskedForBall(
-                        PlayerAskedForBallEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerBecameObserver => {
-                    GameEvent::LocalPlayerBecameObserver(
-                        LocalPlayerBecameObserverEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerIgnitedInv => {
-                    GameEvent::PlayerIgnitedInv(
-                        PlayerIgnitedInvEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerIgnited => {
-                    GameEvent::PlayerIgnited(
-                        PlayerIgnitedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerExtinguished => {
-                    GameEvent::PlayerExtinguished(
-                        PlayerExtinguishedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerTeleported => {
-                    GameEvent::PlayerTeleported(
-                        PlayerTeleportedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHealedMedicCall => {
-                    GameEvent::PlayerHealedMedicCall(
-                        PlayerHealedMedicCallEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerChargeReady => {
-                    GameEvent::LocalPlayerChargeReady(
-                        LocalPlayerChargeReadyEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerWindDown => {
-                    GameEvent::LocalPlayerWindDown(
-                        LocalPlayerWindDownEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerInvulned => {
-                    GameEvent::PlayerInvulned(
-                        PlayerInvulnedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EscortSpeed => {
-                    GameEvent::EscortSpeed(EscortSpeedEvent::read(stream, definition)?)
-                }
-                GameEventType::EscortProgress => {
-                    GameEvent::EscortProgress(
-                        EscortProgressEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EscortRecede => {
-                    GameEvent::EscortRecede(EscortRecedeEvent::read(stream, definition)?)
-                }
-                GameEventType::GameUIActivated => {
-                    GameEvent::GameUIActivated(
-                        GameUIActivatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::GameUIHidden => {
-                    GameEvent::GameUIHidden(GameUIHiddenEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerEscortScore => {
-                    GameEvent::PlayerEscortScore(
-                        PlayerEscortScoreEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHealOnHit => {
-                    GameEvent::PlayerHealOnHit(
-                        PlayerHealOnHitEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerStealSandvich => {
-                    GameEvent::PlayerStealSandvich(
-                        PlayerStealSandvichEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ShowClassLayout => {
-                    GameEvent::ShowClassLayout(
-                        ShowClassLayoutEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ShowVsPanel => {
-                    GameEvent::ShowVsPanel(ShowVsPanelEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerDamaged => {
-                    GameEvent::PlayerDamaged(
-                        PlayerDamagedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ArenaPlayerNotification => {
-                    GameEvent::ArenaPlayerNotification(
-                        ArenaPlayerNotificationEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ArenaMatchMaxStreak => {
-                    GameEvent::ArenaMatchMaxStreak(
-                        ArenaMatchMaxStreakEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ArenaRoundStart => {
-                    GameEvent::ArenaRoundStart(
-                        ArenaRoundStartEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ArenaWinPanel => {
-                    GameEvent::ArenaWinPanel(
-                        ArenaWinPanelEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PveWinPanel => {
-                    GameEvent::PveWinPanel(PveWinPanelEvent::read(stream, definition)?)
-                }
-                GameEventType::AirDash => {
-                    GameEvent::AirDash(AirDashEvent::read(stream, definition)?)
-                }
-                GameEventType::Landed => {
-                    GameEvent::Landed(LandedEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerDamageDodged => {
-                    GameEvent::PlayerDamageDodged(
-                        PlayerDamageDodgedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerStunned => {
-                    GameEvent::PlayerStunned(
-                        PlayerStunnedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ScoutGrandSlam => {
-                    GameEvent::ScoutGrandSlam(
-                        ScoutGrandSlamEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ScoutSlamdollLanded => {
-                    GameEvent::ScoutSlamdollLanded(
-                        ScoutSlamdollLandedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ArrowImpact => {
-                    GameEvent::ArrowImpact(ArrowImpactEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerJarated => {
-                    GameEvent::PlayerJarated(
-                        PlayerJaratedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerJaratedFade => {
-                    GameEvent::PlayerJaratedFade(
-                        PlayerJaratedFadeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerShieldBlocked => {
-                    GameEvent::PlayerShieldBlocked(
-                        PlayerShieldBlockedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerPinned => {
-                    GameEvent::PlayerPinned(PlayerPinnedEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerHealedByMedic => {
-                    GameEvent::PlayerHealedByMedic(
-                        PlayerHealedByMedicEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerSappedObject => {
-                    GameEvent::PlayerSappedObject(
-                        PlayerSappedObjectEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ItemFound => {
-                    GameEvent::ItemFound(ItemFoundEvent::read(stream, definition)?)
-                }
-                GameEventType::ShowAnnotation => {
-                    GameEvent::ShowAnnotation(
-                        ShowAnnotationEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HideAnnotation => {
-                    GameEvent::HideAnnotation(
-                        HideAnnotationEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PostInventoryApplication => {
-                    GameEvent::PostInventoryApplication(
-                        PostInventoryApplicationEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ControlPointUnlockUpdated => {
-                    GameEvent::ControlPointUnlockUpdated(
-                        ControlPointUnlockUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DeployBuffBanner => {
-                    GameEvent::DeployBuffBanner(
-                        DeployBuffBannerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerBuff => {
-                    GameEvent::PlayerBuff(PlayerBuffEvent::read(stream, definition)?)
-                }
-                GameEventType::MedicDeath => {
-                    GameEvent::MedicDeath(MedicDeathEvent::read(stream, definition)?)
-                }
-                GameEventType::OvertimeNag => {
-                    GameEvent::OvertimeNag(OvertimeNagEvent::read(stream, definition)?)
-                }
-                GameEventType::TeamsChanged => {
-                    GameEvent::TeamsChanged(TeamsChangedEvent::read(stream, definition)?)
-                }
-                GameEventType::HalloweenPumpkinGrab => {
-                    GameEvent::HalloweenPumpkinGrab(
-                        HalloweenPumpkinGrabEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RocketJump => {
-                    GameEvent::RocketJump(RocketJumpEvent::read(stream, definition)?)
-                }
-                GameEventType::RocketJumpLanded => {
-                    GameEvent::RocketJumpLanded(
-                        RocketJumpLandedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::StickyJump => {
-                    GameEvent::StickyJump(StickyJumpEvent::read(stream, definition)?)
-                }
-                GameEventType::StickyJumpLanded => {
-                    GameEvent::StickyJumpLanded(
-                        StickyJumpLandedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RocketPackLaunch => {
-                    GameEvent::RocketPackLaunch(
-                        RocketPackLaunchEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RocketPackLanded => {
-                    GameEvent::RocketPackLanded(
-                        RocketPackLandedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MedicDefended => {
-                    GameEvent::MedicDefended(
-                        MedicDefendedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerHealed => {
-                    GameEvent::LocalPlayerHealed(
-                        LocalPlayerHealedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerDestroyedPipeBomb => {
-                    GameEvent::PlayerDestroyedPipeBomb(
-                        PlayerDestroyedPipeBombEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ObjectDeflected => {
-                    GameEvent::ObjectDeflected(
-                        ObjectDeflectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerMvp => {
-                    GameEvent::PlayerMvp(PlayerMvpEvent::read(stream, definition)?)
-                }
-                GameEventType::RaidSpawnMob => {
-                    GameEvent::RaidSpawnMob(RaidSpawnMobEvent::read(stream, definition)?)
-                }
-                GameEventType::RaidSpawnSquad => {
-                    GameEvent::RaidSpawnSquad(
-                        RaidSpawnSquadEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::NavBlocked => {
-                    GameEvent::NavBlocked(NavBlockedEvent::read(stream, definition)?)
-                }
-                GameEventType::PathTrackPassed => {
-                    GameEvent::PathTrackPassed(
-                        PathTrackPassedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::NumCappersChanged => {
-                    GameEvent::NumCappersChanged(
-                        NumCappersChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerRegenerate => {
-                    GameEvent::PlayerRegenerate(
-                        PlayerRegenerateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::UpdateStatusItem => {
-                    GameEvent::UpdateStatusItem(
-                        UpdateStatusItemEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::StatsResetRound => {
-                    GameEvent::StatsResetRound(
-                        StatsResetRoundEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ScoreStatsAccumulatedUpdate => {
-                    GameEvent::ScoreStatsAccumulatedUpdate(
-                        ScoreStatsAccumulatedUpdateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ScoreStatsAccumulatedReset => {
-                    GameEvent::ScoreStatsAccumulatedReset(
-                        ScoreStatsAccumulatedResetEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::AchievementEarnedLocal => {
-                    GameEvent::AchievementEarnedLocal(
-                        AchievementEarnedLocalEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHealed => {
-                    GameEvent::PlayerHealed(PlayerHealedEvent::read(stream, definition)?)
-                }
-                GameEventType::BuildingHealed => {
-                    GameEvent::BuildingHealed(
-                        BuildingHealedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ItemPickup => {
-                    GameEvent::ItemPickup(ItemPickupEvent::read(stream, definition)?)
-                }
-                GameEventType::DuelStatus => {
-                    GameEvent::DuelStatus(DuelStatusEvent::read(stream, definition)?)
-                }
-                GameEventType::FishNotice => {
-                    GameEvent::FishNotice(
-                        Box::new(<FishNoticeEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::FishNoticeArm => {
-                    GameEvent::FishNoticeArm(
-                        Box::new(<FishNoticeArmEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::SlapNotice => {
-                    GameEvent::SlapNotice(
-                        Box::new(<SlapNoticeEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::ThrowableHit => {
-                    GameEvent::ThrowableHit(
-                        Box::new(<ThrowableHitEvent>::read(stream, definition)?),
-                    )
-                }
-                GameEventType::PumpkinLordSummoned => {
-                    GameEvent::PumpkinLordSummoned(
-                        PumpkinLordSummonedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PumpkinLordKilled => {
-                    GameEvent::PumpkinLordKilled(
-                        PumpkinLordKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusSummoned => {
-                    GameEvent::MerasmusSummoned(
-                        MerasmusSummonedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusKilled => {
-                    GameEvent::MerasmusKilled(
-                        MerasmusKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusEscapeWarning => {
-                    GameEvent::MerasmusEscapeWarning(
-                        MerasmusEscapeWarningEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusEscaped => {
-                    GameEvent::MerasmusEscaped(
-                        MerasmusEscapedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossSummoned => {
-                    GameEvent::EyeballBossSummoned(
-                        EyeballBossSummonedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossStunned => {
-                    GameEvent::EyeballBossStunned(
-                        EyeballBossStunnedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossKilled => {
-                    GameEvent::EyeballBossKilled(
-                        EyeballBossKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossKiller => {
-                    GameEvent::EyeballBossKiller(
-                        EyeballBossKillerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossEscapeImminent => {
-                    GameEvent::EyeballBossEscapeImminent(
-                        EyeballBossEscapeImminentEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EyeballBossEscaped => {
-                    GameEvent::EyeballBossEscaped(
-                        EyeballBossEscapedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::NpcHurt => {
-                    GameEvent::NpcHurt(NpcHurtEvent::read(stream, definition)?)
-                }
-                GameEventType::ControlPointTimerUpdated => {
-                    GameEvent::ControlPointTimerUpdated(
-                        ControlPointTimerUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHighFiveStart => {
-                    GameEvent::PlayerHighFiveStart(
-                        PlayerHighFiveStartEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHighFiveCancel => {
-                    GameEvent::PlayerHighFiveCancel(
-                        PlayerHighFiveCancelEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerHighFiveSuccess => {
-                    GameEvent::PlayerHighFiveSuccess(
-                        PlayerHighFiveSuccessEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerBonusPoints => {
-                    GameEvent::PlayerBonusPoints(
-                        PlayerBonusPointsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerUpgraded => {
-                    GameEvent::PlayerUpgraded(
-                        PlayerUpgradedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerBuyback => {
-                    GameEvent::PlayerBuyback(
-                        PlayerBuybackEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerUsedPowerUpBottle => {
-                    GameEvent::PlayerUsedPowerUpBottle(
-                        PlayerUsedPowerUpBottleEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ChristmasGiftGrab => {
-                    GameEvent::ChristmasGiftGrab(
-                        ChristmasGiftGrabEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerKilledAchievementZone => {
-                    GameEvent::PlayerKilledAchievementZone(
-                        PlayerKilledAchievementZoneEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyUpdated => {
-                    GameEvent::PartyUpdated(PartyUpdatedEvent::read(stream, definition)?)
-                }
-                GameEventType::PartyPrefChanged => {
-                    GameEvent::PartyPrefChanged(
-                        PartyPrefChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyCriteriaChanged => {
-                    GameEvent::PartyCriteriaChanged(
-                        PartyCriteriaChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyInvitesChanged => {
-                    GameEvent::PartyInvitesChanged(
-                        PartyInvitesChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyQueueStateChanged => {
-                    GameEvent::PartyQueueStateChanged(
-                        PartyQueueStateChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyChat => {
-                    GameEvent::PartyChat(PartyChatEvent::read(stream, definition)?)
-                }
-                GameEventType::PartyMemberJoin => {
-                    GameEvent::PartyMemberJoin(
-                        PartyMemberJoinEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PartyMemberLeave => {
-                    GameEvent::PartyMemberLeave(
-                        PartyMemberLeaveEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MatchInvitesUpdated => {
-                    GameEvent::MatchInvitesUpdated(
-                        MatchInvitesUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LobbyUpdated => {
-                    GameEvent::LobbyUpdated(LobbyUpdatedEvent::read(stream, definition)?)
-                }
-                GameEventType::MvmMissionUpdate => {
-                    GameEvent::MvmMissionUpdate(
-                        MvmMissionUpdateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RecalculateHolidays => {
-                    GameEvent::RecalculateHolidays(
-                        RecalculateHolidaysEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerCurrencyChanged => {
-                    GameEvent::PlayerCurrencyChanged(
-                        PlayerCurrencyChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DoomsdayRocketOpen => {
-                    GameEvent::DoomsdayRocketOpen(
-                        DoomsdayRocketOpenEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RemoveNemesisRelationships => {
-                    GameEvent::RemoveNemesisRelationships(
-                        RemoveNemesisRelationshipsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmCreditBonusWave => {
-                    GameEvent::MvmCreditBonusWave(
-                        MvmCreditBonusWaveEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmCreditBonusAll => {
-                    GameEvent::MvmCreditBonusAll(
-                        MvmCreditBonusAllEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmCreditBonusAllAdvanced => {
-                    GameEvent::MvmCreditBonusAllAdvanced(
-                        MvmCreditBonusAllAdvancedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmQuickSentryUpgrade => {
-                    GameEvent::MvmQuickSentryUpgrade(
-                        MvmQuickSentryUpgradeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmTankDestroyedByPlayers => {
-                    GameEvent::MvmTankDestroyedByPlayers(
-                        MvmTankDestroyedByPlayersEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmKillRobotDeliveringBomb => {
-                    GameEvent::MvmKillRobotDeliveringBomb(
-                        MvmKillRobotDeliveringBombEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmPickupCurrency => {
-                    GameEvent::MvmPickupCurrency(
-                        MvmPickupCurrencyEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmBombCarrierKilled => {
-                    GameEvent::MvmBombCarrierKilled(
-                        MvmBombCarrierKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmSentryBusterDetonate => {
-                    GameEvent::MvmSentryBusterDetonate(
-                        MvmSentryBusterDetonateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmScoutMarkedForDeath => {
-                    GameEvent::MvmScoutMarkedForDeath(
-                        MvmScoutMarkedForDeathEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmMedicPowerUpShared => {
-                    GameEvent::MvmMedicPowerUpShared(
-                        MvmMedicPowerUpSharedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmBeginWave => {
-                    GameEvent::MvmBeginWave(MvmBeginWaveEvent::read(stream, definition)?)
-                }
-                GameEventType::MvmWaveComplete => {
-                    GameEvent::MvmWaveComplete(
-                        MvmWaveCompleteEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmMissionComplete => {
-                    GameEvent::MvmMissionComplete(
-                        MvmMissionCompleteEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmBombResetByPlayer => {
-                    GameEvent::MvmBombResetByPlayer(
-                        MvmBombResetByPlayerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmBombAlarmTriggered => {
-                    GameEvent::MvmBombAlarmTriggered(
-                        MvmBombAlarmTriggeredEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmBombDeployResetByPlayer => {
-                    GameEvent::MvmBombDeployResetByPlayer(
-                        MvmBombDeployResetByPlayerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmWaveFailed => {
-                    GameEvent::MvmWaveFailed(
-                        MvmWaveFailedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmResetStats => {
-                    GameEvent::MvmResetStats(
-                        MvmResetStatsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DamageResisted => {
-                    GameEvent::DamageResisted(
-                        DamageResistedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RevivePlayerNotify => {
-                    GameEvent::RevivePlayerNotify(
-                        RevivePlayerNotifyEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RevivePlayerStopped => {
-                    GameEvent::RevivePlayerStopped(
-                        RevivePlayerStoppedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RevivePlayerComplete => {
-                    GameEvent::RevivePlayerComplete(
-                        RevivePlayerCompleteEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerTurnedToGhost => {
-                    GameEvent::PlayerTurnedToGhost(
-                        PlayerTurnedToGhostEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MedigunShieldBlockedDamage => {
-                    GameEvent::MedigunShieldBlockedDamage(
-                        MedigunShieldBlockedDamageEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmAdvWaveCompleteNoGates => {
-                    GameEvent::MvmAdvWaveCompleteNoGates(
-                        MvmAdvWaveCompleteNoGatesEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmSniperHeadshotCurrency => {
-                    GameEvent::MvmSniperHeadshotCurrency(
-                        MvmSniperHeadshotCurrencyEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmMannhattanPit => {
-                    GameEvent::MvmMannhattanPit(
-                        MvmMannhattanPitEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::FlagCarriedInDetectionZone => {
-                    GameEvent::FlagCarriedInDetectionZone(
-                        FlagCarriedInDetectionZoneEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmAdvWaveKilledStunRadio => {
-                    GameEvent::MvmAdvWaveKilledStunRadio(
-                        MvmAdvWaveKilledStunRadioEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerDirectHitStun => {
-                    GameEvent::PlayerDirectHitStun(
-                        PlayerDirectHitStunEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MvmSentryBusterKilled => {
-                    GameEvent::MvmSentryBusterKilled(
-                        MvmSentryBusterKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::UpgradesFileChanged => {
-                    GameEvent::UpgradesFileChanged(
-                        UpgradesFileChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RdTeamPointsChanged => {
-                    GameEvent::RdTeamPointsChanged(
-                        RdTeamPointsChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RdRulesStateChanged => {
-                    GameEvent::RdRulesStateChanged(
-                        RdRulesStateChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RdRobotKilled => {
-                    GameEvent::RdRobotKilled(
-                        RdRobotKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RdRobotImpact => {
-                    GameEvent::RdRobotImpact(
-                        RdRobotImpactEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TeamPlayPreRoundTimeLeft => {
-                    GameEvent::TeamPlayPreRoundTimeLeft(
-                        TeamPlayPreRoundTimeLeftEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ParachuteDeploy => {
-                    GameEvent::ParachuteDeploy(
-                        ParachuteDeployEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ParachuteHolster => {
-                    GameEvent::ParachuteHolster(
-                        ParachuteHolsterEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::KillRefillsMeter => {
-                    GameEvent::KillRefillsMeter(
-                        KillRefillsMeterEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RpsTauntEvent => {
-                    GameEvent::RpsTauntEvent(
-                        RpsTauntEventEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CongaKill => {
-                    GameEvent::CongaKill(CongaKillEvent::read(stream, definition)?)
-                }
-                GameEventType::PlayerInitialSpawn => {
-                    GameEvent::PlayerInitialSpawn(
-                        PlayerInitialSpawnEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CompetitiveVictory => {
-                    GameEvent::CompetitiveVictory(
-                        CompetitiveVictoryEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CompetitiveStatsUpdate => {
-                    GameEvent::CompetitiveStatsUpdate(
-                        CompetitiveStatsUpdateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MiniGameWin => {
-                    GameEvent::MiniGameWin(MiniGameWinEvent::read(stream, definition)?)
-                }
-                GameEventType::SentryOnGoActive => {
-                    GameEvent::SentryOnGoActive(
-                        SentryOnGoActiveEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DuckXpLevelUp => {
-                    GameEvent::DuckXpLevelUp(
-                        DuckXpLevelUpEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestLogOpened => {
-                    GameEvent::QuestLogOpened(
-                        QuestLogOpenedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::SchemaUpdated => {
-                    GameEvent::SchemaUpdated(
-                        SchemaUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::LocalPlayerPickupWeapon => {
-                    GameEvent::LocalPlayerPickupWeapon(
-                        LocalPlayerPickupWeaponEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RdPlayerScorePoints => {
-                    GameEvent::RdPlayerScorePoints(
-                        RdPlayerScorePointsEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DemomanDetStickies => {
-                    GameEvent::DemomanDetStickies(
-                        DemomanDetStickiesEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestObjectiveCompleted => {
-                    GameEvent::QuestObjectiveCompleted(
-                        QuestObjectiveCompletedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerScoreChanged => {
-                    GameEvent::PlayerScoreChanged(
-                        PlayerScoreChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::KilledCappingPlayer => {
-                    GameEvent::KilledCappingPlayer(
-                        KilledCappingPlayerEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EnvironmentalDeath => {
-                    GameEvent::EnvironmentalDeath(
-                        EnvironmentalDeathEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ProjectileDirectHit => {
-                    GameEvent::ProjectileDirectHit(
-                        ProjectileDirectHitEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PassGet => {
-                    GameEvent::PassGet(PassGetEvent::read(stream, definition)?)
-                }
-                GameEventType::PassScore => {
-                    GameEvent::PassScore(PassScoreEvent::read(stream, definition)?)
-                }
-                GameEventType::PassFree => {
-                    GameEvent::PassFree(PassFreeEvent::read(stream, definition)?)
-                }
-                GameEventType::PassPassCaught => {
-                    GameEvent::PassPassCaught(
-                        PassPassCaughtEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PassBallStolen => {
-                    GameEvent::PassBallStolen(
-                        PassBallStolenEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PassBallBlocked => {
-                    GameEvent::PassBallBlocked(
-                        PassBallBlockedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DamagePrevented => {
-                    GameEvent::DamagePrevented(
-                        DamagePreventedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HalloweenBossKilled => {
-                    GameEvent::HalloweenBossKilled(
-                        HalloweenBossKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EscapedLootIsland => {
-                    GameEvent::EscapedLootIsland(
-                        EscapedLootIslandEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TaggedPlayerAsIt => {
-                    GameEvent::TaggedPlayerAsIt(
-                        TaggedPlayerAsItEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusStunned => {
-                    GameEvent::MerasmusStunned(
-                        MerasmusStunnedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MerasmusPropFound => {
-                    GameEvent::MerasmusPropFound(
-                        MerasmusPropFoundEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HalloweenSkeletonKilled => {
-                    GameEvent::HalloweenSkeletonKilled(
-                        HalloweenSkeletonKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::EscapeHell => {
-                    GameEvent::EscapeHell(EscapeHellEvent::read(stream, definition)?)
-                }
-                GameEventType::CrossSpectralBridge => {
-                    GameEvent::CrossSpectralBridge(
-                        CrossSpectralBridgeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::MiniGameWon => {
-                    GameEvent::MiniGameWon(MiniGameWonEvent::read(stream, definition)?)
-                }
-                GameEventType::RespawnGhost => {
-                    GameEvent::RespawnGhost(RespawnGhostEvent::read(stream, definition)?)
-                }
-                GameEventType::KillInHell => {
-                    GameEvent::KillInHell(KillInHellEvent::read(stream, definition)?)
-                }
-                GameEventType::HalloweenDuckCollected => {
-                    GameEvent::HalloweenDuckCollected(
-                        HalloweenDuckCollectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::SpecialScore => {
-                    GameEvent::SpecialScore(SpecialScoreEvent::read(stream, definition)?)
-                }
-                GameEventType::TeamLeaderKilled => {
-                    GameEvent::TeamLeaderKilled(
-                        TeamLeaderKilledEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HalloweenSoulCollected => {
-                    GameEvent::HalloweenSoulCollected(
-                        HalloweenSoulCollectedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RecalculateTruce => {
-                    GameEvent::RecalculateTruce(
-                        RecalculateTruceEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DeadRingerCheatDeath => {
-                    GameEvent::DeadRingerCheatDeath(
-                        DeadRingerCheatDeathEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CrossbowHeal => {
-                    GameEvent::CrossbowHeal(CrossbowHealEvent::read(stream, definition)?)
-                }
-                GameEventType::DamageMitigated => {
-                    GameEvent::DamageMitigated(
-                        DamageMitigatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PayloadPushed => {
-                    GameEvent::PayloadPushed(
-                        PayloadPushedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerAbandonedMatch => {
-                    GameEvent::PlayerAbandonedMatch(
-                        PlayerAbandonedMatchEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ClDrawline => {
-                    GameEvent::ClDrawline(ClDrawlineEvent::read(stream, definition)?)
-                }
-                GameEventType::RestartTimerTime => {
-                    GameEvent::RestartTimerTime(
-                        RestartTimerTimeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::WinLimitChanged => {
-                    GameEvent::WinLimitChanged(
-                        WinLimitChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::WinPanelShowScores => {
-                    GameEvent::WinPanelShowScores(
-                        WinPanelShowScoresEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::TopStreamsRequestFinished => {
-                    GameEvent::TopStreamsRequestFinished(
-                        TopStreamsRequestFinishedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CompetitiveStateChanged => {
-                    GameEvent::CompetitiveStateChanged(
-                        CompetitiveStateChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::GlobalWarDataUpdated => {
-                    GameEvent::GlobalWarDataUpdated(
-                        GlobalWarDataUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::StopWatchChanged => {
-                    GameEvent::StopWatchChanged(
-                        StopWatchChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::DsStop => {
-                    GameEvent::DsStop(DsStopEvent::read(stream, definition)?)
-                }
-                GameEventType::DsScreenshot => {
-                    GameEvent::DsScreenshot(DsScreenshotEvent::read(stream, definition)?)
-                }
-                GameEventType::ShowMatchSummary => {
-                    GameEvent::ShowMatchSummary(
-                        ShowMatchSummaryEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ExperienceChanged => {
-                    GameEvent::ExperienceChanged(
-                        ExperienceChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::BeginXpLerp => {
-                    GameEvent::BeginXpLerp(BeginXpLerpEvent::read(stream, definition)?)
-                }
-                GameEventType::MatchmakerStatsUpdated => {
-                    GameEvent::MatchmakerStatsUpdated(
-                        MatchmakerStatsUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RematchVotePeriodOver => {
-                    GameEvent::RematchVotePeriodOver(
-                        RematchVotePeriodOverEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::RematchFailedToCreate => {
-                    GameEvent::RematchFailedToCreate(
-                        RematchFailedToCreateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerRematchChange => {
-                    GameEvent::PlayerRematchChange(
-                        PlayerRematchChangeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PingUpdated => {
-                    GameEvent::PingUpdated(PingUpdatedEvent::read(stream, definition)?)
-                }
-                GameEventType::MMStatsUpdated => {
-                    GameEvent::MMStatsUpdated(
-                        MMStatsUpdatedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerNextMapVoteChange => {
-                    GameEvent::PlayerNextMapVoteChange(
-                        PlayerNextMapVoteChangeEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::VoteMapsChanged => {
-                    GameEvent::VoteMapsChanged(
-                        VoteMapsChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ProtoDefChanged => {
-                    GameEvent::ProtoDefChanged(
-                        ProtoDefChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerDomination => {
-                    GameEvent::PlayerDomination(
-                        PlayerDominationEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::PlayerRocketPackPushed => {
-                    GameEvent::PlayerRocketPackPushed(
-                        PlayerRocketPackPushedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestRequest => {
-                    GameEvent::QuestRequest(QuestRequestEvent::read(stream, definition)?)
-                }
-                GameEventType::QuestResponse => {
-                    GameEvent::QuestResponse(
-                        QuestResponseEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestProgress => {
-                    GameEvent::QuestProgress(
-                        QuestProgressEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ProjectileRemoved => {
-                    GameEvent::ProjectileRemoved(
-                        ProjectileRemovedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestMapDataChanged => {
-                    GameEvent::QuestMapDataChanged(
-                        QuestMapDataChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::GasDousedPlayerIgnited => {
-                    GameEvent::GasDousedPlayerIgnited(
-                        GasDousedPlayerIgnitedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::QuestTurnInState => {
-                    GameEvent::QuestTurnInState(
-                        QuestTurnInStateEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ItemsAcknowledged => {
-                    GameEvent::ItemsAcknowledged(
-                        ItemsAcknowledgedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::CapperKilled => {
-                    GameEvent::CapperKilled(CapperKilledEvent::read(stream, definition)?)
-                }
-                GameEventType::MainMenuStabilized => {
-                    GameEvent::MainMenuStabilized(
-                        MainMenuStabilizedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::WorldStatusChanged => {
-                    GameEvent::WorldStatusChanged(
-                        WorldStatusChangedEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVStatus => {
-                    GameEvent::HLTVStatus(HLTVStatusEvent::read(stream, definition)?)
-                }
-                GameEventType::HLTVCameraman => {
-                    GameEvent::HLTVCameraman(
-                        HLTVCameramanEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVRankCamera => {
-                    GameEvent::HLTVRankCamera(
-                        HLTVRankCameraEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVRankEntity => {
-                    GameEvent::HLTVRankEntity(
-                        HLTVRankEntityEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::HLTVFixed => {
-                    GameEvent::HLTVFixed(HLTVFixedEvent::read(stream, definition)?)
-                }
-                GameEventType::HLTVChase => {
-                    GameEvent::HLTVChase(HLTVChaseEvent::read(stream, definition)?)
-                }
-                GameEventType::HLTVMessage => {
-                    GameEvent::HLTVMessage(HLTVMessageEvent::read(stream, definition)?)
-                }
-                GameEventType::HLTVTitle => {
-                    GameEvent::HLTVTitle(HLTVTitleEvent::read(stream, definition)?)
-                }
-                GameEventType::HLTVChat => {
-                    GameEvent::HLTVChat(HLTVChatEvent::read(stream, definition)?)
-                }
-                GameEventType::ReplayStartRecord => {
-                    GameEvent::ReplayStartRecord(
-                        ReplayStartRecordEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ReplaySessionInfo => {
-                    GameEvent::ReplaySessionInfo(
-                        ReplaySessionInfoEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ReplayEndRecord => {
-                    GameEvent::ReplayEndRecord(
-                        ReplayEndRecordEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ReplayReplaysAvailable => {
-                    GameEvent::ReplayReplaysAvailable(
-                        ReplayReplaysAvailableEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::ReplayServerError => {
-                    GameEvent::ReplayServerError(
-                        ReplayServerErrorEvent::read(stream, definition)?,
-                    )
-                }
-                GameEventType::Unknown(_) => {
-                    GameEvent::Unknown(RawGameEvent::read(stream, definition)?)
-                }
-            },
-        )
+        Ok(match definition.event_type {
+            GameEventType::ServerSpawn => {
+                GameEvent::ServerSpawn(Box::new(<ServerSpawnEvent>::read(stream, definition)?))
+            }
+            GameEventType::ServerChangeLevelFailed => GameEvent::ServerChangeLevelFailed(
+                ServerChangeLevelFailedEvent::read(stream, definition)?,
+            ),
+            GameEventType::ServerShutdown => {
+                GameEvent::ServerShutdown(ServerShutdownEvent::read(stream, definition)?)
+            }
+            GameEventType::ServerCvar => {
+                GameEvent::ServerCvar(ServerCvarEvent::read(stream, definition)?)
+            }
+            GameEventType::ServerMessage => {
+                GameEvent::ServerMessage(ServerMessageEvent::read(stream, definition)?)
+            }
+            GameEventType::ServerAddBan => {
+                GameEvent::ServerAddBan(Box::new(<ServerAddBanEvent>::read(stream, definition)?))
+            }
+            GameEventType::ServerRemoveBan => {
+                GameEvent::ServerRemoveBan(ServerRemoveBanEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerConnect => {
+                GameEvent::PlayerConnect(PlayerConnectEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerConnectClient => {
+                GameEvent::PlayerConnectClient(PlayerConnectClientEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerInfo => {
+                GameEvent::PlayerInfo(PlayerInfoEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDisconnect => {
+                GameEvent::PlayerDisconnect(PlayerDisconnectEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerActivate => {
+                GameEvent::PlayerActivate(PlayerActivateEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerSay => {
+                GameEvent::PlayerSay(PlayerSayEvent::read(stream, definition)?)
+            }
+            GameEventType::ClientDisconnect => {
+                GameEvent::ClientDisconnect(ClientDisconnectEvent::read(stream, definition)?)
+            }
+            GameEventType::ClientBeginConnect => {
+                GameEvent::ClientBeginConnect(ClientBeginConnectEvent::read(stream, definition)?)
+            }
+            GameEventType::ClientConnected => {
+                GameEvent::ClientConnected(ClientConnectedEvent::read(stream, definition)?)
+            }
+            GameEventType::ClientFullConnect => {
+                GameEvent::ClientFullConnect(ClientFullConnectEvent::read(stream, definition)?)
+            }
+            GameEventType::HostQuit => {
+                GameEvent::HostQuit(HostQuitEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamInfo => {
+                GameEvent::TeamInfo(TeamInfoEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamScore => {
+                GameEvent::TeamScore(TeamScoreEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayBroadcastAudio => GameEvent::TeamPlayBroadcastAudio(
+                TeamPlayBroadcastAudioEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerTeam => {
+                GameEvent::PlayerTeam(PlayerTeamEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerClass => {
+                GameEvent::PlayerClass(PlayerClassEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDeath => {
+                GameEvent::PlayerDeath(Box::new(<PlayerDeathEvent>::read(stream, definition)?))
+            }
+            GameEventType::PlayerHurt => {
+                GameEvent::PlayerHurt(PlayerHurtEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerChat => {
+                GameEvent::PlayerChat(PlayerChatEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerScore => {
+                GameEvent::PlayerScore(PlayerScoreEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerSpawn => {
+                GameEvent::PlayerSpawn(PlayerSpawnEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerShoot => {
+                GameEvent::PlayerShoot(PlayerShootEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerUse => {
+                GameEvent::PlayerUse(PlayerUseEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerChangeName => {
+                GameEvent::PlayerChangeName(PlayerChangeNameEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerHintMessage => {
+                GameEvent::PlayerHintMessage(PlayerHintMessageEvent::read(stream, definition)?)
+            }
+            GameEventType::BasePlayerTeleported => GameEvent::BasePlayerTeleported(
+                BasePlayerTeleportedEvent::read(stream, definition)?,
+            ),
+            GameEventType::GameInit => {
+                GameEvent::GameInit(GameInitEvent::read(stream, definition)?)
+            }
+            GameEventType::GameNewMap => {
+                GameEvent::GameNewMap(GameNewMapEvent::read(stream, definition)?)
+            }
+            GameEventType::GameStart => {
+                GameEvent::GameStart(GameStartEvent::read(stream, definition)?)
+            }
+            GameEventType::GameEnd => GameEvent::GameEnd(GameEndEvent::read(stream, definition)?),
+            GameEventType::RoundStart => {
+                GameEvent::RoundStart(RoundStartEvent::read(stream, definition)?)
+            }
+            GameEventType::RoundEnd => {
+                GameEvent::RoundEnd(RoundEndEvent::read(stream, definition)?)
+            }
+            GameEventType::GameMessage => {
+                GameEvent::GameMessage(GameMessageEvent::read(stream, definition)?)
+            }
+            GameEventType::BreakBreakable => {
+                GameEvent::BreakBreakable(BreakBreakableEvent::read(stream, definition)?)
+            }
+            GameEventType::BreakProp => {
+                GameEvent::BreakProp(BreakPropEvent::read(stream, definition)?)
+            }
+            GameEventType::EntityKilled => {
+                GameEvent::EntityKilled(EntityKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::BonusUpdated => {
+                GameEvent::BonusUpdated(BonusUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::AchievementEvent => {
+                GameEvent::AchievementEvent(AchievementEventEvent::read(stream, definition)?)
+            }
+            GameEventType::AchievementIncrement => GameEvent::AchievementIncrement(
+                AchievementIncrementEvent::read(stream, definition)?,
+            ),
+            GameEventType::PhysgunPickup => {
+                GameEvent::PhysgunPickup(PhysgunPickupEvent::read(stream, definition)?)
+            }
+            GameEventType::FlareIgniteNpc => {
+                GameEvent::FlareIgniteNpc(FlareIgniteNpcEvent::read(stream, definition)?)
+            }
+            GameEventType::HelicopterGrenadePuntMiss => GameEvent::HelicopterGrenadePuntMiss(
+                HelicopterGrenadePuntMissEvent::read(stream, definition)?,
+            ),
+            GameEventType::UserDataDownloaded => {
+                GameEvent::UserDataDownloaded(UserDataDownloadedEvent::read(stream, definition)?)
+            }
+            GameEventType::RagdollDissolved => {
+                GameEvent::RagdollDissolved(RagdollDissolvedEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVChangedMode => {
+                GameEvent::HLTVChangedMode(HLTVChangedModeEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVChangedTarget => {
+                GameEvent::HLTVChangedTarget(HLTVChangedTargetEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteEnded => {
+                GameEvent::VoteEnded(VoteEndedEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteStarted => {
+                GameEvent::VoteStarted(VoteStartedEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteChanged => {
+                GameEvent::VoteChanged(VoteChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::VotePassed => {
+                GameEvent::VotePassed(VotePassedEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteFailed => {
+                GameEvent::VoteFailed(VoteFailedEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteCast => {
+                GameEvent::VoteCast(VoteCastEvent::read(stream, definition)?)
+            }
+            GameEventType::VoteOptions => {
+                GameEvent::VoteOptions(Box::new(<VoteOptionsEvent>::read(stream, definition)?))
+            }
+            GameEventType::ReplaySaved => {
+                GameEvent::ReplaySaved(ReplaySavedEvent::read(stream, definition)?)
+            }
+            GameEventType::EnteredPerformanceMode => GameEvent::EnteredPerformanceMode(
+                EnteredPerformanceModeEvent::read(stream, definition)?,
+            ),
+            GameEventType::BrowseReplays => {
+                GameEvent::BrowseReplays(BrowseReplaysEvent::read(stream, definition)?)
+            }
+            GameEventType::ReplayYoutubeStats => {
+                GameEvent::ReplayYoutubeStats(ReplayYoutubeStatsEvent::read(stream, definition)?)
+            }
+            GameEventType::InventoryUpdated => {
+                GameEvent::InventoryUpdated(InventoryUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::CartUpdated => {
+                GameEvent::CartUpdated(CartUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::StorePriceSheetUpdated => GameEvent::StorePriceSheetUpdated(
+                StorePriceSheetUpdatedEvent::read(stream, definition)?,
+            ),
+            GameEventType::EconInventoryConnected => GameEvent::EconInventoryConnected(
+                EconInventoryConnectedEvent::read(stream, definition)?,
+            ),
+            GameEventType::ItemSchemaInitialized => GameEvent::ItemSchemaInitialized(
+                ItemSchemaInitializedEvent::read(stream, definition)?,
+            ),
+            GameEventType::GcNewSession => {
+                GameEvent::GcNewSession(GcNewSessionEvent::read(stream, definition)?)
+            }
+            GameEventType::GcLostSession => {
+                GameEvent::GcLostSession(GcLostSessionEvent::read(stream, definition)?)
+            }
+            GameEventType::IntroFinish => {
+                GameEvent::IntroFinish(IntroFinishEvent::read(stream, definition)?)
+            }
+            GameEventType::IntroNextCamera => {
+                GameEvent::IntroNextCamera(IntroNextCameraEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerChangeClass => {
+                GameEvent::PlayerChangeClass(PlayerChangeClassEvent::read(stream, definition)?)
+            }
+            GameEventType::TfMapTimeRemaining => {
+                GameEvent::TfMapTimeRemaining(TfMapTimeRemainingEvent::read(stream, definition)?)
+            }
+            GameEventType::TfGameOver => {
+                GameEvent::TfGameOver(TfGameOverEvent::read(stream, definition)?)
+            }
+            GameEventType::CtfFlagCaptured => {
+                GameEvent::CtfFlagCaptured(CtfFlagCapturedEvent::read(stream, definition)?)
+            }
+            GameEventType::ControlPointInitialized => GameEvent::ControlPointInitialized(
+                ControlPointInitializedEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointUpdateImages => GameEvent::ControlPointUpdateImages(
+                ControlPointUpdateImagesEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointUpdateLayout => GameEvent::ControlPointUpdateLayout(
+                ControlPointUpdateLayoutEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointUpdateCapping => GameEvent::ControlPointUpdateCapping(
+                ControlPointUpdateCappingEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointUpdateOwner => GameEvent::ControlPointUpdateOwner(
+                ControlPointUpdateOwnerEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointStartTouch => GameEvent::ControlPointStartTouch(
+                ControlPointStartTouchEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointEndTouch => GameEvent::ControlPointEndTouch(
+                ControlPointEndTouchEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointPulseElement => GameEvent::ControlPointPulseElement(
+                ControlPointPulseElementEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointFakeCapture => GameEvent::ControlPointFakeCapture(
+                ControlPointFakeCaptureEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointFakeCaptureMultiplier => {
+                GameEvent::ControlPointFakeCaptureMultiplier(
+                    ControlPointFakeCaptureMultiplierEvent::read(stream, definition)?,
+                )
+            }
+            GameEventType::TeamPlayRoundSelected => GameEvent::TeamPlayRoundSelected(
+                TeamPlayRoundSelectedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayRoundStart => {
+                GameEvent::TeamPlayRoundStart(TeamPlayRoundStartEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayRoundActive => {
+                GameEvent::TeamPlayRoundActive(TeamPlayRoundActiveEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayWaitingBegins => GameEvent::TeamPlayWaitingBegins(
+                TeamPlayWaitingBeginsEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayWaitingEnds => {
+                GameEvent::TeamPlayWaitingEnds(TeamPlayWaitingEndsEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayWaitingAboutToEnd => GameEvent::TeamPlayWaitingAboutToEnd(
+                TeamPlayWaitingAboutToEndEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayRestartRound => GameEvent::TeamPlayRestartRound(
+                TeamPlayRestartRoundEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayReadyRestart => GameEvent::TeamPlayReadyRestart(
+                TeamPlayReadyRestartEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayRoundRestartSeconds => GameEvent::TeamPlayRoundRestartSeconds(
+                TeamPlayRoundRestartSecondsEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayTeamReady => {
+                GameEvent::TeamPlayTeamReady(TeamPlayTeamReadyEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayRoundWin => {
+                GameEvent::TeamPlayRoundWin(TeamPlayRoundWinEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayUpdateTimer => {
+                GameEvent::TeamPlayUpdateTimer(TeamPlayUpdateTimerEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayRoundStalemate => GameEvent::TeamPlayRoundStalemate(
+                TeamPlayRoundStalemateEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayOvertimeBegin => GameEvent::TeamPlayOvertimeBegin(
+                TeamPlayOvertimeBeginEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayOvertimeEnd => {
+                GameEvent::TeamPlayOvertimeEnd(TeamPlayOvertimeEndEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlaySuddenDeathBegin => GameEvent::TeamPlaySuddenDeathBegin(
+                TeamPlaySuddenDeathBeginEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlaySuddenDeathEnd => GameEvent::TeamPlaySuddenDeathEnd(
+                TeamPlaySuddenDeathEndEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayGameOver => {
+                GameEvent::TeamPlayGameOver(TeamPlayGameOverEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayMapTimeRemaining => GameEvent::TeamPlayMapTimeRemaining(
+                TeamPlayMapTimeRemainingEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayTimerFlash => {
+                GameEvent::TeamPlayTimerFlash(TeamPlayTimerFlashEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayTimerTimeAdded => GameEvent::TeamPlayTimerTimeAdded(
+                TeamPlayTimerTimeAddedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayPointStartCapture => GameEvent::TeamPlayPointStartCapture(
+                TeamPlayPointStartCaptureEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayPointCaptured => GameEvent::TeamPlayPointCaptured(
+                TeamPlayPointCapturedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayPointLocked => {
+                GameEvent::TeamPlayPointLocked(TeamPlayPointLockedEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayPointUnlocked => GameEvent::TeamPlayPointUnlocked(
+                TeamPlayPointUnlockedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayCaptureBroken => GameEvent::TeamPlayCaptureBroken(
+                TeamPlayCaptureBrokenEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayCaptureBlocked => GameEvent::TeamPlayCaptureBlocked(
+                TeamPlayCaptureBlockedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayFlagEvent => {
+                GameEvent::TeamPlayFlagEvent(TeamPlayFlagEventEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayWinPanel => {
+                GameEvent::TeamPlayWinPanel(TeamPlayWinPanelEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayTeamBalancedPlayer => GameEvent::TeamPlayTeamBalancedPlayer(
+                TeamPlayTeamBalancedPlayerEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlaySetupFinished => GameEvent::TeamPlaySetupFinished(
+                TeamPlaySetupFinishedEvent::read(stream, definition)?,
+            ),
+            GameEventType::TeamPlayAlert => {
+                GameEvent::TeamPlayAlert(TeamPlayAlertEvent::read(stream, definition)?)
+            }
+            GameEventType::TrainingComplete => {
+                GameEvent::TrainingComplete(TrainingCompleteEvent::read(stream, definition)?)
+            }
+            GameEventType::ShowFreezePanel => {
+                GameEvent::ShowFreezePanel(ShowFreezePanelEvent::read(stream, definition)?)
+            }
+            GameEventType::HideFreezePanel => {
+                GameEvent::HideFreezePanel(HideFreezePanelEvent::read(stream, definition)?)
+            }
+            GameEventType::FreezeCamStarted => {
+                GameEvent::FreezeCamStarted(FreezeCamStartedEvent::read(stream, definition)?)
+            }
+            GameEventType::LocalPlayerChangeTeam => GameEvent::LocalPlayerChangeTeam(
+                LocalPlayerChangeTeamEvent::read(stream, definition)?,
+            ),
+            GameEventType::LocalPlayerScoreChanged => GameEvent::LocalPlayerScoreChanged(
+                LocalPlayerScoreChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::LocalPlayerChangeClass => GameEvent::LocalPlayerChangeClass(
+                LocalPlayerChangeClassEvent::read(stream, definition)?,
+            ),
+            GameEventType::LocalPlayerRespawn => {
+                GameEvent::LocalPlayerRespawn(LocalPlayerRespawnEvent::read(stream, definition)?)
+            }
+            GameEventType::BuildingInfoChanged => {
+                GameEvent::BuildingInfoChanged(BuildingInfoChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::LocalPlayerChangeDisguise => GameEvent::LocalPlayerChangeDisguise(
+                LocalPlayerChangeDisguiseEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerAccountChanged => GameEvent::PlayerAccountChanged(
+                PlayerAccountChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::SpyPdaReset => {
+                GameEvent::SpyPdaReset(SpyPdaResetEvent::read(stream, definition)?)
+            }
+            GameEventType::FlagStatusUpdate => {
+                GameEvent::FlagStatusUpdate(FlagStatusUpdateEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerStatsUpdated => {
+                GameEvent::PlayerStatsUpdated(PlayerStatsUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayingCommentary => {
+                GameEvent::PlayingCommentary(PlayingCommentaryEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerChargeDeployed => GameEvent::PlayerChargeDeployed(
+                PlayerChargeDeployedEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerBuiltObject => {
+                GameEvent::PlayerBuiltObject(PlayerBuiltObjectEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerUpgradedObject => GameEvent::PlayerUpgradedObject(
+                PlayerUpgradedObjectEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerCarryObject => {
+                GameEvent::PlayerCarryObject(PlayerCarryObjectEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDropObject => {
+                GameEvent::PlayerDropObject(PlayerDropObjectEvent::read(stream, definition)?)
+            }
+            GameEventType::ObjectRemoved => {
+                GameEvent::ObjectRemoved(ObjectRemovedEvent::read(stream, definition)?)
+            }
+            GameEventType::ObjectDestroyed => {
+                GameEvent::ObjectDestroyed(ObjectDestroyedEvent::read(stream, definition)?)
+            }
+            GameEventType::ObjectDetonated => {
+                GameEvent::ObjectDetonated(ObjectDetonatedEvent::read(stream, definition)?)
+            }
+            GameEventType::AchievementEarned => {
+                GameEvent::AchievementEarned(AchievementEarnedEvent::read(stream, definition)?)
+            }
+            GameEventType::SpecTargetUpdated => {
+                GameEvent::SpecTargetUpdated(SpecTargetUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::TournamentStateUpdate => GameEvent::TournamentStateUpdate(
+                TournamentStateUpdateEvent::read(stream, definition)?,
+            ),
+            GameEventType::TournamentEnableCountdown => GameEvent::TournamentEnableCountdown(
+                TournamentEnableCountdownEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerCalledForMedic => GameEvent::PlayerCalledForMedic(
+                PlayerCalledForMedicEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerAskedForBall => {
+                GameEvent::PlayerAskedForBall(PlayerAskedForBallEvent::read(stream, definition)?)
+            }
+            GameEventType::LocalPlayerBecameObserver => GameEvent::LocalPlayerBecameObserver(
+                LocalPlayerBecameObserverEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerIgnitedInv => {
+                GameEvent::PlayerIgnitedInv(PlayerIgnitedInvEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerIgnited => {
+                GameEvent::PlayerIgnited(PlayerIgnitedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerExtinguished => {
+                GameEvent::PlayerExtinguished(PlayerExtinguishedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerTeleported => {
+                GameEvent::PlayerTeleported(PlayerTeleportedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerHealedMedicCall => GameEvent::PlayerHealedMedicCall(
+                PlayerHealedMedicCallEvent::read(stream, definition)?,
+            ),
+            GameEventType::LocalPlayerChargeReady => GameEvent::LocalPlayerChargeReady(
+                LocalPlayerChargeReadyEvent::read(stream, definition)?,
+            ),
+            GameEventType::LocalPlayerWindDown => {
+                GameEvent::LocalPlayerWindDown(LocalPlayerWindDownEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerInvulned => {
+                GameEvent::PlayerInvulned(PlayerInvulnedEvent::read(stream, definition)?)
+            }
+            GameEventType::EscortSpeed => {
+                GameEvent::EscortSpeed(EscortSpeedEvent::read(stream, definition)?)
+            }
+            GameEventType::EscortProgress => {
+                GameEvent::EscortProgress(EscortProgressEvent::read(stream, definition)?)
+            }
+            GameEventType::EscortRecede => {
+                GameEvent::EscortRecede(EscortRecedeEvent::read(stream, definition)?)
+            }
+            GameEventType::GameUIActivated => {
+                GameEvent::GameUIActivated(GameUIActivatedEvent::read(stream, definition)?)
+            }
+            GameEventType::GameUIHidden => {
+                GameEvent::GameUIHidden(GameUIHiddenEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerEscortScore => {
+                GameEvent::PlayerEscortScore(PlayerEscortScoreEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerHealOnHit => {
+                GameEvent::PlayerHealOnHit(PlayerHealOnHitEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerStealSandvich => {
+                GameEvent::PlayerStealSandvich(PlayerStealSandvichEvent::read(stream, definition)?)
+            }
+            GameEventType::ShowClassLayout => {
+                GameEvent::ShowClassLayout(ShowClassLayoutEvent::read(stream, definition)?)
+            }
+            GameEventType::ShowVsPanel => {
+                GameEvent::ShowVsPanel(ShowVsPanelEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDamaged => {
+                GameEvent::PlayerDamaged(PlayerDamagedEvent::read(stream, definition)?)
+            }
+            GameEventType::ArenaPlayerNotification => GameEvent::ArenaPlayerNotification(
+                ArenaPlayerNotificationEvent::read(stream, definition)?,
+            ),
+            GameEventType::ArenaMatchMaxStreak => {
+                GameEvent::ArenaMatchMaxStreak(ArenaMatchMaxStreakEvent::read(stream, definition)?)
+            }
+            GameEventType::ArenaRoundStart => {
+                GameEvent::ArenaRoundStart(ArenaRoundStartEvent::read(stream, definition)?)
+            }
+            GameEventType::ArenaWinPanel => {
+                GameEvent::ArenaWinPanel(ArenaWinPanelEvent::read(stream, definition)?)
+            }
+            GameEventType::PveWinPanel => {
+                GameEvent::PveWinPanel(PveWinPanelEvent::read(stream, definition)?)
+            }
+            GameEventType::AirDash => GameEvent::AirDash(AirDashEvent::read(stream, definition)?),
+            GameEventType::Landed => GameEvent::Landed(LandedEvent::read(stream, definition)?),
+            GameEventType::PlayerDamageDodged => {
+                GameEvent::PlayerDamageDodged(PlayerDamageDodgedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerStunned => {
+                GameEvent::PlayerStunned(PlayerStunnedEvent::read(stream, definition)?)
+            }
+            GameEventType::ScoutGrandSlam => {
+                GameEvent::ScoutGrandSlam(ScoutGrandSlamEvent::read(stream, definition)?)
+            }
+            GameEventType::ScoutSlamdollLanded => {
+                GameEvent::ScoutSlamdollLanded(ScoutSlamdollLandedEvent::read(stream, definition)?)
+            }
+            GameEventType::ArrowImpact => {
+                GameEvent::ArrowImpact(ArrowImpactEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerJarated => {
+                GameEvent::PlayerJarated(PlayerJaratedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerJaratedFade => {
+                GameEvent::PlayerJaratedFade(PlayerJaratedFadeEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerShieldBlocked => {
+                GameEvent::PlayerShieldBlocked(PlayerShieldBlockedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerPinned => {
+                GameEvent::PlayerPinned(PlayerPinnedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerHealedByMedic => {
+                GameEvent::PlayerHealedByMedic(PlayerHealedByMedicEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerSappedObject => {
+                GameEvent::PlayerSappedObject(PlayerSappedObjectEvent::read(stream, definition)?)
+            }
+            GameEventType::ItemFound => {
+                GameEvent::ItemFound(ItemFoundEvent::read(stream, definition)?)
+            }
+            GameEventType::ShowAnnotation => {
+                GameEvent::ShowAnnotation(ShowAnnotationEvent::read(stream, definition)?)
+            }
+            GameEventType::HideAnnotation => {
+                GameEvent::HideAnnotation(HideAnnotationEvent::read(stream, definition)?)
+            }
+            GameEventType::PostInventoryApplication => GameEvent::PostInventoryApplication(
+                PostInventoryApplicationEvent::read(stream, definition)?,
+            ),
+            GameEventType::ControlPointUnlockUpdated => GameEvent::ControlPointUnlockUpdated(
+                ControlPointUnlockUpdatedEvent::read(stream, definition)?,
+            ),
+            GameEventType::DeployBuffBanner => {
+                GameEvent::DeployBuffBanner(DeployBuffBannerEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerBuff => {
+                GameEvent::PlayerBuff(PlayerBuffEvent::read(stream, definition)?)
+            }
+            GameEventType::MedicDeath => {
+                GameEvent::MedicDeath(MedicDeathEvent::read(stream, definition)?)
+            }
+            GameEventType::OvertimeNag => {
+                GameEvent::OvertimeNag(OvertimeNagEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamsChanged => {
+                GameEvent::TeamsChanged(TeamsChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::HalloweenPumpkinGrab => GameEvent::HalloweenPumpkinGrab(
+                HalloweenPumpkinGrabEvent::read(stream, definition)?,
+            ),
+            GameEventType::RocketJump => {
+                GameEvent::RocketJump(RocketJumpEvent::read(stream, definition)?)
+            }
+            GameEventType::RocketJumpLanded => {
+                GameEvent::RocketJumpLanded(RocketJumpLandedEvent::read(stream, definition)?)
+            }
+            GameEventType::StickyJump => {
+                GameEvent::StickyJump(StickyJumpEvent::read(stream, definition)?)
+            }
+            GameEventType::StickyJumpLanded => {
+                GameEvent::StickyJumpLanded(StickyJumpLandedEvent::read(stream, definition)?)
+            }
+            GameEventType::RocketPackLaunch => {
+                GameEvent::RocketPackLaunch(RocketPackLaunchEvent::read(stream, definition)?)
+            }
+            GameEventType::RocketPackLanded => {
+                GameEvent::RocketPackLanded(RocketPackLandedEvent::read(stream, definition)?)
+            }
+            GameEventType::MedicDefended => {
+                GameEvent::MedicDefended(MedicDefendedEvent::read(stream, definition)?)
+            }
+            GameEventType::LocalPlayerHealed => {
+                GameEvent::LocalPlayerHealed(LocalPlayerHealedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDestroyedPipeBomb => GameEvent::PlayerDestroyedPipeBomb(
+                PlayerDestroyedPipeBombEvent::read(stream, definition)?,
+            ),
+            GameEventType::ObjectDeflected => {
+                GameEvent::ObjectDeflected(ObjectDeflectedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerMvp => {
+                GameEvent::PlayerMvp(PlayerMvpEvent::read(stream, definition)?)
+            }
+            GameEventType::RaidSpawnMob => {
+                GameEvent::RaidSpawnMob(RaidSpawnMobEvent::read(stream, definition)?)
+            }
+            GameEventType::RaidSpawnSquad => {
+                GameEvent::RaidSpawnSquad(RaidSpawnSquadEvent::read(stream, definition)?)
+            }
+            GameEventType::NavBlocked => {
+                GameEvent::NavBlocked(NavBlockedEvent::read(stream, definition)?)
+            }
+            GameEventType::PathTrackPassed => {
+                GameEvent::PathTrackPassed(PathTrackPassedEvent::read(stream, definition)?)
+            }
+            GameEventType::NumCappersChanged => {
+                GameEvent::NumCappersChanged(NumCappersChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerRegenerate => {
+                GameEvent::PlayerRegenerate(PlayerRegenerateEvent::read(stream, definition)?)
+            }
+            GameEventType::UpdateStatusItem => {
+                GameEvent::UpdateStatusItem(UpdateStatusItemEvent::read(stream, definition)?)
+            }
+            GameEventType::StatsResetRound => {
+                GameEvent::StatsResetRound(StatsResetRoundEvent::read(stream, definition)?)
+            }
+            GameEventType::ScoreStatsAccumulatedUpdate => GameEvent::ScoreStatsAccumulatedUpdate(
+                ScoreStatsAccumulatedUpdateEvent::read(stream, definition)?,
+            ),
+            GameEventType::ScoreStatsAccumulatedReset => GameEvent::ScoreStatsAccumulatedReset(
+                ScoreStatsAccumulatedResetEvent::read(stream, definition)?,
+            ),
+            GameEventType::AchievementEarnedLocal => GameEvent::AchievementEarnedLocal(
+                AchievementEarnedLocalEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerHealed => {
+                GameEvent::PlayerHealed(PlayerHealedEvent::read(stream, definition)?)
+            }
+            GameEventType::BuildingHealed => {
+                GameEvent::BuildingHealed(BuildingHealedEvent::read(stream, definition)?)
+            }
+            GameEventType::ItemPickup => {
+                GameEvent::ItemPickup(ItemPickupEvent::read(stream, definition)?)
+            }
+            GameEventType::DuelStatus => {
+                GameEvent::DuelStatus(DuelStatusEvent::read(stream, definition)?)
+            }
+            GameEventType::FishNotice => {
+                GameEvent::FishNotice(Box::new(<FishNoticeEvent>::read(stream, definition)?))
+            }
+            GameEventType::FishNoticeArm => {
+                GameEvent::FishNoticeArm(Box::new(<FishNoticeArmEvent>::read(stream, definition)?))
+            }
+            GameEventType::SlapNotice => {
+                GameEvent::SlapNotice(Box::new(<SlapNoticeEvent>::read(stream, definition)?))
+            }
+            GameEventType::ThrowableHit => {
+                GameEvent::ThrowableHit(Box::new(<ThrowableHitEvent>::read(stream, definition)?))
+            }
+            GameEventType::PumpkinLordSummoned => {
+                GameEvent::PumpkinLordSummoned(PumpkinLordSummonedEvent::read(stream, definition)?)
+            }
+            GameEventType::PumpkinLordKilled => {
+                GameEvent::PumpkinLordKilled(PumpkinLordKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::MerasmusSummoned => {
+                GameEvent::MerasmusSummoned(MerasmusSummonedEvent::read(stream, definition)?)
+            }
+            GameEventType::MerasmusKilled => {
+                GameEvent::MerasmusKilled(MerasmusKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::MerasmusEscapeWarning => GameEvent::MerasmusEscapeWarning(
+                MerasmusEscapeWarningEvent::read(stream, definition)?,
+            ),
+            GameEventType::MerasmusEscaped => {
+                GameEvent::MerasmusEscaped(MerasmusEscapedEvent::read(stream, definition)?)
+            }
+            GameEventType::EyeballBossSummoned => {
+                GameEvent::EyeballBossSummoned(EyeballBossSummonedEvent::read(stream, definition)?)
+            }
+            GameEventType::EyeballBossStunned => {
+                GameEvent::EyeballBossStunned(EyeballBossStunnedEvent::read(stream, definition)?)
+            }
+            GameEventType::EyeballBossKilled => {
+                GameEvent::EyeballBossKilled(EyeballBossKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::EyeballBossKiller => {
+                GameEvent::EyeballBossKiller(EyeballBossKillerEvent::read(stream, definition)?)
+            }
+            GameEventType::EyeballBossEscapeImminent => GameEvent::EyeballBossEscapeImminent(
+                EyeballBossEscapeImminentEvent::read(stream, definition)?,
+            ),
+            GameEventType::EyeballBossEscaped => {
+                GameEvent::EyeballBossEscaped(EyeballBossEscapedEvent::read(stream, definition)?)
+            }
+            GameEventType::NpcHurt => GameEvent::NpcHurt(NpcHurtEvent::read(stream, definition)?),
+            GameEventType::ControlPointTimerUpdated => GameEvent::ControlPointTimerUpdated(
+                ControlPointTimerUpdatedEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerHighFiveStart => {
+                GameEvent::PlayerHighFiveStart(PlayerHighFiveStartEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerHighFiveCancel => GameEvent::PlayerHighFiveCancel(
+                PlayerHighFiveCancelEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerHighFiveSuccess => GameEvent::PlayerHighFiveSuccess(
+                PlayerHighFiveSuccessEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerBonusPoints => {
+                GameEvent::PlayerBonusPoints(PlayerBonusPointsEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerUpgraded => {
+                GameEvent::PlayerUpgraded(PlayerUpgradedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerBuyback => {
+                GameEvent::PlayerBuyback(PlayerBuybackEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerUsedPowerUpBottle => GameEvent::PlayerUsedPowerUpBottle(
+                PlayerUsedPowerUpBottleEvent::read(stream, definition)?,
+            ),
+            GameEventType::ChristmasGiftGrab => {
+                GameEvent::ChristmasGiftGrab(ChristmasGiftGrabEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerKilledAchievementZone => GameEvent::PlayerKilledAchievementZone(
+                PlayerKilledAchievementZoneEvent::read(stream, definition)?,
+            ),
+            GameEventType::PartyUpdated => {
+                GameEvent::PartyUpdated(PartyUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::PartyPrefChanged => {
+                GameEvent::PartyPrefChanged(PartyPrefChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::PartyCriteriaChanged => GameEvent::PartyCriteriaChanged(
+                PartyCriteriaChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::PartyInvitesChanged => {
+                GameEvent::PartyInvitesChanged(PartyInvitesChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::PartyQueueStateChanged => GameEvent::PartyQueueStateChanged(
+                PartyQueueStateChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::PartyChat => {
+                GameEvent::PartyChat(PartyChatEvent::read(stream, definition)?)
+            }
+            GameEventType::PartyMemberJoin => {
+                GameEvent::PartyMemberJoin(PartyMemberJoinEvent::read(stream, definition)?)
+            }
+            GameEventType::PartyMemberLeave => {
+                GameEvent::PartyMemberLeave(PartyMemberLeaveEvent::read(stream, definition)?)
+            }
+            GameEventType::MatchInvitesUpdated => {
+                GameEvent::MatchInvitesUpdated(MatchInvitesUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::LobbyUpdated => {
+                GameEvent::LobbyUpdated(LobbyUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmMissionUpdate => {
+                GameEvent::MvmMissionUpdate(MvmMissionUpdateEvent::read(stream, definition)?)
+            }
+            GameEventType::RecalculateHolidays => {
+                GameEvent::RecalculateHolidays(RecalculateHolidaysEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerCurrencyChanged => GameEvent::PlayerCurrencyChanged(
+                PlayerCurrencyChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::DoomsdayRocketOpen => {
+                GameEvent::DoomsdayRocketOpen(DoomsdayRocketOpenEvent::read(stream, definition)?)
+            }
+            GameEventType::RemoveNemesisRelationships => GameEvent::RemoveNemesisRelationships(
+                RemoveNemesisRelationshipsEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmCreditBonusWave => {
+                GameEvent::MvmCreditBonusWave(MvmCreditBonusWaveEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmCreditBonusAll => {
+                GameEvent::MvmCreditBonusAll(MvmCreditBonusAllEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmCreditBonusAllAdvanced => GameEvent::MvmCreditBonusAllAdvanced(
+                MvmCreditBonusAllAdvancedEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmQuickSentryUpgrade => GameEvent::MvmQuickSentryUpgrade(
+                MvmQuickSentryUpgradeEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmTankDestroyedByPlayers => GameEvent::MvmTankDestroyedByPlayers(
+                MvmTankDestroyedByPlayersEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmKillRobotDeliveringBomb => GameEvent::MvmKillRobotDeliveringBomb(
+                MvmKillRobotDeliveringBombEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmPickupCurrency => {
+                GameEvent::MvmPickupCurrency(MvmPickupCurrencyEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmBombCarrierKilled => GameEvent::MvmBombCarrierKilled(
+                MvmBombCarrierKilledEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmSentryBusterDetonate => GameEvent::MvmSentryBusterDetonate(
+                MvmSentryBusterDetonateEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmScoutMarkedForDeath => GameEvent::MvmScoutMarkedForDeath(
+                MvmScoutMarkedForDeathEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmMedicPowerUpShared => GameEvent::MvmMedicPowerUpShared(
+                MvmMedicPowerUpSharedEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmBeginWave => {
+                GameEvent::MvmBeginWave(MvmBeginWaveEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmWaveComplete => {
+                GameEvent::MvmWaveComplete(MvmWaveCompleteEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmMissionComplete => {
+                GameEvent::MvmMissionComplete(MvmMissionCompleteEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmBombResetByPlayer => GameEvent::MvmBombResetByPlayer(
+                MvmBombResetByPlayerEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmBombAlarmTriggered => GameEvent::MvmBombAlarmTriggered(
+                MvmBombAlarmTriggeredEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmBombDeployResetByPlayer => GameEvent::MvmBombDeployResetByPlayer(
+                MvmBombDeployResetByPlayerEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmWaveFailed => {
+                GameEvent::MvmWaveFailed(MvmWaveFailedEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmResetStats => {
+                GameEvent::MvmResetStats(MvmResetStatsEvent::read(stream, definition)?)
+            }
+            GameEventType::DamageResisted => {
+                GameEvent::DamageResisted(DamageResistedEvent::read(stream, definition)?)
+            }
+            GameEventType::RevivePlayerNotify => {
+                GameEvent::RevivePlayerNotify(RevivePlayerNotifyEvent::read(stream, definition)?)
+            }
+            GameEventType::RevivePlayerStopped => {
+                GameEvent::RevivePlayerStopped(RevivePlayerStoppedEvent::read(stream, definition)?)
+            }
+            GameEventType::RevivePlayerComplete => GameEvent::RevivePlayerComplete(
+                RevivePlayerCompleteEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerTurnedToGhost => {
+                GameEvent::PlayerTurnedToGhost(PlayerTurnedToGhostEvent::read(stream, definition)?)
+            }
+            GameEventType::MedigunShieldBlockedDamage => GameEvent::MedigunShieldBlockedDamage(
+                MedigunShieldBlockedDamageEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmAdvWaveCompleteNoGates => GameEvent::MvmAdvWaveCompleteNoGates(
+                MvmAdvWaveCompleteNoGatesEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmSniperHeadshotCurrency => GameEvent::MvmSniperHeadshotCurrency(
+                MvmSniperHeadshotCurrencyEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmMannhattanPit => {
+                GameEvent::MvmMannhattanPit(MvmMannhattanPitEvent::read(stream, definition)?)
+            }
+            GameEventType::FlagCarriedInDetectionZone => GameEvent::FlagCarriedInDetectionZone(
+                FlagCarriedInDetectionZoneEvent::read(stream, definition)?,
+            ),
+            GameEventType::MvmAdvWaveKilledStunRadio => GameEvent::MvmAdvWaveKilledStunRadio(
+                MvmAdvWaveKilledStunRadioEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerDirectHitStun => {
+                GameEvent::PlayerDirectHitStun(PlayerDirectHitStunEvent::read(stream, definition)?)
+            }
+            GameEventType::MvmSentryBusterKilled => GameEvent::MvmSentryBusterKilled(
+                MvmSentryBusterKilledEvent::read(stream, definition)?,
+            ),
+            GameEventType::UpgradesFileChanged => {
+                GameEvent::UpgradesFileChanged(UpgradesFileChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::RdTeamPointsChanged => {
+                GameEvent::RdTeamPointsChanged(RdTeamPointsChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::RdRulesStateChanged => {
+                GameEvent::RdRulesStateChanged(RdRulesStateChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::RdRobotKilled => {
+                GameEvent::RdRobotKilled(RdRobotKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::RdRobotImpact => {
+                GameEvent::RdRobotImpact(RdRobotImpactEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamPlayPreRoundTimeLeft => GameEvent::TeamPlayPreRoundTimeLeft(
+                TeamPlayPreRoundTimeLeftEvent::read(stream, definition)?,
+            ),
+            GameEventType::ParachuteDeploy => {
+                GameEvent::ParachuteDeploy(ParachuteDeployEvent::read(stream, definition)?)
+            }
+            GameEventType::ParachuteHolster => {
+                GameEvent::ParachuteHolster(ParachuteHolsterEvent::read(stream, definition)?)
+            }
+            GameEventType::KillRefillsMeter => {
+                GameEvent::KillRefillsMeter(KillRefillsMeterEvent::read(stream, definition)?)
+            }
+            GameEventType::RpsTauntEvent => {
+                GameEvent::RpsTauntEvent(RpsTauntEventEvent::read(stream, definition)?)
+            }
+            GameEventType::CongaKill => {
+                GameEvent::CongaKill(CongaKillEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerInitialSpawn => {
+                GameEvent::PlayerInitialSpawn(PlayerInitialSpawnEvent::read(stream, definition)?)
+            }
+            GameEventType::CompetitiveVictory => {
+                GameEvent::CompetitiveVictory(CompetitiveVictoryEvent::read(stream, definition)?)
+            }
+            GameEventType::CompetitiveStatsUpdate => GameEvent::CompetitiveStatsUpdate(
+                CompetitiveStatsUpdateEvent::read(stream, definition)?,
+            ),
+            GameEventType::MiniGameWin => {
+                GameEvent::MiniGameWin(MiniGameWinEvent::read(stream, definition)?)
+            }
+            GameEventType::SentryOnGoActive => {
+                GameEvent::SentryOnGoActive(SentryOnGoActiveEvent::read(stream, definition)?)
+            }
+            GameEventType::DuckXpLevelUp => {
+                GameEvent::DuckXpLevelUp(DuckXpLevelUpEvent::read(stream, definition)?)
+            }
+            GameEventType::QuestLogOpened => {
+                GameEvent::QuestLogOpened(QuestLogOpenedEvent::read(stream, definition)?)
+            }
+            GameEventType::SchemaUpdated => {
+                GameEvent::SchemaUpdated(SchemaUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::LocalPlayerPickupWeapon => GameEvent::LocalPlayerPickupWeapon(
+                LocalPlayerPickupWeaponEvent::read(stream, definition)?,
+            ),
+            GameEventType::RdPlayerScorePoints => {
+                GameEvent::RdPlayerScorePoints(RdPlayerScorePointsEvent::read(stream, definition)?)
+            }
+            GameEventType::DemomanDetStickies => {
+                GameEvent::DemomanDetStickies(DemomanDetStickiesEvent::read(stream, definition)?)
+            }
+            GameEventType::QuestObjectiveCompleted => GameEvent::QuestObjectiveCompleted(
+                QuestObjectiveCompletedEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerScoreChanged => {
+                GameEvent::PlayerScoreChanged(PlayerScoreChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::KilledCappingPlayer => {
+                GameEvent::KilledCappingPlayer(KilledCappingPlayerEvent::read(stream, definition)?)
+            }
+            GameEventType::EnvironmentalDeath => {
+                GameEvent::EnvironmentalDeath(EnvironmentalDeathEvent::read(stream, definition)?)
+            }
+            GameEventType::ProjectileDirectHit => {
+                GameEvent::ProjectileDirectHit(ProjectileDirectHitEvent::read(stream, definition)?)
+            }
+            GameEventType::PassGet => GameEvent::PassGet(PassGetEvent::read(stream, definition)?),
+            GameEventType::PassScore => {
+                GameEvent::PassScore(PassScoreEvent::read(stream, definition)?)
+            }
+            GameEventType::PassFree => {
+                GameEvent::PassFree(PassFreeEvent::read(stream, definition)?)
+            }
+            GameEventType::PassPassCaught => {
+                GameEvent::PassPassCaught(PassPassCaughtEvent::read(stream, definition)?)
+            }
+            GameEventType::PassBallStolen => {
+                GameEvent::PassBallStolen(PassBallStolenEvent::read(stream, definition)?)
+            }
+            GameEventType::PassBallBlocked => {
+                GameEvent::PassBallBlocked(PassBallBlockedEvent::read(stream, definition)?)
+            }
+            GameEventType::DamagePrevented => {
+                GameEvent::DamagePrevented(DamagePreventedEvent::read(stream, definition)?)
+            }
+            GameEventType::HalloweenBossKilled => {
+                GameEvent::HalloweenBossKilled(HalloweenBossKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::EscapedLootIsland => {
+                GameEvent::EscapedLootIsland(EscapedLootIslandEvent::read(stream, definition)?)
+            }
+            GameEventType::TaggedPlayerAsIt => {
+                GameEvent::TaggedPlayerAsIt(TaggedPlayerAsItEvent::read(stream, definition)?)
+            }
+            GameEventType::MerasmusStunned => {
+                GameEvent::MerasmusStunned(MerasmusStunnedEvent::read(stream, definition)?)
+            }
+            GameEventType::MerasmusPropFound => {
+                GameEvent::MerasmusPropFound(MerasmusPropFoundEvent::read(stream, definition)?)
+            }
+            GameEventType::HalloweenSkeletonKilled => GameEvent::HalloweenSkeletonKilled(
+                HalloweenSkeletonKilledEvent::read(stream, definition)?,
+            ),
+            GameEventType::EscapeHell => {
+                GameEvent::EscapeHell(EscapeHellEvent::read(stream, definition)?)
+            }
+            GameEventType::CrossSpectralBridge => {
+                GameEvent::CrossSpectralBridge(CrossSpectralBridgeEvent::read(stream, definition)?)
+            }
+            GameEventType::MiniGameWon => {
+                GameEvent::MiniGameWon(MiniGameWonEvent::read(stream, definition)?)
+            }
+            GameEventType::RespawnGhost => {
+                GameEvent::RespawnGhost(RespawnGhostEvent::read(stream, definition)?)
+            }
+            GameEventType::KillInHell => {
+                GameEvent::KillInHell(KillInHellEvent::read(stream, definition)?)
+            }
+            GameEventType::HalloweenDuckCollected => GameEvent::HalloweenDuckCollected(
+                HalloweenDuckCollectedEvent::read(stream, definition)?,
+            ),
+            GameEventType::SpecialScore => {
+                GameEvent::SpecialScore(SpecialScoreEvent::read(stream, definition)?)
+            }
+            GameEventType::TeamLeaderKilled => {
+                GameEvent::TeamLeaderKilled(TeamLeaderKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::HalloweenSoulCollected => GameEvent::HalloweenSoulCollected(
+                HalloweenSoulCollectedEvent::read(stream, definition)?,
+            ),
+            GameEventType::RecalculateTruce => {
+                GameEvent::RecalculateTruce(RecalculateTruceEvent::read(stream, definition)?)
+            }
+            GameEventType::DeadRingerCheatDeath => GameEvent::DeadRingerCheatDeath(
+                DeadRingerCheatDeathEvent::read(stream, definition)?,
+            ),
+            GameEventType::CrossbowHeal => {
+                GameEvent::CrossbowHeal(CrossbowHealEvent::read(stream, definition)?)
+            }
+            GameEventType::DamageMitigated => {
+                GameEvent::DamageMitigated(DamageMitigatedEvent::read(stream, definition)?)
+            }
+            GameEventType::PayloadPushed => {
+                GameEvent::PayloadPushed(PayloadPushedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerAbandonedMatch => GameEvent::PlayerAbandonedMatch(
+                PlayerAbandonedMatchEvent::read(stream, definition)?,
+            ),
+            GameEventType::ClDrawline => {
+                GameEvent::ClDrawline(ClDrawlineEvent::read(stream, definition)?)
+            }
+            GameEventType::RestartTimerTime => {
+                GameEvent::RestartTimerTime(RestartTimerTimeEvent::read(stream, definition)?)
+            }
+            GameEventType::WinLimitChanged => {
+                GameEvent::WinLimitChanged(WinLimitChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::WinPanelShowScores => {
+                GameEvent::WinPanelShowScores(WinPanelShowScoresEvent::read(stream, definition)?)
+            }
+            GameEventType::TopStreamsRequestFinished => GameEvent::TopStreamsRequestFinished(
+                TopStreamsRequestFinishedEvent::read(stream, definition)?,
+            ),
+            GameEventType::CompetitiveStateChanged => GameEvent::CompetitiveStateChanged(
+                CompetitiveStateChangedEvent::read(stream, definition)?,
+            ),
+            GameEventType::GlobalWarDataUpdated => GameEvent::GlobalWarDataUpdated(
+                GlobalWarDataUpdatedEvent::read(stream, definition)?,
+            ),
+            GameEventType::StopWatchChanged => {
+                GameEvent::StopWatchChanged(StopWatchChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::DsStop => GameEvent::DsStop(DsStopEvent::read(stream, definition)?),
+            GameEventType::DsScreenshot => {
+                GameEvent::DsScreenshot(DsScreenshotEvent::read(stream, definition)?)
+            }
+            GameEventType::ShowMatchSummary => {
+                GameEvent::ShowMatchSummary(ShowMatchSummaryEvent::read(stream, definition)?)
+            }
+            GameEventType::ExperienceChanged => {
+                GameEvent::ExperienceChanged(ExperienceChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::BeginXpLerp => {
+                GameEvent::BeginXpLerp(BeginXpLerpEvent::read(stream, definition)?)
+            }
+            GameEventType::MatchmakerStatsUpdated => GameEvent::MatchmakerStatsUpdated(
+                MatchmakerStatsUpdatedEvent::read(stream, definition)?,
+            ),
+            GameEventType::RematchVotePeriodOver => GameEvent::RematchVotePeriodOver(
+                RematchVotePeriodOverEvent::read(stream, definition)?,
+            ),
+            GameEventType::RematchFailedToCreate => GameEvent::RematchFailedToCreate(
+                RematchFailedToCreateEvent::read(stream, definition)?,
+            ),
+            GameEventType::PlayerRematchChange => {
+                GameEvent::PlayerRematchChange(PlayerRematchChangeEvent::read(stream, definition)?)
+            }
+            GameEventType::PingUpdated => {
+                GameEvent::PingUpdated(PingUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::MMStatsUpdated => {
+                GameEvent::MMStatsUpdated(MMStatsUpdatedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerNextMapVoteChange => GameEvent::PlayerNextMapVoteChange(
+                PlayerNextMapVoteChangeEvent::read(stream, definition)?,
+            ),
+            GameEventType::VoteMapsChanged => {
+                GameEvent::VoteMapsChanged(VoteMapsChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::ProtoDefChanged => {
+                GameEvent::ProtoDefChanged(ProtoDefChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerDomination => {
+                GameEvent::PlayerDomination(PlayerDominationEvent::read(stream, definition)?)
+            }
+            GameEventType::PlayerRocketPackPushed => GameEvent::PlayerRocketPackPushed(
+                PlayerRocketPackPushedEvent::read(stream, definition)?,
+            ),
+            GameEventType::QuestRequest => {
+                GameEvent::QuestRequest(QuestRequestEvent::read(stream, definition)?)
+            }
+            GameEventType::QuestResponse => {
+                GameEvent::QuestResponse(QuestResponseEvent::read(stream, definition)?)
+            }
+            GameEventType::QuestProgress => {
+                GameEvent::QuestProgress(QuestProgressEvent::read(stream, definition)?)
+            }
+            GameEventType::ProjectileRemoved => {
+                GameEvent::ProjectileRemoved(ProjectileRemovedEvent::read(stream, definition)?)
+            }
+            GameEventType::QuestMapDataChanged => {
+                GameEvent::QuestMapDataChanged(QuestMapDataChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::GasDousedPlayerIgnited => GameEvent::GasDousedPlayerIgnited(
+                GasDousedPlayerIgnitedEvent::read(stream, definition)?,
+            ),
+            GameEventType::QuestTurnInState => {
+                GameEvent::QuestTurnInState(QuestTurnInStateEvent::read(stream, definition)?)
+            }
+            GameEventType::ItemsAcknowledged => {
+                GameEvent::ItemsAcknowledged(ItemsAcknowledgedEvent::read(stream, definition)?)
+            }
+            GameEventType::CapperKilled => {
+                GameEvent::CapperKilled(CapperKilledEvent::read(stream, definition)?)
+            }
+            GameEventType::MainMenuStabilized => {
+                GameEvent::MainMenuStabilized(MainMenuStabilizedEvent::read(stream, definition)?)
+            }
+            GameEventType::WorldStatusChanged => {
+                GameEvent::WorldStatusChanged(WorldStatusChangedEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVStatus => {
+                GameEvent::HLTVStatus(HLTVStatusEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVCameraman => {
+                GameEvent::HLTVCameraman(HLTVCameramanEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVRankCamera => {
+                GameEvent::HLTVRankCamera(HLTVRankCameraEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVRankEntity => {
+                GameEvent::HLTVRankEntity(HLTVRankEntityEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVFixed => {
+                GameEvent::HLTVFixed(HLTVFixedEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVChase => {
+                GameEvent::HLTVChase(HLTVChaseEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVMessage => {
+                GameEvent::HLTVMessage(HLTVMessageEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVTitle => {
+                GameEvent::HLTVTitle(HLTVTitleEvent::read(stream, definition)?)
+            }
+            GameEventType::HLTVChat => {
+                GameEvent::HLTVChat(HLTVChatEvent::read(stream, definition)?)
+            }
+            GameEventType::ReplayStartRecord => {
+                GameEvent::ReplayStartRecord(ReplayStartRecordEvent::read(stream, definition)?)
+            }
+            GameEventType::ReplaySessionInfo => {
+                GameEvent::ReplaySessionInfo(ReplaySessionInfoEvent::read(stream, definition)?)
+            }
+            GameEventType::ReplayEndRecord => {
+                GameEvent::ReplayEndRecord(ReplayEndRecordEvent::read(stream, definition)?)
+            }
+            GameEventType::ReplayReplaysAvailable => GameEvent::ReplayReplaysAvailable(
+                ReplayReplaysAvailableEvent::read(stream, definition)?,
+            ),
+            GameEventType::ReplayServerError => {
+                GameEvent::ReplayServerError(ReplayServerErrorEvent::read(stream, definition)?)
+            }
+            GameEventType::Unknown(_) => {
+                GameEvent::Unknown(RawGameEvent::read(stream, definition)?)
+            }
+        })
     }
-    pub fn write(
-        &self,
-        stream: &mut BitWriteStream<LittleEndian>,
-    ) -> bitbuffer::Result<()> {
+    pub fn write(&self, stream: &mut BitWriteStream<LittleEndian>) -> bitbuffer::Result<()> {
         match &self {
             GameEvent::ServerSpawn(event) => event.write(stream),
             GameEvent::ServerChangeLevelFailed(event) => event.write(stream),
@@ -10301,9 +9541,7 @@ impl GameEvent {
     pub fn event_type(&self) -> GameEventType {
         match &self {
             GameEvent::ServerSpawn(_) => GameEventType::ServerSpawn,
-            GameEvent::ServerChangeLevelFailed(_) => {
-                GameEventType::ServerChangeLevelFailed
-            }
+            GameEvent::ServerChangeLevelFailed(_) => GameEventType::ServerChangeLevelFailed,
             GameEvent::ServerShutdown(_) => GameEventType::ServerShutdown,
             GameEvent::ServerCvar(_) => GameEventType::ServerCvar,
             GameEvent::ServerMessage(_) => GameEventType::ServerMessage,
@@ -10350,9 +9588,7 @@ impl GameEvent {
             GameEvent::AchievementIncrement(_) => GameEventType::AchievementIncrement,
             GameEvent::PhysgunPickup(_) => GameEventType::PhysgunPickup,
             GameEvent::FlareIgniteNpc(_) => GameEventType::FlareIgniteNpc,
-            GameEvent::HelicopterGrenadePuntMiss(_) => {
-                GameEventType::HelicopterGrenadePuntMiss
-            }
+            GameEvent::HelicopterGrenadePuntMiss(_) => GameEventType::HelicopterGrenadePuntMiss,
             GameEvent::UserDataDownloaded(_) => GameEventType::UserDataDownloaded,
             GameEvent::RagdollDissolved(_) => GameEventType::RagdollDissolved,
             GameEvent::HLTVChangedMode(_) => GameEventType::HLTVChangedMode,
@@ -10381,29 +9617,15 @@ impl GameEvent {
             GameEvent::TfMapTimeRemaining(_) => GameEventType::TfMapTimeRemaining,
             GameEvent::TfGameOver(_) => GameEventType::TfGameOver,
             GameEvent::CtfFlagCaptured(_) => GameEventType::CtfFlagCaptured,
-            GameEvent::ControlPointInitialized(_) => {
-                GameEventType::ControlPointInitialized
-            }
-            GameEvent::ControlPointUpdateImages(_) => {
-                GameEventType::ControlPointUpdateImages
-            }
-            GameEvent::ControlPointUpdateLayout(_) => {
-                GameEventType::ControlPointUpdateLayout
-            }
-            GameEvent::ControlPointUpdateCapping(_) => {
-                GameEventType::ControlPointUpdateCapping
-            }
-            GameEvent::ControlPointUpdateOwner(_) => {
-                GameEventType::ControlPointUpdateOwner
-            }
+            GameEvent::ControlPointInitialized(_) => GameEventType::ControlPointInitialized,
+            GameEvent::ControlPointUpdateImages(_) => GameEventType::ControlPointUpdateImages,
+            GameEvent::ControlPointUpdateLayout(_) => GameEventType::ControlPointUpdateLayout,
+            GameEvent::ControlPointUpdateCapping(_) => GameEventType::ControlPointUpdateCapping,
+            GameEvent::ControlPointUpdateOwner(_) => GameEventType::ControlPointUpdateOwner,
             GameEvent::ControlPointStartTouch(_) => GameEventType::ControlPointStartTouch,
             GameEvent::ControlPointEndTouch(_) => GameEventType::ControlPointEndTouch,
-            GameEvent::ControlPointPulseElement(_) => {
-                GameEventType::ControlPointPulseElement
-            }
-            GameEvent::ControlPointFakeCapture(_) => {
-                GameEventType::ControlPointFakeCapture
-            }
+            GameEvent::ControlPointPulseElement(_) => GameEventType::ControlPointPulseElement,
+            GameEvent::ControlPointFakeCapture(_) => GameEventType::ControlPointFakeCapture,
             GameEvent::ControlPointFakeCaptureMultiplier(_) => {
                 GameEventType::ControlPointFakeCaptureMultiplier
             }
@@ -10412,33 +9634,23 @@ impl GameEvent {
             GameEvent::TeamPlayRoundActive(_) => GameEventType::TeamPlayRoundActive,
             GameEvent::TeamPlayWaitingBegins(_) => GameEventType::TeamPlayWaitingBegins,
             GameEvent::TeamPlayWaitingEnds(_) => GameEventType::TeamPlayWaitingEnds,
-            GameEvent::TeamPlayWaitingAboutToEnd(_) => {
-                GameEventType::TeamPlayWaitingAboutToEnd
-            }
+            GameEvent::TeamPlayWaitingAboutToEnd(_) => GameEventType::TeamPlayWaitingAboutToEnd,
             GameEvent::TeamPlayRestartRound(_) => GameEventType::TeamPlayRestartRound,
             GameEvent::TeamPlayReadyRestart(_) => GameEventType::TeamPlayReadyRestart,
-            GameEvent::TeamPlayRoundRestartSeconds(_) => {
-                GameEventType::TeamPlayRoundRestartSeconds
-            }
+            GameEvent::TeamPlayRoundRestartSeconds(_) => GameEventType::TeamPlayRoundRestartSeconds,
             GameEvent::TeamPlayTeamReady(_) => GameEventType::TeamPlayTeamReady,
             GameEvent::TeamPlayRoundWin(_) => GameEventType::TeamPlayRoundWin,
             GameEvent::TeamPlayUpdateTimer(_) => GameEventType::TeamPlayUpdateTimer,
             GameEvent::TeamPlayRoundStalemate(_) => GameEventType::TeamPlayRoundStalemate,
             GameEvent::TeamPlayOvertimeBegin(_) => GameEventType::TeamPlayOvertimeBegin,
             GameEvent::TeamPlayOvertimeEnd(_) => GameEventType::TeamPlayOvertimeEnd,
-            GameEvent::TeamPlaySuddenDeathBegin(_) => {
-                GameEventType::TeamPlaySuddenDeathBegin
-            }
+            GameEvent::TeamPlaySuddenDeathBegin(_) => GameEventType::TeamPlaySuddenDeathBegin,
             GameEvent::TeamPlaySuddenDeathEnd(_) => GameEventType::TeamPlaySuddenDeathEnd,
             GameEvent::TeamPlayGameOver(_) => GameEventType::TeamPlayGameOver,
-            GameEvent::TeamPlayMapTimeRemaining(_) => {
-                GameEventType::TeamPlayMapTimeRemaining
-            }
+            GameEvent::TeamPlayMapTimeRemaining(_) => GameEventType::TeamPlayMapTimeRemaining,
             GameEvent::TeamPlayTimerFlash(_) => GameEventType::TeamPlayTimerFlash,
             GameEvent::TeamPlayTimerTimeAdded(_) => GameEventType::TeamPlayTimerTimeAdded,
-            GameEvent::TeamPlayPointStartCapture(_) => {
-                GameEventType::TeamPlayPointStartCapture
-            }
+            GameEvent::TeamPlayPointStartCapture(_) => GameEventType::TeamPlayPointStartCapture,
             GameEvent::TeamPlayPointCaptured(_) => GameEventType::TeamPlayPointCaptured,
             GameEvent::TeamPlayPointLocked(_) => GameEventType::TeamPlayPointLocked,
             GameEvent::TeamPlayPointUnlocked(_) => GameEventType::TeamPlayPointUnlocked,
@@ -10446,9 +9658,7 @@ impl GameEvent {
             GameEvent::TeamPlayCaptureBlocked(_) => GameEventType::TeamPlayCaptureBlocked,
             GameEvent::TeamPlayFlagEvent(_) => GameEventType::TeamPlayFlagEvent,
             GameEvent::TeamPlayWinPanel(_) => GameEventType::TeamPlayWinPanel,
-            GameEvent::TeamPlayTeamBalancedPlayer(_) => {
-                GameEventType::TeamPlayTeamBalancedPlayer
-            }
+            GameEvent::TeamPlayTeamBalancedPlayer(_) => GameEventType::TeamPlayTeamBalancedPlayer,
             GameEvent::TeamPlaySetupFinished(_) => GameEventType::TeamPlaySetupFinished,
             GameEvent::TeamPlayAlert(_) => GameEventType::TeamPlayAlert,
             GameEvent::TrainingComplete(_) => GameEventType::TrainingComplete,
@@ -10456,15 +9666,11 @@ impl GameEvent {
             GameEvent::HideFreezePanel(_) => GameEventType::HideFreezePanel,
             GameEvent::FreezeCamStarted(_) => GameEventType::FreezeCamStarted,
             GameEvent::LocalPlayerChangeTeam(_) => GameEventType::LocalPlayerChangeTeam,
-            GameEvent::LocalPlayerScoreChanged(_) => {
-                GameEventType::LocalPlayerScoreChanged
-            }
+            GameEvent::LocalPlayerScoreChanged(_) => GameEventType::LocalPlayerScoreChanged,
             GameEvent::LocalPlayerChangeClass(_) => GameEventType::LocalPlayerChangeClass,
             GameEvent::LocalPlayerRespawn(_) => GameEventType::LocalPlayerRespawn,
             GameEvent::BuildingInfoChanged(_) => GameEventType::BuildingInfoChanged,
-            GameEvent::LocalPlayerChangeDisguise(_) => {
-                GameEventType::LocalPlayerChangeDisguise
-            }
+            GameEvent::LocalPlayerChangeDisguise(_) => GameEventType::LocalPlayerChangeDisguise,
             GameEvent::PlayerAccountChanged(_) => GameEventType::PlayerAccountChanged,
             GameEvent::SpyPdaReset(_) => GameEventType::SpyPdaReset,
             GameEvent::FlagStatusUpdate(_) => GameEventType::FlagStatusUpdate,
@@ -10481,14 +9687,10 @@ impl GameEvent {
             GameEvent::AchievementEarned(_) => GameEventType::AchievementEarned,
             GameEvent::SpecTargetUpdated(_) => GameEventType::SpecTargetUpdated,
             GameEvent::TournamentStateUpdate(_) => GameEventType::TournamentStateUpdate,
-            GameEvent::TournamentEnableCountdown(_) => {
-                GameEventType::TournamentEnableCountdown
-            }
+            GameEvent::TournamentEnableCountdown(_) => GameEventType::TournamentEnableCountdown,
             GameEvent::PlayerCalledForMedic(_) => GameEventType::PlayerCalledForMedic,
             GameEvent::PlayerAskedForBall(_) => GameEventType::PlayerAskedForBall,
-            GameEvent::LocalPlayerBecameObserver(_) => {
-                GameEventType::LocalPlayerBecameObserver
-            }
+            GameEvent::LocalPlayerBecameObserver(_) => GameEventType::LocalPlayerBecameObserver,
             GameEvent::PlayerIgnitedInv(_) => GameEventType::PlayerIgnitedInv,
             GameEvent::PlayerIgnited(_) => GameEventType::PlayerIgnited,
             GameEvent::PlayerExtinguished(_) => GameEventType::PlayerExtinguished,
@@ -10508,9 +9710,7 @@ impl GameEvent {
             GameEvent::ShowClassLayout(_) => GameEventType::ShowClassLayout,
             GameEvent::ShowVsPanel(_) => GameEventType::ShowVsPanel,
             GameEvent::PlayerDamaged(_) => GameEventType::PlayerDamaged,
-            GameEvent::ArenaPlayerNotification(_) => {
-                GameEventType::ArenaPlayerNotification
-            }
+            GameEvent::ArenaPlayerNotification(_) => GameEventType::ArenaPlayerNotification,
             GameEvent::ArenaMatchMaxStreak(_) => GameEventType::ArenaMatchMaxStreak,
             GameEvent::ArenaRoundStart(_) => GameEventType::ArenaRoundStart,
             GameEvent::ArenaWinPanel(_) => GameEventType::ArenaWinPanel,
@@ -10531,12 +9731,8 @@ impl GameEvent {
             GameEvent::ItemFound(_) => GameEventType::ItemFound,
             GameEvent::ShowAnnotation(_) => GameEventType::ShowAnnotation,
             GameEvent::HideAnnotation(_) => GameEventType::HideAnnotation,
-            GameEvent::PostInventoryApplication(_) => {
-                GameEventType::PostInventoryApplication
-            }
-            GameEvent::ControlPointUnlockUpdated(_) => {
-                GameEventType::ControlPointUnlockUpdated
-            }
+            GameEvent::PostInventoryApplication(_) => GameEventType::PostInventoryApplication,
+            GameEvent::ControlPointUnlockUpdated(_) => GameEventType::ControlPointUnlockUpdated,
             GameEvent::DeployBuffBanner(_) => GameEventType::DeployBuffBanner,
             GameEvent::PlayerBuff(_) => GameEventType::PlayerBuff,
             GameEvent::MedicDeath(_) => GameEventType::MedicDeath,
@@ -10551,9 +9747,7 @@ impl GameEvent {
             GameEvent::RocketPackLanded(_) => GameEventType::RocketPackLanded,
             GameEvent::MedicDefended(_) => GameEventType::MedicDefended,
             GameEvent::LocalPlayerHealed(_) => GameEventType::LocalPlayerHealed,
-            GameEvent::PlayerDestroyedPipeBomb(_) => {
-                GameEventType::PlayerDestroyedPipeBomb
-            }
+            GameEvent::PlayerDestroyedPipeBomb(_) => GameEventType::PlayerDestroyedPipeBomb,
             GameEvent::ObjectDeflected(_) => GameEventType::ObjectDeflected,
             GameEvent::PlayerMvp(_) => GameEventType::PlayerMvp,
             GameEvent::RaidSpawnMob(_) => GameEventType::RaidSpawnMob,
@@ -10564,12 +9758,8 @@ impl GameEvent {
             GameEvent::PlayerRegenerate(_) => GameEventType::PlayerRegenerate,
             GameEvent::UpdateStatusItem(_) => GameEventType::UpdateStatusItem,
             GameEvent::StatsResetRound(_) => GameEventType::StatsResetRound,
-            GameEvent::ScoreStatsAccumulatedUpdate(_) => {
-                GameEventType::ScoreStatsAccumulatedUpdate
-            }
-            GameEvent::ScoreStatsAccumulatedReset(_) => {
-                GameEventType::ScoreStatsAccumulatedReset
-            }
+            GameEvent::ScoreStatsAccumulatedUpdate(_) => GameEventType::ScoreStatsAccumulatedUpdate,
+            GameEvent::ScoreStatsAccumulatedReset(_) => GameEventType::ScoreStatsAccumulatedReset,
             GameEvent::AchievementEarnedLocal(_) => GameEventType::AchievementEarnedLocal,
             GameEvent::PlayerHealed(_) => GameEventType::PlayerHealed,
             GameEvent::BuildingHealed(_) => GameEventType::BuildingHealed,
@@ -10589,27 +9779,19 @@ impl GameEvent {
             GameEvent::EyeballBossStunned(_) => GameEventType::EyeballBossStunned,
             GameEvent::EyeballBossKilled(_) => GameEventType::EyeballBossKilled,
             GameEvent::EyeballBossKiller(_) => GameEventType::EyeballBossKiller,
-            GameEvent::EyeballBossEscapeImminent(_) => {
-                GameEventType::EyeballBossEscapeImminent
-            }
+            GameEvent::EyeballBossEscapeImminent(_) => GameEventType::EyeballBossEscapeImminent,
             GameEvent::EyeballBossEscaped(_) => GameEventType::EyeballBossEscaped,
             GameEvent::NpcHurt(_) => GameEventType::NpcHurt,
-            GameEvent::ControlPointTimerUpdated(_) => {
-                GameEventType::ControlPointTimerUpdated
-            }
+            GameEvent::ControlPointTimerUpdated(_) => GameEventType::ControlPointTimerUpdated,
             GameEvent::PlayerHighFiveStart(_) => GameEventType::PlayerHighFiveStart,
             GameEvent::PlayerHighFiveCancel(_) => GameEventType::PlayerHighFiveCancel,
             GameEvent::PlayerHighFiveSuccess(_) => GameEventType::PlayerHighFiveSuccess,
             GameEvent::PlayerBonusPoints(_) => GameEventType::PlayerBonusPoints,
             GameEvent::PlayerUpgraded(_) => GameEventType::PlayerUpgraded,
             GameEvent::PlayerBuyback(_) => GameEventType::PlayerBuyback,
-            GameEvent::PlayerUsedPowerUpBottle(_) => {
-                GameEventType::PlayerUsedPowerUpBottle
-            }
+            GameEvent::PlayerUsedPowerUpBottle(_) => GameEventType::PlayerUsedPowerUpBottle,
             GameEvent::ChristmasGiftGrab(_) => GameEventType::ChristmasGiftGrab,
-            GameEvent::PlayerKilledAchievementZone(_) => {
-                GameEventType::PlayerKilledAchievementZone
-            }
+            GameEvent::PlayerKilledAchievementZone(_) => GameEventType::PlayerKilledAchievementZone,
             GameEvent::PartyUpdated(_) => GameEventType::PartyUpdated,
             GameEvent::PartyPrefChanged(_) => GameEventType::PartyPrefChanged,
             GameEvent::PartyCriteriaChanged(_) => GameEventType::PartyCriteriaChanged,
@@ -10624,26 +9806,16 @@ impl GameEvent {
             GameEvent::RecalculateHolidays(_) => GameEventType::RecalculateHolidays,
             GameEvent::PlayerCurrencyChanged(_) => GameEventType::PlayerCurrencyChanged,
             GameEvent::DoomsdayRocketOpen(_) => GameEventType::DoomsdayRocketOpen,
-            GameEvent::RemoveNemesisRelationships(_) => {
-                GameEventType::RemoveNemesisRelationships
-            }
+            GameEvent::RemoveNemesisRelationships(_) => GameEventType::RemoveNemesisRelationships,
             GameEvent::MvmCreditBonusWave(_) => GameEventType::MvmCreditBonusWave,
             GameEvent::MvmCreditBonusAll(_) => GameEventType::MvmCreditBonusAll,
-            GameEvent::MvmCreditBonusAllAdvanced(_) => {
-                GameEventType::MvmCreditBonusAllAdvanced
-            }
+            GameEvent::MvmCreditBonusAllAdvanced(_) => GameEventType::MvmCreditBonusAllAdvanced,
             GameEvent::MvmQuickSentryUpgrade(_) => GameEventType::MvmQuickSentryUpgrade,
-            GameEvent::MvmTankDestroyedByPlayers(_) => {
-                GameEventType::MvmTankDestroyedByPlayers
-            }
-            GameEvent::MvmKillRobotDeliveringBomb(_) => {
-                GameEventType::MvmKillRobotDeliveringBomb
-            }
+            GameEvent::MvmTankDestroyedByPlayers(_) => GameEventType::MvmTankDestroyedByPlayers,
+            GameEvent::MvmKillRobotDeliveringBomb(_) => GameEventType::MvmKillRobotDeliveringBomb,
             GameEvent::MvmPickupCurrency(_) => GameEventType::MvmPickupCurrency,
             GameEvent::MvmBombCarrierKilled(_) => GameEventType::MvmBombCarrierKilled,
-            GameEvent::MvmSentryBusterDetonate(_) => {
-                GameEventType::MvmSentryBusterDetonate
-            }
+            GameEvent::MvmSentryBusterDetonate(_) => GameEventType::MvmSentryBusterDetonate,
             GameEvent::MvmScoutMarkedForDeath(_) => GameEventType::MvmScoutMarkedForDeath,
             GameEvent::MvmMedicPowerUpShared(_) => GameEventType::MvmMedicPowerUpShared,
             GameEvent::MvmBeginWave(_) => GameEventType::MvmBeginWave,
@@ -10651,9 +9823,7 @@ impl GameEvent {
             GameEvent::MvmMissionComplete(_) => GameEventType::MvmMissionComplete,
             GameEvent::MvmBombResetByPlayer(_) => GameEventType::MvmBombResetByPlayer,
             GameEvent::MvmBombAlarmTriggered(_) => GameEventType::MvmBombAlarmTriggered,
-            GameEvent::MvmBombDeployResetByPlayer(_) => {
-                GameEventType::MvmBombDeployResetByPlayer
-            }
+            GameEvent::MvmBombDeployResetByPlayer(_) => GameEventType::MvmBombDeployResetByPlayer,
             GameEvent::MvmWaveFailed(_) => GameEventType::MvmWaveFailed,
             GameEvent::MvmResetStats(_) => GameEventType::MvmResetStats,
             GameEvent::DamageResisted(_) => GameEventType::DamageResisted,
@@ -10661,22 +9831,12 @@ impl GameEvent {
             GameEvent::RevivePlayerStopped(_) => GameEventType::RevivePlayerStopped,
             GameEvent::RevivePlayerComplete(_) => GameEventType::RevivePlayerComplete,
             GameEvent::PlayerTurnedToGhost(_) => GameEventType::PlayerTurnedToGhost,
-            GameEvent::MedigunShieldBlockedDamage(_) => {
-                GameEventType::MedigunShieldBlockedDamage
-            }
-            GameEvent::MvmAdvWaveCompleteNoGates(_) => {
-                GameEventType::MvmAdvWaveCompleteNoGates
-            }
-            GameEvent::MvmSniperHeadshotCurrency(_) => {
-                GameEventType::MvmSniperHeadshotCurrency
-            }
+            GameEvent::MedigunShieldBlockedDamage(_) => GameEventType::MedigunShieldBlockedDamage,
+            GameEvent::MvmAdvWaveCompleteNoGates(_) => GameEventType::MvmAdvWaveCompleteNoGates,
+            GameEvent::MvmSniperHeadshotCurrency(_) => GameEventType::MvmSniperHeadshotCurrency,
             GameEvent::MvmMannhattanPit(_) => GameEventType::MvmMannhattanPit,
-            GameEvent::FlagCarriedInDetectionZone(_) => {
-                GameEventType::FlagCarriedInDetectionZone
-            }
-            GameEvent::MvmAdvWaveKilledStunRadio(_) => {
-                GameEventType::MvmAdvWaveKilledStunRadio
-            }
+            GameEvent::FlagCarriedInDetectionZone(_) => GameEventType::FlagCarriedInDetectionZone,
+            GameEvent::MvmAdvWaveKilledStunRadio(_) => GameEventType::MvmAdvWaveKilledStunRadio,
             GameEvent::PlayerDirectHitStun(_) => GameEventType::PlayerDirectHitStun,
             GameEvent::MvmSentryBusterKilled(_) => GameEventType::MvmSentryBusterKilled,
             GameEvent::UpgradesFileChanged(_) => GameEventType::UpgradesFileChanged,
@@ -10684,9 +9844,7 @@ impl GameEvent {
             GameEvent::RdRulesStateChanged(_) => GameEventType::RdRulesStateChanged,
             GameEvent::RdRobotKilled(_) => GameEventType::RdRobotKilled,
             GameEvent::RdRobotImpact(_) => GameEventType::RdRobotImpact,
-            GameEvent::TeamPlayPreRoundTimeLeft(_) => {
-                GameEventType::TeamPlayPreRoundTimeLeft
-            }
+            GameEvent::TeamPlayPreRoundTimeLeft(_) => GameEventType::TeamPlayPreRoundTimeLeft,
             GameEvent::ParachuteDeploy(_) => GameEventType::ParachuteDeploy,
             GameEvent::ParachuteHolster(_) => GameEventType::ParachuteHolster,
             GameEvent::KillRefillsMeter(_) => GameEventType::KillRefillsMeter,
@@ -10700,14 +9858,10 @@ impl GameEvent {
             GameEvent::DuckXpLevelUp(_) => GameEventType::DuckXpLevelUp,
             GameEvent::QuestLogOpened(_) => GameEventType::QuestLogOpened,
             GameEvent::SchemaUpdated(_) => GameEventType::SchemaUpdated,
-            GameEvent::LocalPlayerPickupWeapon(_) => {
-                GameEventType::LocalPlayerPickupWeapon
-            }
+            GameEvent::LocalPlayerPickupWeapon(_) => GameEventType::LocalPlayerPickupWeapon,
             GameEvent::RdPlayerScorePoints(_) => GameEventType::RdPlayerScorePoints,
             GameEvent::DemomanDetStickies(_) => GameEventType::DemomanDetStickies,
-            GameEvent::QuestObjectiveCompleted(_) => {
-                GameEventType::QuestObjectiveCompleted
-            }
+            GameEvent::QuestObjectiveCompleted(_) => GameEventType::QuestObjectiveCompleted,
             GameEvent::PlayerScoreChanged(_) => GameEventType::PlayerScoreChanged,
             GameEvent::KilledCappingPlayer(_) => GameEventType::KilledCappingPlayer,
             GameEvent::EnvironmentalDeath(_) => GameEventType::EnvironmentalDeath,
@@ -10724,9 +9878,7 @@ impl GameEvent {
             GameEvent::TaggedPlayerAsIt(_) => GameEventType::TaggedPlayerAsIt,
             GameEvent::MerasmusStunned(_) => GameEventType::MerasmusStunned,
             GameEvent::MerasmusPropFound(_) => GameEventType::MerasmusPropFound,
-            GameEvent::HalloweenSkeletonKilled(_) => {
-                GameEventType::HalloweenSkeletonKilled
-            }
+            GameEvent::HalloweenSkeletonKilled(_) => GameEventType::HalloweenSkeletonKilled,
             GameEvent::EscapeHell(_) => GameEventType::EscapeHell,
             GameEvent::CrossSpectralBridge(_) => GameEventType::CrossSpectralBridge,
             GameEvent::MiniGameWon(_) => GameEventType::MiniGameWon,
@@ -10746,12 +9898,8 @@ impl GameEvent {
             GameEvent::RestartTimerTime(_) => GameEventType::RestartTimerTime,
             GameEvent::WinLimitChanged(_) => GameEventType::WinLimitChanged,
             GameEvent::WinPanelShowScores(_) => GameEventType::WinPanelShowScores,
-            GameEvent::TopStreamsRequestFinished(_) => {
-                GameEventType::TopStreamsRequestFinished
-            }
-            GameEvent::CompetitiveStateChanged(_) => {
-                GameEventType::CompetitiveStateChanged
-            }
+            GameEvent::TopStreamsRequestFinished(_) => GameEventType::TopStreamsRequestFinished,
+            GameEvent::CompetitiveStateChanged(_) => GameEventType::CompetitiveStateChanged,
             GameEvent::GlobalWarDataUpdated(_) => GameEventType::GlobalWarDataUpdated,
             GameEvent::StopWatchChanged(_) => GameEventType::StopWatchChanged,
             GameEvent::DsStop(_) => GameEventType::DsStop,
@@ -10765,9 +9913,7 @@ impl GameEvent {
             GameEvent::PlayerRematchChange(_) => GameEventType::PlayerRematchChange,
             GameEvent::PingUpdated(_) => GameEventType::PingUpdated,
             GameEvent::MMStatsUpdated(_) => GameEventType::MMStatsUpdated,
-            GameEvent::PlayerNextMapVoteChange(_) => {
-                GameEventType::PlayerNextMapVoteChange
-            }
+            GameEvent::PlayerNextMapVoteChange(_) => GameEventType::PlayerNextMapVoteChange,
             GameEvent::VoteMapsChanged(_) => GameEventType::VoteMapsChanged,
             GameEvent::ProtoDefChanged(_) => GameEventType::ProtoDefChanged,
             GameEvent::PlayerDomination(_) => GameEventType::PlayerDomination,
@@ -10804,26 +9950,53 @@ impl GameEvent {
 pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
     [
         ("ServerSpawn", std::mem::size_of::<ServerSpawnEvent>()),
-        ("ServerChangeLevelFailed", std::mem::size_of::<ServerChangeLevelFailedEvent>()),
+        (
+            "ServerChangeLevelFailed",
+            std::mem::size_of::<ServerChangeLevelFailedEvent>(),
+        ),
         ("ServerShutdown", std::mem::size_of::<ServerShutdownEvent>()),
         ("ServerCvar", std::mem::size_of::<ServerCvarEvent>()),
         ("ServerMessage", std::mem::size_of::<ServerMessageEvent>()),
         ("ServerAddBan", std::mem::size_of::<ServerAddBanEvent>()),
-        ("ServerRemoveBan", std::mem::size_of::<ServerRemoveBanEvent>()),
+        (
+            "ServerRemoveBan",
+            std::mem::size_of::<ServerRemoveBanEvent>(),
+        ),
         ("PlayerConnect", std::mem::size_of::<PlayerConnectEvent>()),
-        ("PlayerConnectClient", std::mem::size_of::<PlayerConnectClientEvent>()),
+        (
+            "PlayerConnectClient",
+            std::mem::size_of::<PlayerConnectClientEvent>(),
+        ),
         ("PlayerInfo", std::mem::size_of::<PlayerInfoEvent>()),
-        ("PlayerDisconnect", std::mem::size_of::<PlayerDisconnectEvent>()),
+        (
+            "PlayerDisconnect",
+            std::mem::size_of::<PlayerDisconnectEvent>(),
+        ),
         ("PlayerActivate", std::mem::size_of::<PlayerActivateEvent>()),
         ("PlayerSay", std::mem::size_of::<PlayerSayEvent>()),
-        ("ClientDisconnect", std::mem::size_of::<ClientDisconnectEvent>()),
-        ("ClientBeginConnect", std::mem::size_of::<ClientBeginConnectEvent>()),
-        ("ClientConnected", std::mem::size_of::<ClientConnectedEvent>()),
-        ("ClientFullConnect", std::mem::size_of::<ClientFullConnectEvent>()),
+        (
+            "ClientDisconnect",
+            std::mem::size_of::<ClientDisconnectEvent>(),
+        ),
+        (
+            "ClientBeginConnect",
+            std::mem::size_of::<ClientBeginConnectEvent>(),
+        ),
+        (
+            "ClientConnected",
+            std::mem::size_of::<ClientConnectedEvent>(),
+        ),
+        (
+            "ClientFullConnect",
+            std::mem::size_of::<ClientFullConnectEvent>(),
+        ),
         ("HostQuit", std::mem::size_of::<HostQuitEvent>()),
         ("TeamInfo", std::mem::size_of::<TeamInfoEvent>()),
         ("TeamScore", std::mem::size_of::<TeamScoreEvent>()),
-        ("TeamPlayBroadcastAudio", std::mem::size_of::<TeamPlayBroadcastAudioEvent>()),
+        (
+            "TeamPlayBroadcastAudio",
+            std::mem::size_of::<TeamPlayBroadcastAudioEvent>(),
+        ),
         ("PlayerTeam", std::mem::size_of::<PlayerTeamEvent>()),
         ("PlayerClass", std::mem::size_of::<PlayerClassEvent>()),
         ("PlayerDeath", std::mem::size_of::<PlayerDeathEvent>()),
@@ -10833,9 +10006,18 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("PlayerSpawn", std::mem::size_of::<PlayerSpawnEvent>()),
         ("PlayerShoot", std::mem::size_of::<PlayerShootEvent>()),
         ("PlayerUse", std::mem::size_of::<PlayerUseEvent>()),
-        ("PlayerChangeName", std::mem::size_of::<PlayerChangeNameEvent>()),
-        ("PlayerHintMessage", std::mem::size_of::<PlayerHintMessageEvent>()),
-        ("BasePlayerTeleported", std::mem::size_of::<BasePlayerTeleportedEvent>()),
+        (
+            "PlayerChangeName",
+            std::mem::size_of::<PlayerChangeNameEvent>(),
+        ),
+        (
+            "PlayerHintMessage",
+            std::mem::size_of::<PlayerHintMessageEvent>(),
+        ),
+        (
+            "BasePlayerTeleported",
+            std::mem::size_of::<BasePlayerTeleportedEvent>(),
+        ),
         ("GameInit", std::mem::size_of::<GameInitEvent>()),
         ("GameNewMap", std::mem::size_of::<GameNewMapEvent>()),
         ("GameStart", std::mem::size_of::<GameStartEvent>()),
@@ -10847,18 +10029,36 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("BreakProp", std::mem::size_of::<BreakPropEvent>()),
         ("EntityKilled", std::mem::size_of::<EntityKilledEvent>()),
         ("BonusUpdated", std::mem::size_of::<BonusUpdatedEvent>()),
-        ("AchievementEvent", std::mem::size_of::<AchievementEventEvent>()),
-        ("AchievementIncrement", std::mem::size_of::<AchievementIncrementEvent>()),
+        (
+            "AchievementEvent",
+            std::mem::size_of::<AchievementEventEvent>(),
+        ),
+        (
+            "AchievementIncrement",
+            std::mem::size_of::<AchievementIncrementEvent>(),
+        ),
         ("PhysgunPickup", std::mem::size_of::<PhysgunPickupEvent>()),
         ("FlareIgniteNpc", std::mem::size_of::<FlareIgniteNpcEvent>()),
         (
             "HelicopterGrenadePuntMiss",
             std::mem::size_of::<HelicopterGrenadePuntMissEvent>(),
         ),
-        ("UserDataDownloaded", std::mem::size_of::<UserDataDownloadedEvent>()),
-        ("RagdollDissolved", std::mem::size_of::<RagdollDissolvedEvent>()),
-        ("HLTVChangedMode", std::mem::size_of::<HLTVChangedModeEvent>()),
-        ("HLTVChangedTarget", std::mem::size_of::<HLTVChangedTargetEvent>()),
+        (
+            "UserDataDownloaded",
+            std::mem::size_of::<UserDataDownloadedEvent>(),
+        ),
+        (
+            "RagdollDissolved",
+            std::mem::size_of::<RagdollDissolvedEvent>(),
+        ),
+        (
+            "HLTVChangedMode",
+            std::mem::size_of::<HLTVChangedModeEvent>(),
+        ),
+        (
+            "HLTVChangedTarget",
+            std::mem::size_of::<HLTVChangedTargetEvent>(),
+        ),
         ("VoteEnded", std::mem::size_of::<VoteEndedEvent>()),
         ("VoteStarted", std::mem::size_of::<VoteStartedEvent>()),
         ("VoteChanged", std::mem::size_of::<VoteChangedEvent>()),
@@ -10867,23 +10067,56 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("VoteCast", std::mem::size_of::<VoteCastEvent>()),
         ("VoteOptions", std::mem::size_of::<VoteOptionsEvent>()),
         ("ReplaySaved", std::mem::size_of::<ReplaySavedEvent>()),
-        ("EnteredPerformanceMode", std::mem::size_of::<EnteredPerformanceModeEvent>()),
+        (
+            "EnteredPerformanceMode",
+            std::mem::size_of::<EnteredPerformanceModeEvent>(),
+        ),
         ("BrowseReplays", std::mem::size_of::<BrowseReplaysEvent>()),
-        ("ReplayYoutubeStats", std::mem::size_of::<ReplayYoutubeStatsEvent>()),
-        ("InventoryUpdated", std::mem::size_of::<InventoryUpdatedEvent>()),
+        (
+            "ReplayYoutubeStats",
+            std::mem::size_of::<ReplayYoutubeStatsEvent>(),
+        ),
+        (
+            "InventoryUpdated",
+            std::mem::size_of::<InventoryUpdatedEvent>(),
+        ),
         ("CartUpdated", std::mem::size_of::<CartUpdatedEvent>()),
-        ("StorePriceSheetUpdated", std::mem::size_of::<StorePriceSheetUpdatedEvent>()),
-        ("EconInventoryConnected", std::mem::size_of::<EconInventoryConnectedEvent>()),
-        ("ItemSchemaInitialized", std::mem::size_of::<ItemSchemaInitializedEvent>()),
+        (
+            "StorePriceSheetUpdated",
+            std::mem::size_of::<StorePriceSheetUpdatedEvent>(),
+        ),
+        (
+            "EconInventoryConnected",
+            std::mem::size_of::<EconInventoryConnectedEvent>(),
+        ),
+        (
+            "ItemSchemaInitialized",
+            std::mem::size_of::<ItemSchemaInitializedEvent>(),
+        ),
         ("GcNewSession", std::mem::size_of::<GcNewSessionEvent>()),
         ("GcLostSession", std::mem::size_of::<GcLostSessionEvent>()),
         ("IntroFinish", std::mem::size_of::<IntroFinishEvent>()),
-        ("IntroNextCamera", std::mem::size_of::<IntroNextCameraEvent>()),
-        ("PlayerChangeClass", std::mem::size_of::<PlayerChangeClassEvent>()),
-        ("TfMapTimeRemaining", std::mem::size_of::<TfMapTimeRemainingEvent>()),
+        (
+            "IntroNextCamera",
+            std::mem::size_of::<IntroNextCameraEvent>(),
+        ),
+        (
+            "PlayerChangeClass",
+            std::mem::size_of::<PlayerChangeClassEvent>(),
+        ),
+        (
+            "TfMapTimeRemaining",
+            std::mem::size_of::<TfMapTimeRemainingEvent>(),
+        ),
         ("TfGameOver", std::mem::size_of::<TfGameOverEvent>()),
-        ("CtfFlagCaptured", std::mem::size_of::<CtfFlagCapturedEvent>()),
-        ("ControlPointInitialized", std::mem::size_of::<ControlPointInitializedEvent>()),
+        (
+            "CtfFlagCaptured",
+            std::mem::size_of::<CtfFlagCapturedEvent>(),
+        ),
+        (
+            "ControlPointInitialized",
+            std::mem::size_of::<ControlPointInitializedEvent>(),
+        ),
         (
             "ControlPointUpdateImages",
             std::mem::size_of::<ControlPointUpdateImagesEvent>(),
@@ -10896,144 +10129,366 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "ControlPointUpdateCapping",
             std::mem::size_of::<ControlPointUpdateCappingEvent>(),
         ),
-        ("ControlPointUpdateOwner", std::mem::size_of::<ControlPointUpdateOwnerEvent>()),
-        ("ControlPointStartTouch", std::mem::size_of::<ControlPointStartTouchEvent>()),
-        ("ControlPointEndTouch", std::mem::size_of::<ControlPointEndTouchEvent>()),
+        (
+            "ControlPointUpdateOwner",
+            std::mem::size_of::<ControlPointUpdateOwnerEvent>(),
+        ),
+        (
+            "ControlPointStartTouch",
+            std::mem::size_of::<ControlPointStartTouchEvent>(),
+        ),
+        (
+            "ControlPointEndTouch",
+            std::mem::size_of::<ControlPointEndTouchEvent>(),
+        ),
         (
             "ControlPointPulseElement",
             std::mem::size_of::<ControlPointPulseElementEvent>(),
         ),
-        ("ControlPointFakeCapture", std::mem::size_of::<ControlPointFakeCaptureEvent>()),
+        (
+            "ControlPointFakeCapture",
+            std::mem::size_of::<ControlPointFakeCaptureEvent>(),
+        ),
         (
             "ControlPointFakeCaptureMultiplier",
             std::mem::size_of::<ControlPointFakeCaptureMultiplierEvent>(),
         ),
-        ("TeamPlayRoundSelected", std::mem::size_of::<TeamPlayRoundSelectedEvent>()),
-        ("TeamPlayRoundStart", std::mem::size_of::<TeamPlayRoundStartEvent>()),
-        ("TeamPlayRoundActive", std::mem::size_of::<TeamPlayRoundActiveEvent>()),
-        ("TeamPlayWaitingBegins", std::mem::size_of::<TeamPlayWaitingBeginsEvent>()),
-        ("TeamPlayWaitingEnds", std::mem::size_of::<TeamPlayWaitingEndsEvent>()),
+        (
+            "TeamPlayRoundSelected",
+            std::mem::size_of::<TeamPlayRoundSelectedEvent>(),
+        ),
+        (
+            "TeamPlayRoundStart",
+            std::mem::size_of::<TeamPlayRoundStartEvent>(),
+        ),
+        (
+            "TeamPlayRoundActive",
+            std::mem::size_of::<TeamPlayRoundActiveEvent>(),
+        ),
+        (
+            "TeamPlayWaitingBegins",
+            std::mem::size_of::<TeamPlayWaitingBeginsEvent>(),
+        ),
+        (
+            "TeamPlayWaitingEnds",
+            std::mem::size_of::<TeamPlayWaitingEndsEvent>(),
+        ),
         (
             "TeamPlayWaitingAboutToEnd",
             std::mem::size_of::<TeamPlayWaitingAboutToEndEvent>(),
         ),
-        ("TeamPlayRestartRound", std::mem::size_of::<TeamPlayRestartRoundEvent>()),
-        ("TeamPlayReadyRestart", std::mem::size_of::<TeamPlayReadyRestartEvent>()),
+        (
+            "TeamPlayRestartRound",
+            std::mem::size_of::<TeamPlayRestartRoundEvent>(),
+        ),
+        (
+            "TeamPlayReadyRestart",
+            std::mem::size_of::<TeamPlayReadyRestartEvent>(),
+        ),
         (
             "TeamPlayRoundRestartSeconds",
             std::mem::size_of::<TeamPlayRoundRestartSecondsEvent>(),
         ),
-        ("TeamPlayTeamReady", std::mem::size_of::<TeamPlayTeamReadyEvent>()),
-        ("TeamPlayRoundWin", std::mem::size_of::<TeamPlayRoundWinEvent>()),
-        ("TeamPlayUpdateTimer", std::mem::size_of::<TeamPlayUpdateTimerEvent>()),
-        ("TeamPlayRoundStalemate", std::mem::size_of::<TeamPlayRoundStalemateEvent>()),
-        ("TeamPlayOvertimeBegin", std::mem::size_of::<TeamPlayOvertimeBeginEvent>()),
-        ("TeamPlayOvertimeEnd", std::mem::size_of::<TeamPlayOvertimeEndEvent>()),
+        (
+            "TeamPlayTeamReady",
+            std::mem::size_of::<TeamPlayTeamReadyEvent>(),
+        ),
+        (
+            "TeamPlayRoundWin",
+            std::mem::size_of::<TeamPlayRoundWinEvent>(),
+        ),
+        (
+            "TeamPlayUpdateTimer",
+            std::mem::size_of::<TeamPlayUpdateTimerEvent>(),
+        ),
+        (
+            "TeamPlayRoundStalemate",
+            std::mem::size_of::<TeamPlayRoundStalemateEvent>(),
+        ),
+        (
+            "TeamPlayOvertimeBegin",
+            std::mem::size_of::<TeamPlayOvertimeBeginEvent>(),
+        ),
+        (
+            "TeamPlayOvertimeEnd",
+            std::mem::size_of::<TeamPlayOvertimeEndEvent>(),
+        ),
         (
             "TeamPlaySuddenDeathBegin",
             std::mem::size_of::<TeamPlaySuddenDeathBeginEvent>(),
         ),
-        ("TeamPlaySuddenDeathEnd", std::mem::size_of::<TeamPlaySuddenDeathEndEvent>()),
-        ("TeamPlayGameOver", std::mem::size_of::<TeamPlayGameOverEvent>()),
+        (
+            "TeamPlaySuddenDeathEnd",
+            std::mem::size_of::<TeamPlaySuddenDeathEndEvent>(),
+        ),
+        (
+            "TeamPlayGameOver",
+            std::mem::size_of::<TeamPlayGameOverEvent>(),
+        ),
         (
             "TeamPlayMapTimeRemaining",
             std::mem::size_of::<TeamPlayMapTimeRemainingEvent>(),
         ),
-        ("TeamPlayTimerFlash", std::mem::size_of::<TeamPlayTimerFlashEvent>()),
-        ("TeamPlayTimerTimeAdded", std::mem::size_of::<TeamPlayTimerTimeAddedEvent>()),
+        (
+            "TeamPlayTimerFlash",
+            std::mem::size_of::<TeamPlayTimerFlashEvent>(),
+        ),
+        (
+            "TeamPlayTimerTimeAdded",
+            std::mem::size_of::<TeamPlayTimerTimeAddedEvent>(),
+        ),
         (
             "TeamPlayPointStartCapture",
             std::mem::size_of::<TeamPlayPointStartCaptureEvent>(),
         ),
-        ("TeamPlayPointCaptured", std::mem::size_of::<TeamPlayPointCapturedEvent>()),
-        ("TeamPlayPointLocked", std::mem::size_of::<TeamPlayPointLockedEvent>()),
-        ("TeamPlayPointUnlocked", std::mem::size_of::<TeamPlayPointUnlockedEvent>()),
-        ("TeamPlayCaptureBroken", std::mem::size_of::<TeamPlayCaptureBrokenEvent>()),
-        ("TeamPlayCaptureBlocked", std::mem::size_of::<TeamPlayCaptureBlockedEvent>()),
-        ("TeamPlayFlagEvent", std::mem::size_of::<TeamPlayFlagEventEvent>()),
-        ("TeamPlayWinPanel", std::mem::size_of::<TeamPlayWinPanelEvent>()),
+        (
+            "TeamPlayPointCaptured",
+            std::mem::size_of::<TeamPlayPointCapturedEvent>(),
+        ),
+        (
+            "TeamPlayPointLocked",
+            std::mem::size_of::<TeamPlayPointLockedEvent>(),
+        ),
+        (
+            "TeamPlayPointUnlocked",
+            std::mem::size_of::<TeamPlayPointUnlockedEvent>(),
+        ),
+        (
+            "TeamPlayCaptureBroken",
+            std::mem::size_of::<TeamPlayCaptureBrokenEvent>(),
+        ),
+        (
+            "TeamPlayCaptureBlocked",
+            std::mem::size_of::<TeamPlayCaptureBlockedEvent>(),
+        ),
+        (
+            "TeamPlayFlagEvent",
+            std::mem::size_of::<TeamPlayFlagEventEvent>(),
+        ),
+        (
+            "TeamPlayWinPanel",
+            std::mem::size_of::<TeamPlayWinPanelEvent>(),
+        ),
         (
             "TeamPlayTeamBalancedPlayer",
             std::mem::size_of::<TeamPlayTeamBalancedPlayerEvent>(),
         ),
-        ("TeamPlaySetupFinished", std::mem::size_of::<TeamPlaySetupFinishedEvent>()),
+        (
+            "TeamPlaySetupFinished",
+            std::mem::size_of::<TeamPlaySetupFinishedEvent>(),
+        ),
         ("TeamPlayAlert", std::mem::size_of::<TeamPlayAlertEvent>()),
-        ("TrainingComplete", std::mem::size_of::<TrainingCompleteEvent>()),
-        ("ShowFreezePanel", std::mem::size_of::<ShowFreezePanelEvent>()),
-        ("HideFreezePanel", std::mem::size_of::<HideFreezePanelEvent>()),
-        ("FreezeCamStarted", std::mem::size_of::<FreezeCamStartedEvent>()),
-        ("LocalPlayerChangeTeam", std::mem::size_of::<LocalPlayerChangeTeamEvent>()),
-        ("LocalPlayerScoreChanged", std::mem::size_of::<LocalPlayerScoreChangedEvent>()),
-        ("LocalPlayerChangeClass", std::mem::size_of::<LocalPlayerChangeClassEvent>()),
-        ("LocalPlayerRespawn", std::mem::size_of::<LocalPlayerRespawnEvent>()),
-        ("BuildingInfoChanged", std::mem::size_of::<BuildingInfoChangedEvent>()),
+        (
+            "TrainingComplete",
+            std::mem::size_of::<TrainingCompleteEvent>(),
+        ),
+        (
+            "ShowFreezePanel",
+            std::mem::size_of::<ShowFreezePanelEvent>(),
+        ),
+        (
+            "HideFreezePanel",
+            std::mem::size_of::<HideFreezePanelEvent>(),
+        ),
+        (
+            "FreezeCamStarted",
+            std::mem::size_of::<FreezeCamStartedEvent>(),
+        ),
+        (
+            "LocalPlayerChangeTeam",
+            std::mem::size_of::<LocalPlayerChangeTeamEvent>(),
+        ),
+        (
+            "LocalPlayerScoreChanged",
+            std::mem::size_of::<LocalPlayerScoreChangedEvent>(),
+        ),
+        (
+            "LocalPlayerChangeClass",
+            std::mem::size_of::<LocalPlayerChangeClassEvent>(),
+        ),
+        (
+            "LocalPlayerRespawn",
+            std::mem::size_of::<LocalPlayerRespawnEvent>(),
+        ),
+        (
+            "BuildingInfoChanged",
+            std::mem::size_of::<BuildingInfoChangedEvent>(),
+        ),
         (
             "LocalPlayerChangeDisguise",
             std::mem::size_of::<LocalPlayerChangeDisguiseEvent>(),
         ),
-        ("PlayerAccountChanged", std::mem::size_of::<PlayerAccountChangedEvent>()),
+        (
+            "PlayerAccountChanged",
+            std::mem::size_of::<PlayerAccountChangedEvent>(),
+        ),
         ("SpyPdaReset", std::mem::size_of::<SpyPdaResetEvent>()),
-        ("FlagStatusUpdate", std::mem::size_of::<FlagStatusUpdateEvent>()),
-        ("PlayerStatsUpdated", std::mem::size_of::<PlayerStatsUpdatedEvent>()),
-        ("PlayingCommentary", std::mem::size_of::<PlayingCommentaryEvent>()),
-        ("PlayerChargeDeployed", std::mem::size_of::<PlayerChargeDeployedEvent>()),
-        ("PlayerBuiltObject", std::mem::size_of::<PlayerBuiltObjectEvent>()),
-        ("PlayerUpgradedObject", std::mem::size_of::<PlayerUpgradedObjectEvent>()),
-        ("PlayerCarryObject", std::mem::size_of::<PlayerCarryObjectEvent>()),
-        ("PlayerDropObject", std::mem::size_of::<PlayerDropObjectEvent>()),
+        (
+            "FlagStatusUpdate",
+            std::mem::size_of::<FlagStatusUpdateEvent>(),
+        ),
+        (
+            "PlayerStatsUpdated",
+            std::mem::size_of::<PlayerStatsUpdatedEvent>(),
+        ),
+        (
+            "PlayingCommentary",
+            std::mem::size_of::<PlayingCommentaryEvent>(),
+        ),
+        (
+            "PlayerChargeDeployed",
+            std::mem::size_of::<PlayerChargeDeployedEvent>(),
+        ),
+        (
+            "PlayerBuiltObject",
+            std::mem::size_of::<PlayerBuiltObjectEvent>(),
+        ),
+        (
+            "PlayerUpgradedObject",
+            std::mem::size_of::<PlayerUpgradedObjectEvent>(),
+        ),
+        (
+            "PlayerCarryObject",
+            std::mem::size_of::<PlayerCarryObjectEvent>(),
+        ),
+        (
+            "PlayerDropObject",
+            std::mem::size_of::<PlayerDropObjectEvent>(),
+        ),
         ("ObjectRemoved", std::mem::size_of::<ObjectRemovedEvent>()),
-        ("ObjectDestroyed", std::mem::size_of::<ObjectDestroyedEvent>()),
-        ("ObjectDetonated", std::mem::size_of::<ObjectDetonatedEvent>()),
-        ("AchievementEarned", std::mem::size_of::<AchievementEarnedEvent>()),
-        ("SpecTargetUpdated", std::mem::size_of::<SpecTargetUpdatedEvent>()),
-        ("TournamentStateUpdate", std::mem::size_of::<TournamentStateUpdateEvent>()),
+        (
+            "ObjectDestroyed",
+            std::mem::size_of::<ObjectDestroyedEvent>(),
+        ),
+        (
+            "ObjectDetonated",
+            std::mem::size_of::<ObjectDetonatedEvent>(),
+        ),
+        (
+            "AchievementEarned",
+            std::mem::size_of::<AchievementEarnedEvent>(),
+        ),
+        (
+            "SpecTargetUpdated",
+            std::mem::size_of::<SpecTargetUpdatedEvent>(),
+        ),
+        (
+            "TournamentStateUpdate",
+            std::mem::size_of::<TournamentStateUpdateEvent>(),
+        ),
         (
             "TournamentEnableCountdown",
             std::mem::size_of::<TournamentEnableCountdownEvent>(),
         ),
-        ("PlayerCalledForMedic", std::mem::size_of::<PlayerCalledForMedicEvent>()),
-        ("PlayerAskedForBall", std::mem::size_of::<PlayerAskedForBallEvent>()),
+        (
+            "PlayerCalledForMedic",
+            std::mem::size_of::<PlayerCalledForMedicEvent>(),
+        ),
+        (
+            "PlayerAskedForBall",
+            std::mem::size_of::<PlayerAskedForBallEvent>(),
+        ),
         (
             "LocalPlayerBecameObserver",
             std::mem::size_of::<LocalPlayerBecameObserverEvent>(),
         ),
-        ("PlayerIgnitedInv", std::mem::size_of::<PlayerIgnitedInvEvent>()),
+        (
+            "PlayerIgnitedInv",
+            std::mem::size_of::<PlayerIgnitedInvEvent>(),
+        ),
         ("PlayerIgnited", std::mem::size_of::<PlayerIgnitedEvent>()),
-        ("PlayerExtinguished", std::mem::size_of::<PlayerExtinguishedEvent>()),
-        ("PlayerTeleported", std::mem::size_of::<PlayerTeleportedEvent>()),
-        ("PlayerHealedMedicCall", std::mem::size_of::<PlayerHealedMedicCallEvent>()),
-        ("LocalPlayerChargeReady", std::mem::size_of::<LocalPlayerChargeReadyEvent>()),
-        ("LocalPlayerWindDown", std::mem::size_of::<LocalPlayerWindDownEvent>()),
+        (
+            "PlayerExtinguished",
+            std::mem::size_of::<PlayerExtinguishedEvent>(),
+        ),
+        (
+            "PlayerTeleported",
+            std::mem::size_of::<PlayerTeleportedEvent>(),
+        ),
+        (
+            "PlayerHealedMedicCall",
+            std::mem::size_of::<PlayerHealedMedicCallEvent>(),
+        ),
+        (
+            "LocalPlayerChargeReady",
+            std::mem::size_of::<LocalPlayerChargeReadyEvent>(),
+        ),
+        (
+            "LocalPlayerWindDown",
+            std::mem::size_of::<LocalPlayerWindDownEvent>(),
+        ),
         ("PlayerInvulned", std::mem::size_of::<PlayerInvulnedEvent>()),
         ("EscortSpeed", std::mem::size_of::<EscortSpeedEvent>()),
         ("EscortProgress", std::mem::size_of::<EscortProgressEvent>()),
         ("EscortRecede", std::mem::size_of::<EscortRecedeEvent>()),
-        ("GameUIActivated", std::mem::size_of::<GameUIActivatedEvent>()),
+        (
+            "GameUIActivated",
+            std::mem::size_of::<GameUIActivatedEvent>(),
+        ),
         ("GameUIHidden", std::mem::size_of::<GameUIHiddenEvent>()),
-        ("PlayerEscortScore", std::mem::size_of::<PlayerEscortScoreEvent>()),
-        ("PlayerHealOnHit", std::mem::size_of::<PlayerHealOnHitEvent>()),
-        ("PlayerStealSandvich", std::mem::size_of::<PlayerStealSandvichEvent>()),
-        ("ShowClassLayout", std::mem::size_of::<ShowClassLayoutEvent>()),
+        (
+            "PlayerEscortScore",
+            std::mem::size_of::<PlayerEscortScoreEvent>(),
+        ),
+        (
+            "PlayerHealOnHit",
+            std::mem::size_of::<PlayerHealOnHitEvent>(),
+        ),
+        (
+            "PlayerStealSandvich",
+            std::mem::size_of::<PlayerStealSandvichEvent>(),
+        ),
+        (
+            "ShowClassLayout",
+            std::mem::size_of::<ShowClassLayoutEvent>(),
+        ),
         ("ShowVsPanel", std::mem::size_of::<ShowVsPanelEvent>()),
         ("PlayerDamaged", std::mem::size_of::<PlayerDamagedEvent>()),
-        ("ArenaPlayerNotification", std::mem::size_of::<ArenaPlayerNotificationEvent>()),
-        ("ArenaMatchMaxStreak", std::mem::size_of::<ArenaMatchMaxStreakEvent>()),
-        ("ArenaRoundStart", std::mem::size_of::<ArenaRoundStartEvent>()),
+        (
+            "ArenaPlayerNotification",
+            std::mem::size_of::<ArenaPlayerNotificationEvent>(),
+        ),
+        (
+            "ArenaMatchMaxStreak",
+            std::mem::size_of::<ArenaMatchMaxStreakEvent>(),
+        ),
+        (
+            "ArenaRoundStart",
+            std::mem::size_of::<ArenaRoundStartEvent>(),
+        ),
         ("ArenaWinPanel", std::mem::size_of::<ArenaWinPanelEvent>()),
         ("PveWinPanel", std::mem::size_of::<PveWinPanelEvent>()),
         ("AirDash", std::mem::size_of::<AirDashEvent>()),
         ("Landed", std::mem::size_of::<LandedEvent>()),
-        ("PlayerDamageDodged", std::mem::size_of::<PlayerDamageDodgedEvent>()),
+        (
+            "PlayerDamageDodged",
+            std::mem::size_of::<PlayerDamageDodgedEvent>(),
+        ),
         ("PlayerStunned", std::mem::size_of::<PlayerStunnedEvent>()),
         ("ScoutGrandSlam", std::mem::size_of::<ScoutGrandSlamEvent>()),
-        ("ScoutSlamdollLanded", std::mem::size_of::<ScoutSlamdollLandedEvent>()),
+        (
+            "ScoutSlamdollLanded",
+            std::mem::size_of::<ScoutSlamdollLandedEvent>(),
+        ),
         ("ArrowImpact", std::mem::size_of::<ArrowImpactEvent>()),
         ("PlayerJarated", std::mem::size_of::<PlayerJaratedEvent>()),
-        ("PlayerJaratedFade", std::mem::size_of::<PlayerJaratedFadeEvent>()),
-        ("PlayerShieldBlocked", std::mem::size_of::<PlayerShieldBlockedEvent>()),
+        (
+            "PlayerJaratedFade",
+            std::mem::size_of::<PlayerJaratedFadeEvent>(),
+        ),
+        (
+            "PlayerShieldBlocked",
+            std::mem::size_of::<PlayerShieldBlockedEvent>(),
+        ),
         ("PlayerPinned", std::mem::size_of::<PlayerPinnedEvent>()),
-        ("PlayerHealedByMedic", std::mem::size_of::<PlayerHealedByMedicEvent>()),
-        ("PlayerSappedObject", std::mem::size_of::<PlayerSappedObjectEvent>()),
+        (
+            "PlayerHealedByMedic",
+            std::mem::size_of::<PlayerHealedByMedicEvent>(),
+        ),
+        (
+            "PlayerSappedObject",
+            std::mem::size_of::<PlayerSappedObjectEvent>(),
+        ),
         ("ItemFound", std::mem::size_of::<ItemFoundEvent>()),
         ("ShowAnnotation", std::mem::size_of::<ShowAnnotationEvent>()),
         ("HideAnnotation", std::mem::size_of::<HideAnnotationEvent>()),
@@ -11045,31 +10500,73 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "ControlPointUnlockUpdated",
             std::mem::size_of::<ControlPointUnlockUpdatedEvent>(),
         ),
-        ("DeployBuffBanner", std::mem::size_of::<DeployBuffBannerEvent>()),
+        (
+            "DeployBuffBanner",
+            std::mem::size_of::<DeployBuffBannerEvent>(),
+        ),
         ("PlayerBuff", std::mem::size_of::<PlayerBuffEvent>()),
         ("MedicDeath", std::mem::size_of::<MedicDeathEvent>()),
         ("OvertimeNag", std::mem::size_of::<OvertimeNagEvent>()),
         ("TeamsChanged", std::mem::size_of::<TeamsChangedEvent>()),
-        ("HalloweenPumpkinGrab", std::mem::size_of::<HalloweenPumpkinGrabEvent>()),
+        (
+            "HalloweenPumpkinGrab",
+            std::mem::size_of::<HalloweenPumpkinGrabEvent>(),
+        ),
         ("RocketJump", std::mem::size_of::<RocketJumpEvent>()),
-        ("RocketJumpLanded", std::mem::size_of::<RocketJumpLandedEvent>()),
+        (
+            "RocketJumpLanded",
+            std::mem::size_of::<RocketJumpLandedEvent>(),
+        ),
         ("StickyJump", std::mem::size_of::<StickyJumpEvent>()),
-        ("StickyJumpLanded", std::mem::size_of::<StickyJumpLandedEvent>()),
-        ("RocketPackLaunch", std::mem::size_of::<RocketPackLaunchEvent>()),
-        ("RocketPackLanded", std::mem::size_of::<RocketPackLandedEvent>()),
+        (
+            "StickyJumpLanded",
+            std::mem::size_of::<StickyJumpLandedEvent>(),
+        ),
+        (
+            "RocketPackLaunch",
+            std::mem::size_of::<RocketPackLaunchEvent>(),
+        ),
+        (
+            "RocketPackLanded",
+            std::mem::size_of::<RocketPackLandedEvent>(),
+        ),
         ("MedicDefended", std::mem::size_of::<MedicDefendedEvent>()),
-        ("LocalPlayerHealed", std::mem::size_of::<LocalPlayerHealedEvent>()),
-        ("PlayerDestroyedPipeBomb", std::mem::size_of::<PlayerDestroyedPipeBombEvent>()),
-        ("ObjectDeflected", std::mem::size_of::<ObjectDeflectedEvent>()),
+        (
+            "LocalPlayerHealed",
+            std::mem::size_of::<LocalPlayerHealedEvent>(),
+        ),
+        (
+            "PlayerDestroyedPipeBomb",
+            std::mem::size_of::<PlayerDestroyedPipeBombEvent>(),
+        ),
+        (
+            "ObjectDeflected",
+            std::mem::size_of::<ObjectDeflectedEvent>(),
+        ),
         ("PlayerMvp", std::mem::size_of::<PlayerMvpEvent>()),
         ("RaidSpawnMob", std::mem::size_of::<RaidSpawnMobEvent>()),
         ("RaidSpawnSquad", std::mem::size_of::<RaidSpawnSquadEvent>()),
         ("NavBlocked", std::mem::size_of::<NavBlockedEvent>()),
-        ("PathTrackPassed", std::mem::size_of::<PathTrackPassedEvent>()),
-        ("NumCappersChanged", std::mem::size_of::<NumCappersChangedEvent>()),
-        ("PlayerRegenerate", std::mem::size_of::<PlayerRegenerateEvent>()),
-        ("UpdateStatusItem", std::mem::size_of::<UpdateStatusItemEvent>()),
-        ("StatsResetRound", std::mem::size_of::<StatsResetRoundEvent>()),
+        (
+            "PathTrackPassed",
+            std::mem::size_of::<PathTrackPassedEvent>(),
+        ),
+        (
+            "NumCappersChanged",
+            std::mem::size_of::<NumCappersChangedEvent>(),
+        ),
+        (
+            "PlayerRegenerate",
+            std::mem::size_of::<PlayerRegenerateEvent>(),
+        ),
+        (
+            "UpdateStatusItem",
+            std::mem::size_of::<UpdateStatusItemEvent>(),
+        ),
+        (
+            "StatsResetRound",
+            std::mem::size_of::<StatsResetRoundEvent>(),
+        ),
         (
             "ScoreStatsAccumulatedUpdate",
             std::mem::size_of::<ScoreStatsAccumulatedUpdateEvent>(),
@@ -11078,7 +10575,10 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "ScoreStatsAccumulatedReset",
             std::mem::size_of::<ScoreStatsAccumulatedResetEvent>(),
         ),
-        ("AchievementEarnedLocal", std::mem::size_of::<AchievementEarnedLocalEvent>()),
+        (
+            "AchievementEarnedLocal",
+            std::mem::size_of::<AchievementEarnedLocalEvent>(),
+        ),
         ("PlayerHealed", std::mem::size_of::<PlayerHealedEvent>()),
         ("BuildingHealed", std::mem::size_of::<BuildingHealedEvent>()),
         ("ItemPickup", std::mem::size_of::<ItemPickupEvent>()),
@@ -11087,63 +10587,153 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("FishNoticeArm", std::mem::size_of::<FishNoticeArmEvent>()),
         ("SlapNotice", std::mem::size_of::<SlapNoticeEvent>()),
         ("ThrowableHit", std::mem::size_of::<ThrowableHitEvent>()),
-        ("PumpkinLordSummoned", std::mem::size_of::<PumpkinLordSummonedEvent>()),
-        ("PumpkinLordKilled", std::mem::size_of::<PumpkinLordKilledEvent>()),
-        ("MerasmusSummoned", std::mem::size_of::<MerasmusSummonedEvent>()),
+        (
+            "PumpkinLordSummoned",
+            std::mem::size_of::<PumpkinLordSummonedEvent>(),
+        ),
+        (
+            "PumpkinLordKilled",
+            std::mem::size_of::<PumpkinLordKilledEvent>(),
+        ),
+        (
+            "MerasmusSummoned",
+            std::mem::size_of::<MerasmusSummonedEvent>(),
+        ),
         ("MerasmusKilled", std::mem::size_of::<MerasmusKilledEvent>()),
-        ("MerasmusEscapeWarning", std::mem::size_of::<MerasmusEscapeWarningEvent>()),
-        ("MerasmusEscaped", std::mem::size_of::<MerasmusEscapedEvent>()),
-        ("EyeballBossSummoned", std::mem::size_of::<EyeballBossSummonedEvent>()),
-        ("EyeballBossStunned", std::mem::size_of::<EyeballBossStunnedEvent>()),
-        ("EyeballBossKilled", std::mem::size_of::<EyeballBossKilledEvent>()),
-        ("EyeballBossKiller", std::mem::size_of::<EyeballBossKillerEvent>()),
+        (
+            "MerasmusEscapeWarning",
+            std::mem::size_of::<MerasmusEscapeWarningEvent>(),
+        ),
+        (
+            "MerasmusEscaped",
+            std::mem::size_of::<MerasmusEscapedEvent>(),
+        ),
+        (
+            "EyeballBossSummoned",
+            std::mem::size_of::<EyeballBossSummonedEvent>(),
+        ),
+        (
+            "EyeballBossStunned",
+            std::mem::size_of::<EyeballBossStunnedEvent>(),
+        ),
+        (
+            "EyeballBossKilled",
+            std::mem::size_of::<EyeballBossKilledEvent>(),
+        ),
+        (
+            "EyeballBossKiller",
+            std::mem::size_of::<EyeballBossKillerEvent>(),
+        ),
         (
             "EyeballBossEscapeImminent",
             std::mem::size_of::<EyeballBossEscapeImminentEvent>(),
         ),
-        ("EyeballBossEscaped", std::mem::size_of::<EyeballBossEscapedEvent>()),
+        (
+            "EyeballBossEscaped",
+            std::mem::size_of::<EyeballBossEscapedEvent>(),
+        ),
         ("NpcHurt", std::mem::size_of::<NpcHurtEvent>()),
         (
             "ControlPointTimerUpdated",
             std::mem::size_of::<ControlPointTimerUpdatedEvent>(),
         ),
-        ("PlayerHighFiveStart", std::mem::size_of::<PlayerHighFiveStartEvent>()),
-        ("PlayerHighFiveCancel", std::mem::size_of::<PlayerHighFiveCancelEvent>()),
-        ("PlayerHighFiveSuccess", std::mem::size_of::<PlayerHighFiveSuccessEvent>()),
-        ("PlayerBonusPoints", std::mem::size_of::<PlayerBonusPointsEvent>()),
+        (
+            "PlayerHighFiveStart",
+            std::mem::size_of::<PlayerHighFiveStartEvent>(),
+        ),
+        (
+            "PlayerHighFiveCancel",
+            std::mem::size_of::<PlayerHighFiveCancelEvent>(),
+        ),
+        (
+            "PlayerHighFiveSuccess",
+            std::mem::size_of::<PlayerHighFiveSuccessEvent>(),
+        ),
+        (
+            "PlayerBonusPoints",
+            std::mem::size_of::<PlayerBonusPointsEvent>(),
+        ),
         ("PlayerUpgraded", std::mem::size_of::<PlayerUpgradedEvent>()),
         ("PlayerBuyback", std::mem::size_of::<PlayerBuybackEvent>()),
-        ("PlayerUsedPowerUpBottle", std::mem::size_of::<PlayerUsedPowerUpBottleEvent>()),
-        ("ChristmasGiftGrab", std::mem::size_of::<ChristmasGiftGrabEvent>()),
+        (
+            "PlayerUsedPowerUpBottle",
+            std::mem::size_of::<PlayerUsedPowerUpBottleEvent>(),
+        ),
+        (
+            "ChristmasGiftGrab",
+            std::mem::size_of::<ChristmasGiftGrabEvent>(),
+        ),
         (
             "PlayerKilledAchievementZone",
             std::mem::size_of::<PlayerKilledAchievementZoneEvent>(),
         ),
         ("PartyUpdated", std::mem::size_of::<PartyUpdatedEvent>()),
-        ("PartyPrefChanged", std::mem::size_of::<PartyPrefChangedEvent>()),
-        ("PartyCriteriaChanged", std::mem::size_of::<PartyCriteriaChangedEvent>()),
-        ("PartyInvitesChanged", std::mem::size_of::<PartyInvitesChangedEvent>()),
-        ("PartyQueueStateChanged", std::mem::size_of::<PartyQueueStateChangedEvent>()),
+        (
+            "PartyPrefChanged",
+            std::mem::size_of::<PartyPrefChangedEvent>(),
+        ),
+        (
+            "PartyCriteriaChanged",
+            std::mem::size_of::<PartyCriteriaChangedEvent>(),
+        ),
+        (
+            "PartyInvitesChanged",
+            std::mem::size_of::<PartyInvitesChangedEvent>(),
+        ),
+        (
+            "PartyQueueStateChanged",
+            std::mem::size_of::<PartyQueueStateChangedEvent>(),
+        ),
         ("PartyChat", std::mem::size_of::<PartyChatEvent>()),
-        ("PartyMemberJoin", std::mem::size_of::<PartyMemberJoinEvent>()),
-        ("PartyMemberLeave", std::mem::size_of::<PartyMemberLeaveEvent>()),
-        ("MatchInvitesUpdated", std::mem::size_of::<MatchInvitesUpdatedEvent>()),
+        (
+            "PartyMemberJoin",
+            std::mem::size_of::<PartyMemberJoinEvent>(),
+        ),
+        (
+            "PartyMemberLeave",
+            std::mem::size_of::<PartyMemberLeaveEvent>(),
+        ),
+        (
+            "MatchInvitesUpdated",
+            std::mem::size_of::<MatchInvitesUpdatedEvent>(),
+        ),
         ("LobbyUpdated", std::mem::size_of::<LobbyUpdatedEvent>()),
-        ("MvmMissionUpdate", std::mem::size_of::<MvmMissionUpdateEvent>()),
-        ("RecalculateHolidays", std::mem::size_of::<RecalculateHolidaysEvent>()),
-        ("PlayerCurrencyChanged", std::mem::size_of::<PlayerCurrencyChangedEvent>()),
-        ("DoomsdayRocketOpen", std::mem::size_of::<DoomsdayRocketOpenEvent>()),
+        (
+            "MvmMissionUpdate",
+            std::mem::size_of::<MvmMissionUpdateEvent>(),
+        ),
+        (
+            "RecalculateHolidays",
+            std::mem::size_of::<RecalculateHolidaysEvent>(),
+        ),
+        (
+            "PlayerCurrencyChanged",
+            std::mem::size_of::<PlayerCurrencyChangedEvent>(),
+        ),
+        (
+            "DoomsdayRocketOpen",
+            std::mem::size_of::<DoomsdayRocketOpenEvent>(),
+        ),
         (
             "RemoveNemesisRelationships",
             std::mem::size_of::<RemoveNemesisRelationshipsEvent>(),
         ),
-        ("MvmCreditBonusWave", std::mem::size_of::<MvmCreditBonusWaveEvent>()),
-        ("MvmCreditBonusAll", std::mem::size_of::<MvmCreditBonusAllEvent>()),
+        (
+            "MvmCreditBonusWave",
+            std::mem::size_of::<MvmCreditBonusWaveEvent>(),
+        ),
+        (
+            "MvmCreditBonusAll",
+            std::mem::size_of::<MvmCreditBonusAllEvent>(),
+        ),
         (
             "MvmCreditBonusAllAdvanced",
             std::mem::size_of::<MvmCreditBonusAllAdvancedEvent>(),
         ),
-        ("MvmQuickSentryUpgrade", std::mem::size_of::<MvmQuickSentryUpgradeEvent>()),
+        (
+            "MvmQuickSentryUpgrade",
+            std::mem::size_of::<MvmQuickSentryUpgradeEvent>(),
+        ),
         (
             "MvmTankDestroyedByPlayers",
             std::mem::size_of::<MvmTankDestroyedByPlayersEvent>(),
@@ -11152,16 +10742,43 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "MvmKillRobotDeliveringBomb",
             std::mem::size_of::<MvmKillRobotDeliveringBombEvent>(),
         ),
-        ("MvmPickupCurrency", std::mem::size_of::<MvmPickupCurrencyEvent>()),
-        ("MvmBombCarrierKilled", std::mem::size_of::<MvmBombCarrierKilledEvent>()),
-        ("MvmSentryBusterDetonate", std::mem::size_of::<MvmSentryBusterDetonateEvent>()),
-        ("MvmScoutMarkedForDeath", std::mem::size_of::<MvmScoutMarkedForDeathEvent>()),
-        ("MvmMedicPowerUpShared", std::mem::size_of::<MvmMedicPowerUpSharedEvent>()),
+        (
+            "MvmPickupCurrency",
+            std::mem::size_of::<MvmPickupCurrencyEvent>(),
+        ),
+        (
+            "MvmBombCarrierKilled",
+            std::mem::size_of::<MvmBombCarrierKilledEvent>(),
+        ),
+        (
+            "MvmSentryBusterDetonate",
+            std::mem::size_of::<MvmSentryBusterDetonateEvent>(),
+        ),
+        (
+            "MvmScoutMarkedForDeath",
+            std::mem::size_of::<MvmScoutMarkedForDeathEvent>(),
+        ),
+        (
+            "MvmMedicPowerUpShared",
+            std::mem::size_of::<MvmMedicPowerUpSharedEvent>(),
+        ),
         ("MvmBeginWave", std::mem::size_of::<MvmBeginWaveEvent>()),
-        ("MvmWaveComplete", std::mem::size_of::<MvmWaveCompleteEvent>()),
-        ("MvmMissionComplete", std::mem::size_of::<MvmMissionCompleteEvent>()),
-        ("MvmBombResetByPlayer", std::mem::size_of::<MvmBombResetByPlayerEvent>()),
-        ("MvmBombAlarmTriggered", std::mem::size_of::<MvmBombAlarmTriggeredEvent>()),
+        (
+            "MvmWaveComplete",
+            std::mem::size_of::<MvmWaveCompleteEvent>(),
+        ),
+        (
+            "MvmMissionComplete",
+            std::mem::size_of::<MvmMissionCompleteEvent>(),
+        ),
+        (
+            "MvmBombResetByPlayer",
+            std::mem::size_of::<MvmBombResetByPlayerEvent>(),
+        ),
+        (
+            "MvmBombAlarmTriggered",
+            std::mem::size_of::<MvmBombAlarmTriggeredEvent>(),
+        ),
         (
             "MvmBombDeployResetByPlayer",
             std::mem::size_of::<MvmBombDeployResetByPlayerEvent>(),
@@ -11169,10 +10786,22 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("MvmWaveFailed", std::mem::size_of::<MvmWaveFailedEvent>()),
         ("MvmResetStats", std::mem::size_of::<MvmResetStatsEvent>()),
         ("DamageResisted", std::mem::size_of::<DamageResistedEvent>()),
-        ("RevivePlayerNotify", std::mem::size_of::<RevivePlayerNotifyEvent>()),
-        ("RevivePlayerStopped", std::mem::size_of::<RevivePlayerStoppedEvent>()),
-        ("RevivePlayerComplete", std::mem::size_of::<RevivePlayerCompleteEvent>()),
-        ("PlayerTurnedToGhost", std::mem::size_of::<PlayerTurnedToGhostEvent>()),
+        (
+            "RevivePlayerNotify",
+            std::mem::size_of::<RevivePlayerNotifyEvent>(),
+        ),
+        (
+            "RevivePlayerStopped",
+            std::mem::size_of::<RevivePlayerStoppedEvent>(),
+        ),
+        (
+            "RevivePlayerComplete",
+            std::mem::size_of::<RevivePlayerCompleteEvent>(),
+        ),
+        (
+            "PlayerTurnedToGhost",
+            std::mem::size_of::<PlayerTurnedToGhostEvent>(),
+        ),
         (
             "MedigunShieldBlockedDamage",
             std::mem::size_of::<MedigunShieldBlockedDamageEvent>(),
@@ -11185,7 +10814,10 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "MvmSniperHeadshotCurrency",
             std::mem::size_of::<MvmSniperHeadshotCurrencyEvent>(),
         ),
-        ("MvmMannhattanPit", std::mem::size_of::<MvmMannhattanPitEvent>()),
+        (
+            "MvmMannhattanPit",
+            std::mem::size_of::<MvmMannhattanPitEvent>(),
+        ),
         (
             "FlagCarriedInDetectionZone",
             std::mem::size_of::<FlagCarriedInDetectionZoneEvent>(),
@@ -11194,104 +10826,284 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
             "MvmAdvWaveKilledStunRadio",
             std::mem::size_of::<MvmAdvWaveKilledStunRadioEvent>(),
         ),
-        ("PlayerDirectHitStun", std::mem::size_of::<PlayerDirectHitStunEvent>()),
-        ("MvmSentryBusterKilled", std::mem::size_of::<MvmSentryBusterKilledEvent>()),
-        ("UpgradesFileChanged", std::mem::size_of::<UpgradesFileChangedEvent>()),
-        ("RdTeamPointsChanged", std::mem::size_of::<RdTeamPointsChangedEvent>()),
-        ("RdRulesStateChanged", std::mem::size_of::<RdRulesStateChangedEvent>()),
+        (
+            "PlayerDirectHitStun",
+            std::mem::size_of::<PlayerDirectHitStunEvent>(),
+        ),
+        (
+            "MvmSentryBusterKilled",
+            std::mem::size_of::<MvmSentryBusterKilledEvent>(),
+        ),
+        (
+            "UpgradesFileChanged",
+            std::mem::size_of::<UpgradesFileChangedEvent>(),
+        ),
+        (
+            "RdTeamPointsChanged",
+            std::mem::size_of::<RdTeamPointsChangedEvent>(),
+        ),
+        (
+            "RdRulesStateChanged",
+            std::mem::size_of::<RdRulesStateChangedEvent>(),
+        ),
         ("RdRobotKilled", std::mem::size_of::<RdRobotKilledEvent>()),
         ("RdRobotImpact", std::mem::size_of::<RdRobotImpactEvent>()),
         (
             "TeamPlayPreRoundTimeLeft",
             std::mem::size_of::<TeamPlayPreRoundTimeLeftEvent>(),
         ),
-        ("ParachuteDeploy", std::mem::size_of::<ParachuteDeployEvent>()),
-        ("ParachuteHolster", std::mem::size_of::<ParachuteHolsterEvent>()),
-        ("KillRefillsMeter", std::mem::size_of::<KillRefillsMeterEvent>()),
+        (
+            "ParachuteDeploy",
+            std::mem::size_of::<ParachuteDeployEvent>(),
+        ),
+        (
+            "ParachuteHolster",
+            std::mem::size_of::<ParachuteHolsterEvent>(),
+        ),
+        (
+            "KillRefillsMeter",
+            std::mem::size_of::<KillRefillsMeterEvent>(),
+        ),
         ("RpsTauntEvent", std::mem::size_of::<RpsTauntEventEvent>()),
         ("CongaKill", std::mem::size_of::<CongaKillEvent>()),
-        ("PlayerInitialSpawn", std::mem::size_of::<PlayerInitialSpawnEvent>()),
-        ("CompetitiveVictory", std::mem::size_of::<CompetitiveVictoryEvent>()),
-        ("CompetitiveStatsUpdate", std::mem::size_of::<CompetitiveStatsUpdateEvent>()),
+        (
+            "PlayerInitialSpawn",
+            std::mem::size_of::<PlayerInitialSpawnEvent>(),
+        ),
+        (
+            "CompetitiveVictory",
+            std::mem::size_of::<CompetitiveVictoryEvent>(),
+        ),
+        (
+            "CompetitiveStatsUpdate",
+            std::mem::size_of::<CompetitiveStatsUpdateEvent>(),
+        ),
         ("MiniGameWin", std::mem::size_of::<MiniGameWinEvent>()),
-        ("SentryOnGoActive", std::mem::size_of::<SentryOnGoActiveEvent>()),
+        (
+            "SentryOnGoActive",
+            std::mem::size_of::<SentryOnGoActiveEvent>(),
+        ),
         ("DuckXpLevelUp", std::mem::size_of::<DuckXpLevelUpEvent>()),
         ("QuestLogOpened", std::mem::size_of::<QuestLogOpenedEvent>()),
         ("SchemaUpdated", std::mem::size_of::<SchemaUpdatedEvent>()),
-        ("LocalPlayerPickupWeapon", std::mem::size_of::<LocalPlayerPickupWeaponEvent>()),
-        ("RdPlayerScorePoints", std::mem::size_of::<RdPlayerScorePointsEvent>()),
-        ("DemomanDetStickies", std::mem::size_of::<DemomanDetStickiesEvent>()),
-        ("QuestObjectiveCompleted", std::mem::size_of::<QuestObjectiveCompletedEvent>()),
-        ("PlayerScoreChanged", std::mem::size_of::<PlayerScoreChangedEvent>()),
-        ("KilledCappingPlayer", std::mem::size_of::<KilledCappingPlayerEvent>()),
-        ("EnvironmentalDeath", std::mem::size_of::<EnvironmentalDeathEvent>()),
-        ("ProjectileDirectHit", std::mem::size_of::<ProjectileDirectHitEvent>()),
+        (
+            "LocalPlayerPickupWeapon",
+            std::mem::size_of::<LocalPlayerPickupWeaponEvent>(),
+        ),
+        (
+            "RdPlayerScorePoints",
+            std::mem::size_of::<RdPlayerScorePointsEvent>(),
+        ),
+        (
+            "DemomanDetStickies",
+            std::mem::size_of::<DemomanDetStickiesEvent>(),
+        ),
+        (
+            "QuestObjectiveCompleted",
+            std::mem::size_of::<QuestObjectiveCompletedEvent>(),
+        ),
+        (
+            "PlayerScoreChanged",
+            std::mem::size_of::<PlayerScoreChangedEvent>(),
+        ),
+        (
+            "KilledCappingPlayer",
+            std::mem::size_of::<KilledCappingPlayerEvent>(),
+        ),
+        (
+            "EnvironmentalDeath",
+            std::mem::size_of::<EnvironmentalDeathEvent>(),
+        ),
+        (
+            "ProjectileDirectHit",
+            std::mem::size_of::<ProjectileDirectHitEvent>(),
+        ),
         ("PassGet", std::mem::size_of::<PassGetEvent>()),
         ("PassScore", std::mem::size_of::<PassScoreEvent>()),
         ("PassFree", std::mem::size_of::<PassFreeEvent>()),
         ("PassPassCaught", std::mem::size_of::<PassPassCaughtEvent>()),
         ("PassBallStolen", std::mem::size_of::<PassBallStolenEvent>()),
-        ("PassBallBlocked", std::mem::size_of::<PassBallBlockedEvent>()),
-        ("DamagePrevented", std::mem::size_of::<DamagePreventedEvent>()),
-        ("HalloweenBossKilled", std::mem::size_of::<HalloweenBossKilledEvent>()),
-        ("EscapedLootIsland", std::mem::size_of::<EscapedLootIslandEvent>()),
-        ("TaggedPlayerAsIt", std::mem::size_of::<TaggedPlayerAsItEvent>()),
-        ("MerasmusStunned", std::mem::size_of::<MerasmusStunnedEvent>()),
-        ("MerasmusPropFound", std::mem::size_of::<MerasmusPropFoundEvent>()),
-        ("HalloweenSkeletonKilled", std::mem::size_of::<HalloweenSkeletonKilledEvent>()),
+        (
+            "PassBallBlocked",
+            std::mem::size_of::<PassBallBlockedEvent>(),
+        ),
+        (
+            "DamagePrevented",
+            std::mem::size_of::<DamagePreventedEvent>(),
+        ),
+        (
+            "HalloweenBossKilled",
+            std::mem::size_of::<HalloweenBossKilledEvent>(),
+        ),
+        (
+            "EscapedLootIsland",
+            std::mem::size_of::<EscapedLootIslandEvent>(),
+        ),
+        (
+            "TaggedPlayerAsIt",
+            std::mem::size_of::<TaggedPlayerAsItEvent>(),
+        ),
+        (
+            "MerasmusStunned",
+            std::mem::size_of::<MerasmusStunnedEvent>(),
+        ),
+        (
+            "MerasmusPropFound",
+            std::mem::size_of::<MerasmusPropFoundEvent>(),
+        ),
+        (
+            "HalloweenSkeletonKilled",
+            std::mem::size_of::<HalloweenSkeletonKilledEvent>(),
+        ),
         ("EscapeHell", std::mem::size_of::<EscapeHellEvent>()),
-        ("CrossSpectralBridge", std::mem::size_of::<CrossSpectralBridgeEvent>()),
+        (
+            "CrossSpectralBridge",
+            std::mem::size_of::<CrossSpectralBridgeEvent>(),
+        ),
         ("MiniGameWon", std::mem::size_of::<MiniGameWonEvent>()),
         ("RespawnGhost", std::mem::size_of::<RespawnGhostEvent>()),
         ("KillInHell", std::mem::size_of::<KillInHellEvent>()),
-        ("HalloweenDuckCollected", std::mem::size_of::<HalloweenDuckCollectedEvent>()),
+        (
+            "HalloweenDuckCollected",
+            std::mem::size_of::<HalloweenDuckCollectedEvent>(),
+        ),
         ("SpecialScore", std::mem::size_of::<SpecialScoreEvent>()),
-        ("TeamLeaderKilled", std::mem::size_of::<TeamLeaderKilledEvent>()),
-        ("HalloweenSoulCollected", std::mem::size_of::<HalloweenSoulCollectedEvent>()),
-        ("RecalculateTruce", std::mem::size_of::<RecalculateTruceEvent>()),
-        ("DeadRingerCheatDeath", std::mem::size_of::<DeadRingerCheatDeathEvent>()),
+        (
+            "TeamLeaderKilled",
+            std::mem::size_of::<TeamLeaderKilledEvent>(),
+        ),
+        (
+            "HalloweenSoulCollected",
+            std::mem::size_of::<HalloweenSoulCollectedEvent>(),
+        ),
+        (
+            "RecalculateTruce",
+            std::mem::size_of::<RecalculateTruceEvent>(),
+        ),
+        (
+            "DeadRingerCheatDeath",
+            std::mem::size_of::<DeadRingerCheatDeathEvent>(),
+        ),
         ("CrossbowHeal", std::mem::size_of::<CrossbowHealEvent>()),
-        ("DamageMitigated", std::mem::size_of::<DamageMitigatedEvent>()),
+        (
+            "DamageMitigated",
+            std::mem::size_of::<DamageMitigatedEvent>(),
+        ),
         ("PayloadPushed", std::mem::size_of::<PayloadPushedEvent>()),
-        ("PlayerAbandonedMatch", std::mem::size_of::<PlayerAbandonedMatchEvent>()),
+        (
+            "PlayerAbandonedMatch",
+            std::mem::size_of::<PlayerAbandonedMatchEvent>(),
+        ),
         ("ClDrawline", std::mem::size_of::<ClDrawlineEvent>()),
-        ("RestartTimerTime", std::mem::size_of::<RestartTimerTimeEvent>()),
-        ("WinLimitChanged", std::mem::size_of::<WinLimitChangedEvent>()),
-        ("WinPanelShowScores", std::mem::size_of::<WinPanelShowScoresEvent>()),
+        (
+            "RestartTimerTime",
+            std::mem::size_of::<RestartTimerTimeEvent>(),
+        ),
+        (
+            "WinLimitChanged",
+            std::mem::size_of::<WinLimitChangedEvent>(),
+        ),
+        (
+            "WinPanelShowScores",
+            std::mem::size_of::<WinPanelShowScoresEvent>(),
+        ),
         (
             "TopStreamsRequestFinished",
             std::mem::size_of::<TopStreamsRequestFinishedEvent>(),
         ),
-        ("CompetitiveStateChanged", std::mem::size_of::<CompetitiveStateChangedEvent>()),
-        ("GlobalWarDataUpdated", std::mem::size_of::<GlobalWarDataUpdatedEvent>()),
-        ("StopWatchChanged", std::mem::size_of::<StopWatchChangedEvent>()),
+        (
+            "CompetitiveStateChanged",
+            std::mem::size_of::<CompetitiveStateChangedEvent>(),
+        ),
+        (
+            "GlobalWarDataUpdated",
+            std::mem::size_of::<GlobalWarDataUpdatedEvent>(),
+        ),
+        (
+            "StopWatchChanged",
+            std::mem::size_of::<StopWatchChangedEvent>(),
+        ),
         ("DsStop", std::mem::size_of::<DsStopEvent>()),
         ("DsScreenshot", std::mem::size_of::<DsScreenshotEvent>()),
-        ("ShowMatchSummary", std::mem::size_of::<ShowMatchSummaryEvent>()),
-        ("ExperienceChanged", std::mem::size_of::<ExperienceChangedEvent>()),
+        (
+            "ShowMatchSummary",
+            std::mem::size_of::<ShowMatchSummaryEvent>(),
+        ),
+        (
+            "ExperienceChanged",
+            std::mem::size_of::<ExperienceChangedEvent>(),
+        ),
         ("BeginXpLerp", std::mem::size_of::<BeginXpLerpEvent>()),
-        ("MatchmakerStatsUpdated", std::mem::size_of::<MatchmakerStatsUpdatedEvent>()),
-        ("RematchVotePeriodOver", std::mem::size_of::<RematchVotePeriodOverEvent>()),
-        ("RematchFailedToCreate", std::mem::size_of::<RematchFailedToCreateEvent>()),
-        ("PlayerRematchChange", std::mem::size_of::<PlayerRematchChangeEvent>()),
+        (
+            "MatchmakerStatsUpdated",
+            std::mem::size_of::<MatchmakerStatsUpdatedEvent>(),
+        ),
+        (
+            "RematchVotePeriodOver",
+            std::mem::size_of::<RematchVotePeriodOverEvent>(),
+        ),
+        (
+            "RematchFailedToCreate",
+            std::mem::size_of::<RematchFailedToCreateEvent>(),
+        ),
+        (
+            "PlayerRematchChange",
+            std::mem::size_of::<PlayerRematchChangeEvent>(),
+        ),
         ("PingUpdated", std::mem::size_of::<PingUpdatedEvent>()),
         ("MMStatsUpdated", std::mem::size_of::<MMStatsUpdatedEvent>()),
-        ("PlayerNextMapVoteChange", std::mem::size_of::<PlayerNextMapVoteChangeEvent>()),
-        ("VoteMapsChanged", std::mem::size_of::<VoteMapsChangedEvent>()),
-        ("ProtoDefChanged", std::mem::size_of::<ProtoDefChangedEvent>()),
-        ("PlayerDomination", std::mem::size_of::<PlayerDominationEvent>()),
-        ("PlayerRocketPackPushed", std::mem::size_of::<PlayerRocketPackPushedEvent>()),
+        (
+            "PlayerNextMapVoteChange",
+            std::mem::size_of::<PlayerNextMapVoteChangeEvent>(),
+        ),
+        (
+            "VoteMapsChanged",
+            std::mem::size_of::<VoteMapsChangedEvent>(),
+        ),
+        (
+            "ProtoDefChanged",
+            std::mem::size_of::<ProtoDefChangedEvent>(),
+        ),
+        (
+            "PlayerDomination",
+            std::mem::size_of::<PlayerDominationEvent>(),
+        ),
+        (
+            "PlayerRocketPackPushed",
+            std::mem::size_of::<PlayerRocketPackPushedEvent>(),
+        ),
         ("QuestRequest", std::mem::size_of::<QuestRequestEvent>()),
         ("QuestResponse", std::mem::size_of::<QuestResponseEvent>()),
         ("QuestProgress", std::mem::size_of::<QuestProgressEvent>()),
-        ("ProjectileRemoved", std::mem::size_of::<ProjectileRemovedEvent>()),
-        ("QuestMapDataChanged", std::mem::size_of::<QuestMapDataChangedEvent>()),
-        ("GasDousedPlayerIgnited", std::mem::size_of::<GasDousedPlayerIgnitedEvent>()),
-        ("QuestTurnInState", std::mem::size_of::<QuestTurnInStateEvent>()),
-        ("ItemsAcknowledged", std::mem::size_of::<ItemsAcknowledgedEvent>()),
+        (
+            "ProjectileRemoved",
+            std::mem::size_of::<ProjectileRemovedEvent>(),
+        ),
+        (
+            "QuestMapDataChanged",
+            std::mem::size_of::<QuestMapDataChangedEvent>(),
+        ),
+        (
+            "GasDousedPlayerIgnited",
+            std::mem::size_of::<GasDousedPlayerIgnitedEvent>(),
+        ),
+        (
+            "QuestTurnInState",
+            std::mem::size_of::<QuestTurnInStateEvent>(),
+        ),
+        (
+            "ItemsAcknowledged",
+            std::mem::size_of::<ItemsAcknowledgedEvent>(),
+        ),
         ("CapperKilled", std::mem::size_of::<CapperKilledEvent>()),
-        ("MainMenuStabilized", std::mem::size_of::<MainMenuStabilizedEvent>()),
-        ("WorldStatusChanged", std::mem::size_of::<WorldStatusChangedEvent>()),
+        (
+            "MainMenuStabilized",
+            std::mem::size_of::<MainMenuStabilizedEvent>(),
+        ),
+        (
+            "WorldStatusChanged",
+            std::mem::size_of::<WorldStatusChangedEvent>(),
+        ),
         ("HLTVStatus", std::mem::size_of::<HLTVStatusEvent>()),
         ("HLTVCameraman", std::mem::size_of::<HLTVCameramanEvent>()),
         ("HLTVRankCamera", std::mem::size_of::<HLTVRankCameraEvent>()),
@@ -11301,14 +11113,28 @@ pub fn get_sizes() -> fnv::FnvHashMap<&'static str, usize> {
         ("HLTVMessage", std::mem::size_of::<HLTVMessageEvent>()),
         ("HLTVTitle", std::mem::size_of::<HLTVTitleEvent>()),
         ("HLTVChat", std::mem::size_of::<HLTVChatEvent>()),
-        ("ReplayStartRecord", std::mem::size_of::<ReplayStartRecordEvent>()),
-        ("ReplaySessionInfo", std::mem::size_of::<ReplaySessionInfoEvent>()),
-        ("ReplayEndRecord", std::mem::size_of::<ReplayEndRecordEvent>()),
-        ("ReplayReplaysAvailable", std::mem::size_of::<ReplayReplaysAvailableEvent>()),
-        ("ReplayServerError", std::mem::size_of::<ReplayServerErrorEvent>()),
+        (
+            "ReplayStartRecord",
+            std::mem::size_of::<ReplayStartRecordEvent>(),
+        ),
+        (
+            "ReplaySessionInfo",
+            std::mem::size_of::<ReplaySessionInfoEvent>(),
+        ),
+        (
+            "ReplayEndRecord",
+            std::mem::size_of::<ReplayEndRecordEvent>(),
+        ),
+        (
+            "ReplayReplaysAvailable",
+            std::mem::size_of::<ReplayReplaysAvailableEvent>(),
+        ),
+        (
+            "ReplayServerError",
+            std::mem::size_of::<ReplayServerErrorEvent>(),
+        ),
     ]
-        .iter()
-        .copied()
-        .collect()
+    .iter()
+    .copied()
+    .collect()
 }
-
diff --git a/src/demo/parser/gamestateanalyser.rs b/src/demo/parser/gamestateanalyser.rs
index d8991f2..285c975 100644
--- a/src/demo/parser/gamestateanalyser.rs
+++ b/src/demo/parser/gamestateanalyser.rs
@@ -478,9 +478,9 @@ impl GameStateAnalyser {
             SendPropIdentifier::new("DT_TFLocalPlayerExclusive", "m_angEyeAngles[0]");
         const NON_LOCAL_PITCH_ANGLES: SendPropIdentifier =
             SendPropIdentifier::new("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[0]");
-            
+
         const SIMTIME_PROP: SendPropIdentifier =
-        SendPropIdentifier::new("DT_BaseEntity", "m_flSimulationTime");
+            SendPropIdentifier::new("DT_BaseEntity", "m_flSimulationTime");
 
         player.in_pvs = entity.in_pvs;
 
diff --git a/src/demo/sendprop_gen.rs b/src/demo/sendprop_gen.rs
index 797235e..02d97b7 100644
--- a/src/demo/sendprop_gen.rs
+++ b/src/demo/sendprop_gen.rs
@@ -1,7 +1,5 @@
 use crate::demo::sendprop::SendPropIdentifier;
-pub fn get_prop_names(
-    identifier: SendPropIdentifier,
-) -> Option<(&'static str, &'static str)> {
+pub fn get_prop_names(identifier: SendPropIdentifier) -> Option<(&'static str, &'static str)> {
     let identifier: u64 = identifier.into();
     match identifier {
         9977506119572073604u64 => Some(("DT_AI_BaseNPC", "baseclass")),
@@ -31,15 +29,11 @@ pub fn get_prop_names(
         1723297113128833070u64 => Some(("DT_AttributeContainer", "m_Item")),
         15461357476359745612u64 => Some(("DT_AttributeContainer", "m_ProviderType")),
         4818761618587156386u64 => Some(("DT_AttributeContainer", "m_hOuter")),
-        9482188740281234275u64 => {
-            Some(("DT_AttributeContainer", "m_iReapplyProvisionParity"))
-        }
+        9482188740281234275u64 => Some(("DT_AttributeContainer", "m_iReapplyProvisionParity")),
         207560818333740287u64 => Some(("DT_AttributeList", "m_Attributes")),
         13300933994033697204u64 => Some(("DT_AttributeManager", "m_ProviderType")),
         13264166953578569818u64 => Some(("DT_AttributeManager", "m_hOuter")),
-        5454263126140958731u64 => {
-            Some(("DT_AttributeManager", "m_iReapplyProvisionParity"))
-        }
+        5454263126140958731u64 => Some(("DT_AttributeManager", "m_iReapplyProvisionParity")),
         9538019610013457851u64 => Some(("DT_BCCLocalPlayerExclusive", "m_flNextAttack")),
         11056205009922495194u64 => Some(("DT_BaseAnimating", "baseclass")),
         1886226892341259827u64 => Some(("DT_BaseAnimating", "m_bClientSideAnimation")),
@@ -66,9 +60,7 @@ pub fn get_prop_names(
         14642833498726923104u64 => Some(("DT_BaseAnimatingOverlay", "baseclass")),
         8928965134547626576u64 => Some(("DT_BaseAnimatingOverlay", "overlay_vars")),
         18186019889468590738u64 => Some(("DT_BaseAttributableItem", "baseclass")),
-        15467066093856583754u64 => {
-            Some(("DT_BaseAttributableItem", "m_AttributeManager"))
-        }
+        15467066093856583754u64 => Some(("DT_BaseAttributableItem", "m_AttributeManager")),
         10861713627408158021u64 => Some(("DT_BaseBeam", "a")),
         10864528377175810506u64 => Some(("DT_BaseBeam", "b")),
         10867906076897107023u64 => Some(("DT_BaseBeam", "g")),
@@ -191,103 +183,46 @@ pub fn get_prop_names(
         8821060496542715329u64 => Some(("DT_BaseProjectile", "m_hOriginalLauncher")),
         1773461200810032239u64 => Some(("DT_BasePropDoor", "baseclass")),
         764401028470223805u64 => Some(("DT_BaseTeamObjectiveResource", "m_bBlocked")),
-        6260043898169180511u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bCPCapRateScalesWithPlayers"))
-        }
+        6260043898169180511u64 => Some((
+            "DT_BaseTeamObjectiveResource",
+            "m_bCPCapRateScalesWithPlayers",
+        )),
         482099745178603580u64 => Some(("DT_BaseTeamObjectiveResource", "m_bCPIsVisible")),
         8070480527217658070u64 => Some(("DT_BaseTeamObjectiveResource", "m_bCPLocked")),
-        14589117526248252538u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bControlPointsReset"))
-        }
-        2551313933655525189u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bHillIsDownhill"))
-        }
-        6616839303315139821u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bInMiniRound"))
-        }
-        14223007249754673569u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bPlayingMiniRounds"))
-        }
-        13449055248664361296u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bTeamCanCap"))
-        }
-        12406814205882245121u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_bTrackAlarm"))
-        }
-        15603776777687734539u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flCPTimerTimes"))
-        }
-        10143517534621403237u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flCustomPositionX"))
-        }
-        10144643434528502076u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flCustomPositionY"))
-        }
-        12746417649697692707u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flLazyCapPerc"))
-        }
-        2360248506913974640u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flNodeHillData"))
-        }
-        17687213140186755045u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flPathDistance"))
-        }
-        10188850048977635459u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flTeamCapTime"))
-        }
-        3176918329628386471u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_flUnlockTimes"))
-        }
-        7220226147049147143u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iBaseControlPoints"))
-        }
+        14589117526248252538u64 => Some(("DT_BaseTeamObjectiveResource", "m_bControlPointsReset")),
+        2551313933655525189u64 => Some(("DT_BaseTeamObjectiveResource", "m_bHillIsDownhill")),
+        6616839303315139821u64 => Some(("DT_BaseTeamObjectiveResource", "m_bInMiniRound")),
+        14223007249754673569u64 => Some(("DT_BaseTeamObjectiveResource", "m_bPlayingMiniRounds")),
+        13449055248664361296u64 => Some(("DT_BaseTeamObjectiveResource", "m_bTeamCanCap")),
+        12406814205882245121u64 => Some(("DT_BaseTeamObjectiveResource", "m_bTrackAlarm")),
+        15603776777687734539u64 => Some(("DT_BaseTeamObjectiveResource", "m_flCPTimerTimes")),
+        10143517534621403237u64 => Some(("DT_BaseTeamObjectiveResource", "m_flCustomPositionX")),
+        10144643434528502076u64 => Some(("DT_BaseTeamObjectiveResource", "m_flCustomPositionY")),
+        12746417649697692707u64 => Some(("DT_BaseTeamObjectiveResource", "m_flLazyCapPerc")),
+        2360248506913974640u64 => Some(("DT_BaseTeamObjectiveResource", "m_flNodeHillData")),
+        17687213140186755045u64 => Some(("DT_BaseTeamObjectiveResource", "m_flPathDistance")),
+        10188850048977635459u64 => Some(("DT_BaseTeamObjectiveResource", "m_flTeamCapTime")),
+        3176918329628386471u64 => Some(("DT_BaseTeamObjectiveResource", "m_flUnlockTimes")),
+        7220226147049147143u64 => Some(("DT_BaseTeamObjectiveResource", "m_iBaseControlPoints")),
         10975425104909481510u64 => Some(("DT_BaseTeamObjectiveResource", "m_iCPGroup")),
-        9796709517129871815u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iCappingTeam"))
-        }
-        10134043929416589912u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iNumControlPoints"))
-        }
-        7006103335397878306u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iNumTeamMembers"))
-        }
+        9796709517129871815u64 => Some(("DT_BaseTeamObjectiveResource", "m_iCappingTeam")),
+        10134043929416589912u64 => Some(("DT_BaseTeamObjectiveResource", "m_iNumControlPoints")),
+        7006103335397878306u64 => Some(("DT_BaseTeamObjectiveResource", "m_iNumTeamMembers")),
         14581529935953675661u64 => Some(("DT_BaseTeamObjectiveResource", "m_iOwner")),
-        14057342925796101268u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iPreviousPoints"))
-        }
-        17664125710752348622u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iStopWatchTimer"))
-        }
-        12231279990623467274u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iTeamBaseIcons"))
-        }
+        14057342925796101268u64 => Some(("DT_BaseTeamObjectiveResource", "m_iPreviousPoints")),
+        17664125710752348622u64 => Some(("DT_BaseTeamObjectiveResource", "m_iStopWatchTimer")),
+        12231279990623467274u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTeamBaseIcons")),
         98947748158193475u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTeamIcons")),
         7632071981119974014u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTeamInZone")),
-        7558004037016717466u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iTeamOverlays"))
-        }
-        11508737394756596273u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iTeamReqCappers"))
-        }
-        6991212709890471199u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iTimerToShowInHUD"))
-        }
-        18209914006898892797u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iUpdateCapHudParity"))
-        }
+        7558004037016717466u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTeamOverlays")),
+        11508737394756596273u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTeamReqCappers")),
+        6991212709890471199u64 => Some(("DT_BaseTeamObjectiveResource", "m_iTimerToShowInHUD")),
+        18209914006898892797u64 => Some(("DT_BaseTeamObjectiveResource", "m_iUpdateCapHudParity")),
         10891894484206485989u64 => Some(("DT_BaseTeamObjectiveResource", "m_iWarnOnCap")),
-        1498427985947912600u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_iszWarnSound"))
-        }
-        12414129916492154804u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_nNumNodeHillData"))
-        }
-        2468731353192921342u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_pszCapLayoutInHUD"))
-        }
-        18298578210195471990u64 => {
-            Some(("DT_BaseTeamObjectiveResource", "m_vCPPositions"))
-        }
+        1498427985947912600u64 => Some(("DT_BaseTeamObjectiveResource", "m_iszWarnSound")),
+        12414129916492154804u64 => Some(("DT_BaseTeamObjectiveResource", "m_nNumNodeHillData")),
+        2468731353192921342u64 => Some(("DT_BaseTeamObjectiveResource", "m_pszCapLayoutInHUD")),
+        18298578210195471990u64 => Some(("DT_BaseTeamObjectiveResource", "m_vCPPositions")),
         12048571054537650125u64 => Some(("DT_BaseViewModel", "m_fEffects")),
         16623028411847573074u64 => Some(("DT_BaseViewModel", "m_flPlaybackRate")),
         12151231029797149607u64 => Some(("DT_BaseViewModel", "m_flPoseParameter")),
@@ -346,9 +281,7 @@ pub fn get_prop_names(
         16550336263822600081u64 => Some(("DT_BreakableSurface", "m_nSurfaceType")),
         12912481925475249157u64 => Some(("DT_BreakableSurface", "m_vCorner")),
         4269713520286543487u64 => Some(("DT_BreakableSurface", "m_vNormal")),
-        12815830324051307265u64 => {
-            Some(("DT_BuilderLocalData", "m_aBuildableObjectTypes"))
-        }
+        12815830324051307265u64 => Some(("DT_BuilderLocalData", "m_aBuildableObjectTypes")),
         3752236378247177694u64 => Some(("DT_BuilderLocalData", "m_hObjectBeingBuilt")),
         5744885984835700960u64 => Some(("DT_BuilderLocalData", "m_iObjectType")),
         4498158956768532836u64 => Some(("DT_CBonusDuckPickup", "baseclass")),
@@ -366,9 +299,7 @@ pub fn get_prop_names(
         7993678590165848504u64 => Some(("DT_CHalloweenGiftPickup", "m_hTargetPlayer")),
         4548839884396345947u64 => Some(("DT_CHalloweenPickup", "baseclass")),
         7556464844809770469u64 => Some(("DT_CMannVsMachineWaveStats", "nBuyBacks")),
-        18102662244812005959u64 => {
-            Some(("DT_CMannVsMachineWaveStats", "nCreditsAcquired"))
-        }
+        18102662244812005959u64 => Some(("DT_CMannVsMachineWaveStats", "nCreditsAcquired")),
         6836609208288300926u64 => Some(("DT_CMannVsMachineWaveStats", "nCreditsBonus")),
         5022393733729822105u64 => Some(("DT_CMannVsMachineWaveStats", "nCreditsDropped")),
         11245235260759213247u64 => Some(("DT_CMannVsMachineWaveStats", "nPlayerDeaths")),
@@ -393,9 +324,7 @@ pub fn get_prop_names(
         5987216880222415474u64 => Some(("DT_CaptureFlagReturnIcon", "baseclass")),
         10305866285583773975u64 => Some(("DT_CaptureZone", "baseclass")),
         5377530078693075052u64 => Some(("DT_CaptureZone", "m_bDisabled")),
-        12941697488028443613u64 => {
-            Some(("DT_CollisionProperty", "m_bUniformTriggerBloat"))
-        }
+        12941697488028443613u64 => Some(("DT_CollisionProperty", "m_bUniformTriggerBloat")),
         14516902418280914306u64 => Some(("DT_CollisionProperty", "m_nSolidType")),
         1080149301244524881u64 => Some(("DT_CollisionProperty", "m_nSurroundType")),
         7175952075483709827u64 => Some(("DT_CollisionProperty", "m_triggerBloat")),
@@ -404,18 +333,16 @@ pub fn get_prop_names(
         269705891010771561u64 => Some(("DT_CollisionProperty", "m_vecMaxsPreScaled")),
         327157693896481356u64 => Some(("DT_CollisionProperty", "m_vecMins")),
         9638080833875299219u64 => Some(("DT_CollisionProperty", "m_vecMinsPreScaled")),
-        620553563392398378u64 => {
-            Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMaxs"))
-        }
-        5716096160481233009u64 => {
-            Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMaxsPreScaled"))
-        }
-        13386682110035354244u64 => {
-            Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMins"))
-        }
-        10271950428381878635u64 => {
-            Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMinsPreScaled"))
-        }
+        620553563392398378u64 => Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMaxs")),
+        5716096160481233009u64 => Some((
+            "DT_CollisionProperty",
+            "m_vecSpecifiedSurroundingMaxsPreScaled",
+        )),
+        13386682110035354244u64 => Some(("DT_CollisionProperty", "m_vecSpecifiedSurroundingMins")),
+        10271950428381878635u64 => Some((
+            "DT_CollisionProperty",
+            "m_vecSpecifiedSurroundingMinsPreScaled",
+        )),
         5523418553214166751u64 => Some(("DT_ColorCorrection", "m_MaxFalloff")),
         12589122299567677885u64 => Some(("DT_ColorCorrection", "m_MinFalloff")),
         16380835174442541258u64 => Some(("DT_ColorCorrection", "m_bEnabled")),
@@ -459,18 +386,10 @@ pub fn get_prop_names(
         14568140209977249243u64 => Some(("DT_EconEntity", "m_AttributeManager")),
         17857878618611298375u64 => Some(("DT_EconEntity", "m_bValidatedAttachedEntity")),
         253092235430218488u64 => Some(("DT_EffectData", "entindex")),
-        18021520457381301207u64 => {
-            Some(("DT_EffectData", "m_ControlPoint1.m_eParticleAttachment"))
-        }
-        10824446178939881888u64 => {
-            Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[0]"))
-        }
-        11354508640126412967u64 => {
-            Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[1]"))
-        }
-        12064715086443459986u64 => {
-            Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[2]"))
-        }
+        18021520457381301207u64 => Some(("DT_EffectData", "m_ControlPoint1.m_eParticleAttachment")),
+        10824446178939881888u64 => Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[0]")),
+        11354508640126412967u64 => Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[1]")),
+        12064715086443459986u64 => Some(("DT_EffectData", "m_ControlPoint1.m_vecOffset[2]")),
         4437782535929851202u64 => Some(("DT_EffectData", "m_CustomColors.m_vecColor1")),
         4434967786162198717u64 => Some(("DT_EffectData", "m_CustomColors.m_vecColor2")),
         1599931262287302015u64 => Some(("DT_EffectData", "m_bControlPoint1")),
@@ -522,12 +441,8 @@ pub fn get_prop_names(
         9297058561166154273u64 => Some(("DT_EnvParticleScript", "baseclass")),
         13380319915338356541u64 => Some(("DT_EnvParticleScript", "m_flSequenceScale")),
         16060139991777335879u64 => Some(("DT_EnvProjectedTexture", "baseclass")),
-        2252813601417170088u64 => {
-            Some(("DT_EnvProjectedTexture", "m_LinearFloatLightColor"))
-        }
-        114155989813656232u64 => {
-            Some(("DT_EnvProjectedTexture", "m_SpotlightTextureName"))
-        }
+        2252813601417170088u64 => Some(("DT_EnvProjectedTexture", "m_LinearFloatLightColor")),
+        114155989813656232u64 => Some(("DT_EnvProjectedTexture", "m_SpotlightTextureName")),
         3898702540603033623u64 => Some(("DT_EnvProjectedTexture", "m_bCameraSpace")),
         10254310551605177570u64 => Some(("DT_EnvProjectedTexture", "m_bEnableShadows")),
         7787457648735581919u64 => Some(("DT_EnvProjectedTexture", "m_bLightOnlyTarget")),
@@ -539,9 +454,7 @@ pub fn get_prop_names(
         15426827728262009940u64 => Some(("DT_EnvProjectedTexture", "m_flNearZ")),
         4473675068488532456u64 => Some(("DT_EnvProjectedTexture", "m_hTargetEntity")),
         4905548031909626553u64 => Some(("DT_EnvProjectedTexture", "m_nShadowQuality")),
-        5620529469040513558u64 => {
-            Some(("DT_EnvProjectedTexture", "m_nSpotlightTextureFrame"))
-        }
+        5620529469040513558u64 => Some(("DT_EnvProjectedTexture", "m_nSpotlightTextureFrame")),
         14704521728978857169u64 => Some(("DT_EnvScreenEffect", "baseclass")),
         10262980981935134576u64 => Some(("DT_EnvScreenEffect", "m_flDuration")),
         3164074218753332286u64 => Some(("DT_EnvScreenEffect", "m_nType")),
@@ -552,27 +465,13 @@ pub fn get_prop_names(
         3604075530619262226u64 => Some(("DT_EnvScreenOverlay", "m_iDesiredOverlay")),
         14167371023432491515u64 => Some(("DT_EnvScreenOverlay", "m_iszOverlayNames")),
         15980388409707750886u64 => Some(("DT_EnvTonemapController", "baseclass")),
-        4707468205867891085u64 => {
-            Some(("DT_EnvTonemapController", "m_bUseCustomAutoExposureMax"))
-        }
-        18197077299237503183u64 => {
-            Some(("DT_EnvTonemapController", "m_bUseCustomAutoExposureMin"))
-        }
-        11120818610489230652u64 => {
-            Some(("DT_EnvTonemapController", "m_bUseCustomBloomScale"))
-        }
-        4084439432788915034u64 => {
-            Some(("DT_EnvTonemapController", "m_flCustomAutoExposureMax"))
-        }
-        9049455712478357200u64 => {
-            Some(("DT_EnvTonemapController", "m_flCustomAutoExposureMin"))
-        }
-        9290409691254814341u64 => {
-            Some(("DT_EnvTonemapController", "m_flCustomBloomScale"))
-        }
-        3564648561424872913u64 => {
-            Some(("DT_EnvTonemapController", "m_flCustomBloomScaleMinimum"))
-        }
+        4707468205867891085u64 => Some(("DT_EnvTonemapController", "m_bUseCustomAutoExposureMax")),
+        18197077299237503183u64 => Some(("DT_EnvTonemapController", "m_bUseCustomAutoExposureMin")),
+        11120818610489230652u64 => Some(("DT_EnvTonemapController", "m_bUseCustomBloomScale")),
+        4084439432788915034u64 => Some(("DT_EnvTonemapController", "m_flCustomAutoExposureMax")),
+        9049455712478357200u64 => Some(("DT_EnvTonemapController", "m_flCustomAutoExposureMin")),
+        9290409691254814341u64 => Some(("DT_EnvTonemapController", "m_flCustomBloomScale")),
+        3564648561424872913u64 => Some(("DT_EnvTonemapController", "m_flCustomBloomScaleMinimum")),
         7183986676565278417u64 => Some(("DT_EnvWind", "m_EnvWindShared")),
         17376263270174520011u64 => Some(("DT_EnvWindShared", "m_flGustDuration")),
         658004777675794009u64 => Some(("DT_EnvWindShared", "m_flInitialWindSpeed")),
@@ -619,21 +518,15 @@ pub fn get_prop_names(
         476665526328284112u64 => Some(("DT_FuncAreaPortalWindow", "baseclass")),
         11166258962236030081u64 => Some(("DT_FuncAreaPortalWindow", "m_flFadeDist")),
         2305319612642205701u64 => Some(("DT_FuncAreaPortalWindow", "m_flFadeStartDist")),
-        8441183468266600079u64 => {
-            Some(("DT_FuncAreaPortalWindow", "m_flTranslucencyLimit"))
-        }
-        6994402637133836533u64 => {
-            Some(("DT_FuncAreaPortalWindow", "m_iBackgroundModelIndex"))
-        }
+        8441183468266600079u64 => Some(("DT_FuncAreaPortalWindow", "m_flTranslucencyLimit")),
+        6994402637133836533u64 => Some(("DT_FuncAreaPortalWindow", "m_iBackgroundModelIndex")),
         1315228604564055678u64 => Some(("DT_FuncConveyor", "baseclass")),
         4643984630128196805u64 => Some(("DT_FuncConveyor", "m_flConveyorSpeed")),
         8025869603558831630u64 => Some(("DT_FuncForceField", "baseclass")),
         8842380166201025273u64 => Some(("DT_FuncLadder", "baseclass")),
         6727980321286440577u64 => Some(("DT_FuncLadder", "m_bFakeLadder")),
         5458287824259775681u64 => Some(("DT_FuncLadder", "m_vecLadderDir")),
-        1023914091052524494u64 => {
-            Some(("DT_FuncLadder", "m_vecPlayerMountPositionBottom"))
-        }
+        1023914091052524494u64 => Some(("DT_FuncLadder", "m_vecPlayerMountPositionBottom")),
         8352235157182942370u64 => Some(("DT_FuncLadder", "m_vecPlayerMountPositionTop")),
         10638318840676769491u64 => Some(("DT_FuncMonitor", "baseclass")),
         5544290497221565849u64 => Some(("DT_FuncOccluder", "m_bActive")),
@@ -659,9 +552,7 @@ pub fn get_prop_names(
         5198644182095249827u64 => Some(("DT_FuncSmokeVolume", "m_MaterialName")),
         8073165390338064865u64 => Some(("DT_FuncSmokeVolume", "m_MovementSpeed")),
         6058325364789012681u64 => Some(("DT_FuncSmokeVolume", "m_ParticleDrawWidth")),
-        2820636897937052641u64 => {
-            Some(("DT_FuncSmokeVolume", "m_ParticleSpacingDistance"))
-        }
+        2820636897937052641u64 => Some(("DT_FuncSmokeVolume", "m_ParticleSpacingDistance")),
         14909793249953353950u64 => Some(("DT_FuncSmokeVolume", "m_RotationSpeed")),
         126643466202097015u64 => Some(("DT_FuncSmokeVolume", "m_spawnflags")),
         521318901927839128u64 => Some(("DT_FuncTrackTrain", "baseclass")),
@@ -694,13 +585,9 @@ pub fn get_prop_names(
         16941498431952440553u64 => Some(("DT_Hightower_TeleportVortex", "m_iState")),
         7805507788390503572u64 => Some(("DT_InfoLadderDismount", "baseclass")),
         16102845418931591771u64 => Some(("DT_InfoLightingRelative", "baseclass")),
-        13334572272126897098u64 => {
-            Some(("DT_InfoLightingRelative", "m_hLightingLandmark"))
-        }
+        13334572272126897098u64 => Some(("DT_InfoLightingRelative", "m_hLightingLandmark")),
         17675349519424779959u64 => Some(("DT_InfoOverlayAccessor", "m_iOverlayID")),
-        5389305028453794524u64 => {
-            Some(("DT_InfoOverlayAccessor", "m_iTextureFrameIndex"))
-        }
+        5389305028453794524u64 => Some(("DT_InfoOverlayAccessor", "m_iTextureFrameIndex")),
         13281282658748765205u64 => Some(("DT_LaserDot", "baseclass")),
         1929285705522480730u64 => Some(("DT_LightGlow", "HDRColorScale")),
         13554970453270875203u64 => Some(("DT_LightGlow", "m_angRotation")),
@@ -756,15 +643,9 @@ pub fn get_prop_names(
         3261508312742118676u64 => Some(("DT_Local", "m_vecPunchAngle")),
         11553804228842255627u64 => Some(("DT_Local", "m_vecPunchAngleVel")),
         11420334401211568191u64 => Some(("DT_LocalActiveWeaponData", "m_flAnimTime")),
-        477854118027322048u64 => {
-            Some(("DT_LocalActiveWeaponData", "m_flNextPrimaryAttack"))
-        }
-        12439415646112255356u64 => {
-            Some(("DT_LocalActiveWeaponData", "m_flNextSecondaryAttack"))
-        }
-        1861344240023747706u64 => {
-            Some(("DT_LocalActiveWeaponData", "m_flTimeWeaponIdle"))
-        }
+        477854118027322048u64 => Some(("DT_LocalActiveWeaponData", "m_flNextPrimaryAttack")),
+        12439415646112255356u64 => Some(("DT_LocalActiveWeaponData", "m_flNextSecondaryAttack")),
+        1861344240023747706u64 => Some(("DT_LocalActiveWeaponData", "m_flTimeWeaponIdle")),
         5839428667296945333u64 => Some(("DT_LocalActiveWeaponData", "m_nNextThinkTick")),
         1180539520845420538u64 => Some(("DT_LocalFlameThrower", "m_bHasHalloweenSpell")),
         16942780462268800407u64 => Some(("DT_LocalFlameThrower", "m_hFlameManager")),
@@ -772,23 +653,13 @@ pub fn get_prop_names(
         4137327776866978322u64 => Some(("DT_LocalFlameThrower", "m_iDamagingFlames")),
         16100218482556174869u64 => Some(("DT_LocalPlayerExclusive", "m_Local")),
         8202977059591059350u64 => Some(("DT_LocalPlayerExclusive", "m_fOnTarget")),
-        10974073549222745823u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_flConstraintRadius"))
-        }
-        13133555867614237421u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_flConstraintSpeedFactor"))
-        }
-        1229789984536407245u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_flConstraintWidth"))
-        }
+        10974073549222745823u64 => Some(("DT_LocalPlayerExclusive", "m_flConstraintRadius")),
+        13133555867614237421u64 => Some(("DT_LocalPlayerExclusive", "m_flConstraintSpeedFactor")),
+        1229789984536407245u64 => Some(("DT_LocalPlayerExclusive", "m_flConstraintWidth")),
         8860886652698385967u64 => Some(("DT_LocalPlayerExclusive", "m_flDeathTime")),
         12105715086695370586u64 => Some(("DT_LocalPlayerExclusive", "m_flFriction")),
-        2807126374303972232u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_flLaggedMovementValue"))
-        }
-        1404386598948594904u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_hConstraintEntity"))
-        }
+        2807126374303972232u64 => Some(("DT_LocalPlayerExclusive", "m_flLaggedMovementValue")),
+        1404386598948594904u64 => Some(("DT_LocalPlayerExclusive", "m_hConstraintEntity")),
         5921750086149896356u64 => Some(("DT_LocalPlayerExclusive", "m_hGroundEntity")),
         6333791436486800744u64 => Some(("DT_LocalPlayerExclusive", "m_hLastWeapon")),
         3605366840570150767u64 => Some(("DT_LocalPlayerExclusive", "m_iAmmo")),
@@ -796,37 +667,19 @@ pub fn get_prop_names(
         189161373383926998u64 => Some(("DT_LocalPlayerExclusive", "m_nTickBase")),
         12573717345841996583u64 => Some(("DT_LocalPlayerExclusive", "m_nWaterLevel")),
         2375096518330819004u64 => Some(("DT_LocalPlayerExclusive", "m_vecBaseVelocity")),
-        16576666860475617872u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_vecConstraintCenter"))
-        }
+        16576666860475617872u64 => Some(("DT_LocalPlayerExclusive", "m_vecConstraintCenter")),
         9881246523974673073u64 => Some(("DT_LocalPlayerExclusive", "m_vecVelocity[0]")),
         9358502412184000610u64 => Some(("DT_LocalPlayerExclusive", "m_vecVelocity[1]")),
         8587497370885508535u64 => Some(("DT_LocalPlayerExclusive", "m_vecVelocity[2]")),
-        15482974702530522024u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[0]"))
-        }
-        16074398708652142191u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[1]"))
-        }
-        16845966699904278298u64 => {
-            Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[2]"))
-        }
-        2815375858371118709u64 => {
-            Some(("DT_LocalTFWeaponData", "m_flEffectBarRegenTime"))
-        }
-        17066791518227279732u64 => {
-            Some(("DT_LocalTFWeaponData", "m_flLastCritCheckTime"))
-        }
+        15482974702530522024u64 => Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[0]")),
+        16074398708652142191u64 => Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[1]")),
+        16845966699904278298u64 => Some(("DT_LocalPlayerExclusive", "m_vecViewOffset[2]")),
+        2815375858371118709u64 => Some(("DT_LocalTFWeaponData", "m_flEffectBarRegenTime")),
+        17066791518227279732u64 => Some(("DT_LocalTFWeaponData", "m_flLastCritCheckTime")),
         13800211648261414116u64 => Some(("DT_LocalTFWeaponData", "m_flLastFireTime")),
-        13269430883070863959u64 => {
-            Some(("DT_LocalTFWeaponData", "m_flObservedCritChance"))
-        }
-        14488883780465208477u64 => {
-            Some(("DT_LocalTFWeaponData", "m_flReloadPriorNextFire"))
-        }
-        18358052789884689096u64 => {
-            Some(("DT_LocalTFWeaponMedigunData", "m_flChargeLevel"))
-        }
+        13269430883070863959u64 => Some(("DT_LocalTFWeaponData", "m_flObservedCritChance")),
+        14488883780465208477u64 => Some(("DT_LocalTFWeaponData", "m_flReloadPriorNextFire")),
+        18358052789884689096u64 => Some(("DT_LocalTFWeaponMedigunData", "m_flChargeLevel")),
         7111486683434906648u64 => Some(("DT_LocalWeaponData", "m_bFlipViewModel")),
         6228294830767023013u64 => Some(("DT_LocalWeaponData", "m_flAnimTime")),
         4912693753643193123u64 => Some(("DT_LocalWeaponData", "m_iClip1")),
@@ -836,29 +689,19 @@ pub fn get_prop_names(
         3443159739696860287u64 => Some(("DT_LocalWeaponData", "m_nViewModelIndex")),
         13496247640687739480u64 => Some(("DT_MannVsMachineStats", "baseclass")),
         6529470081877114896u64 => Some(("DT_MannVsMachineStats", "m_currentWaveStats")),
-        15168297600687373153u64 => {
-            Some(("DT_MannVsMachineStats", "m_iCurrencyCollectedForRespec"))
-        }
+        15168297600687373153u64 => Some(("DT_MannVsMachineStats", "m_iCurrencyCollectedForRespec")),
         16103636632603551389u64 => Some(("DT_MannVsMachineStats", "m_iCurrentWaveIdx")),
         9701442574508188345u64 => Some(("DT_MannVsMachineStats", "m_iServerWaveID")),
-        11314244726266369866u64 => {
-            Some(("DT_MannVsMachineStats", "m_nRespecsAwardedInWave"))
-        }
+        11314244726266369866u64 => Some(("DT_MannVsMachineStats", "m_nRespecsAwardedInWave")),
         17373004316049774992u64 => Some(("DT_MannVsMachineStats", "m_previousWaveStats")),
-        5830272437141758398u64 => {
-            Some(("DT_MannVsMachineStats", "m_runningTotalWaveStats"))
-        }
+        5830272437141758398u64 => Some(("DT_MannVsMachineStats", "m_runningTotalWaveStats")),
         12167682346375817311u64 => Some(("DT_MaterialModifyControl", "baseclass")),
         16529403431670571175u64 => {
             Some(("DT_MaterialModifyControl", "m_bNewAnimCommandsSemaphore"))
         }
         3988729169059346340u64 => Some(("DT_MaterialModifyControl", "m_bWrap")),
-        2959961758008791467u64 => {
-            Some(("DT_MaterialModifyControl", "m_flFloatLerpEndValue"))
-        }
-        14099373520653428866u64 => {
-            Some(("DT_MaterialModifyControl", "m_flFloatLerpStartValue"))
-        }
+        2959961758008791467u64 => Some(("DT_MaterialModifyControl", "m_flFloatLerpEndValue")),
+        14099373520653428866u64 => Some(("DT_MaterialModifyControl", "m_flFloatLerpStartValue")),
         11841915532873668659u64 => {
             Some(("DT_MaterialModifyControl", "m_flFloatLerpTransitionTime"))
         }
@@ -868,27 +711,17 @@ pub fn get_prop_names(
         17247889420939613503u64 => Some(("DT_MaterialModifyControl", "m_nModifyMode")),
         10162193495182433573u64 => Some(("DT_MaterialModifyControl", "m_szMaterialName")),
         14412596698207298757u64 => Some(("DT_MaterialModifyControl", "m_szMaterialVar")),
-        16196673206514172130u64 => {
-            Some(("DT_MaterialModifyControl", "m_szMaterialVarValue"))
-        }
+        16196673206514172130u64 => Some(("DT_MaterialModifyControl", "m_szMaterialVarValue")),
         11260232321092586078u64 => Some(("DT_Merasmus", "baseclass")),
         2656272158081578479u64 => Some(("DT_Merasmus", "m_bIsDoingAOEAttack")),
         3060622569221761593u64 => Some(("DT_Merasmus", "m_bRevealed")),
         1102613716367957140u64 => Some(("DT_Merasmus", "m_bStunned")),
         16763989558937175447u64 => Some(("DT_MerasmusDancer", "baseclass")),
-        17079253572737029753u64 => {
-            Some(("DT_MonsterResource", "m_fSkillShotComboEndTime"))
-        }
-        14975529807936865786u64 => {
-            Some(("DT_MonsterResource", "m_iBossHealthPercentageByte"))
-        }
+        17079253572737029753u64 => Some(("DT_MonsterResource", "m_fSkillShotComboEndTime")),
+        14975529807936865786u64 => Some(("DT_MonsterResource", "m_iBossHealthPercentageByte")),
         13974447841086780623u64 => Some(("DT_MonsterResource", "m_iBossState")),
-        6289858508798830248u64 => {
-            Some(("DT_MonsterResource", "m_iBossStunPercentageByte"))
-        }
-        12506623981565681650u64 => {
-            Some(("DT_MonsterResource", "m_iSkillShotCompleteCount"))
-        }
+        6289858508798830248u64 => Some(("DT_MonsterResource", "m_iBossStunPercentageByte")),
+        12506623981565681650u64 => Some(("DT_MonsterResource", "m_iSkillShotCompleteCount")),
         18012972414182119426u64 => Some(("DT_MovieExplosion", "baseclass")),
         1153362727985164101u64 => Some(("DT_NextBot", "baseclass")),
         14187459074404627427u64 => Some(("DT_ObjectCartDispenser", "baseclass")),
@@ -909,9 +742,7 @@ pub fn get_prop_names(
         1828951864594737735u64 => Some(("DT_ObjectSentrygun", "m_nShieldLevel")),
         6084707614294048386u64 => Some(("DT_ObjectTeleporter", "baseclass")),
         5086075074131250838u64 => Some(("DT_ObjectTeleporter", "m_bMatchBuilding")),
-        4538303084594989557u64 => {
-            Some(("DT_ObjectTeleporter", "m_flCurrentRechargeDuration"))
-        }
+        4538303084594989557u64 => Some(("DT_ObjectTeleporter", "m_flCurrentRechargeDuration")),
         1147701113607426749u64 => Some(("DT_ObjectTeleporter", "m_flRechargeTime")),
         4679122366883686175u64 => Some(("DT_ObjectTeleporter", "m_flYawToExit")),
         5775534354387621035u64 => Some(("DT_ObjectTeleporter", "m_iState")),
@@ -923,12 +754,8 @@ pub fn get_prop_names(
         3181140237843780895u64 => Some(("DT_ParticleFire", "m_vDirection")),
         8777203562431530304u64 => Some(("DT_ParticleFire", "m_vOrigin")),
         16787764780080791181u64 => Some(("DT_ParticlePerformanceMonitor", "baseclass")),
-        16577173687237993691u64 => {
-            Some(("DT_ParticlePerformanceMonitor", "m_bDisplayPerf"))
-        }
-        10551540368335591413u64 => {
-            Some(("DT_ParticlePerformanceMonitor", "m_bMeasurePerf"))
-        }
+        16577173687237993691u64 => Some(("DT_ParticlePerformanceMonitor", "m_bDisplayPerf")),
+        10551540368335591413u64 => Some(("DT_ParticlePerformanceMonitor", "m_bMeasurePerf")),
         14877792606716409394u64 => Some(("DT_ParticleSmokeGrenade", "baseclass")),
         9171368501719076612u64 => Some(("DT_ParticleSmokeGrenade", "m_CurrentStage")),
         15069148509288769225u64 => Some(("DT_ParticleSmokeGrenade", "m_FadeEndTime")),
@@ -965,12 +792,8 @@ pub fn get_prop_names(
         3908013512553602177u64 => Some(("DT_PhysicsPropMultiplayer", "m_collisionMins")),
         2695265235558131564u64 => Some(("DT_PhysicsPropMultiplayer", "m_fMass")),
         17976817548028924485u64 => Some(("DT_PhysicsPropMultiplayer", "m_iPhysicsMode")),
-        12788853276845127409u64 => {
-            Some(("DT_PipebombLauncherLocalData", "m_flChargeBeginTime"))
-        }
-        16725120178160151337u64 => {
-            Some(("DT_PipebombLauncherLocalData", "m_iPipebombCount"))
-        }
+        12788853276845127409u64 => Some(("DT_PipebombLauncherLocalData", "m_flChargeBeginTime")),
+        16725120178160151337u64 => Some(("DT_PipebombLauncherLocalData", "m_iPipebombCount")),
         8048792568294389757u64 => Some(("DT_Plasma", "baseclass")),
         13510524683563126928u64 => Some(("DT_Plasma", "m_flScale")),
         14400412803687279507u64 => Some(("DT_Plasma", "m_flScaleTime")),
@@ -1006,12 +829,8 @@ pub fn get_prop_names(
         17981693023432789045u64 => Some(("DT_PointCommentaryNode", "m_hViewPosition")),
         14944505961024026917u64 => Some(("DT_PointCommentaryNode", "m_iNodeNumber")),
         4965537765628559275u64 => Some(("DT_PointCommentaryNode", "m_iNodeNumberMax")),
-        13667693378448451720u64 => {
-            Some(("DT_PointCommentaryNode", "m_iszCommentaryFile"))
-        }
-        13719645572372795507u64 => {
-            Some(("DT_PointCommentaryNode", "m_iszCommentaryFileNoHDR"))
-        }
+        13667693378448451720u64 => Some(("DT_PointCommentaryNode", "m_iszCommentaryFile")),
+        13719645572372795507u64 => Some(("DT_PointCommentaryNode", "m_iszCommentaryFileNoHDR")),
         17623759576779101483u64 => Some(("DT_PointCommentaryNode", "m_iszSpeakers")),
         3999418953900660656u64 => Some(("DT_PoseController", "baseclass")),
         15850380745941941085u64 => Some(("DT_PoseController", "m_bInterpolationWrap")),
@@ -1039,16 +858,10 @@ pub fn get_prop_names(
         7874673952459470350u64 => Some(("DT_PropVehicleDriveable", "m_nBoostTimeLeft")),
         6761859165626473902u64 => Some(("DT_PropVehicleDriveable", "m_nHasBoost")),
         5969021796439874092u64 => Some(("DT_PropVehicleDriveable", "m_nRPM")),
-        3005830707751711881u64 => {
-            Some(("DT_PropVehicleDriveable", "m_nScannerDisabledVehicle"))
-        }
-        12828960798949964058u64 => {
-            Some(("DT_PropVehicleDriveable", "m_nScannerDisabledWeapons"))
-        }
+        3005830707751711881u64 => Some(("DT_PropVehicleDriveable", "m_nScannerDisabledVehicle")),
+        12828960798949964058u64 => Some(("DT_PropVehicleDriveable", "m_nScannerDisabledWeapons")),
         5285218742705793890u64 => Some(("DT_PropVehicleDriveable", "m_nSpeed")),
-        9641775883025781575u64 => {
-            Some(("DT_PropVehicleDriveable", "m_vecEyeExitEndpoint"))
-        }
+        9641775883025781575u64 => Some(("DT_PropVehicleDriveable", "m_vecEyeExitEndpoint")),
         17187880670544316069u64 => Some(("DT_PropVehicleDriveable", "m_vecGunCrosshair")),
         16128519728598722143u64 => Some(("DT_ProxyToggle", "baseclass")),
         9570761423526744925u64 => Some(("DT_ProxyToggle", "blah")),
@@ -1064,20 +877,12 @@ pub fn get_prop_names(
         6859363685445359174u64 => Some(("DT_Ragdoll", "m_nOverlaySequence")),
         8983018591918093749u64 => Some(("DT_Ragdoll", "m_ragAngles")),
         8678976162750786407u64 => Some(("DT_Ragdoll", "m_ragPos")),
-        10147147364061133792u64 => {
-            Some(("DT_RagdollManager", "m_iCurrentMaxRagdollCount"))
-        }
+        10147147364061133792u64 => Some(("DT_RagdollManager", "m_iCurrentMaxRagdollCount")),
         16940582236236543967u64 => Some(("DT_Ragdoll_Attached", "baseclass")),
-        13248670166458740693u64 => {
-            Some(("DT_Ragdoll_Attached", "m_attachmentPointBoneSpace"))
-        }
-        17289554333083603816u64 => {
-            Some(("DT_Ragdoll_Attached", "m_attachmentPointRagdollSpace"))
-        }
+        13248670166458740693u64 => Some(("DT_Ragdoll_Attached", "m_attachmentPointBoneSpace")),
+        17289554333083603816u64 => Some(("DT_Ragdoll_Attached", "m_attachmentPointRagdollSpace")),
         9970738773767813940u64 => Some(("DT_Ragdoll_Attached", "m_boneIndexAttached")),
-        11425772933165759084u64 => {
-            Some(("DT_Ragdoll_Attached", "m_ragdollAttachedObjectIndex"))
-        }
+        11425772933165759084u64 => Some(("DT_Ragdoll_Attached", "m_ragdollAttachedObjectIndex")),
         15936737141761764658u64 => Some(("DT_RobotDispenser", "baseclass")),
         10236659415076511103u64 => Some(("DT_RocketTrail", "baseclass")),
         8202951722512455160u64 => Some(("DT_RocketTrail", "m_EndColor")),
@@ -1101,9 +906,7 @@ pub fn get_prop_names(
         1969203741797316223u64 => Some(("DT_RopeKeyframe", "m_Subdiv")),
         13563203175411824845u64 => Some(("DT_RopeKeyframe", "m_TextureScale")),
         10587905665158945830u64 => Some(("DT_RopeKeyframe", "m_Width")),
-        2141537001863743767u64 => {
-            Some(("DT_RopeKeyframe", "m_bConstrainBetweenEndpoints"))
-        }
+        2141537001863743767u64 => Some(("DT_RopeKeyframe", "m_bConstrainBetweenEndpoints")),
         1049189979655627711u64 => Some(("DT_RopeKeyframe", "m_fLockedPoints")),
         6428197191463963676u64 => Some(("DT_RopeKeyframe", "m_flScrollSpeed")),
         9505712129081411725u64 => Some(("DT_RopeKeyframe", "m_hEndPoint")),
@@ -1125,13 +928,12 @@ pub fn get_prop_names(
             Some(("DT_ScriptCreatedAttribute", "m_iAttributeDefinitionIndex"))
         }
         6709383617686993832u64 => Some(("DT_ScriptCreatedAttribute", "m_iRawValue32")),
-        9857145824990589374u64 => {
-            Some(("DT_ScriptCreatedAttribute", "m_nRefundableCurrency"))
-        }
+        9857145824990589374u64 => Some(("DT_ScriptCreatedAttribute", "m_nRefundableCurrency")),
         10716608069952154964u64 => Some(("DT_ScriptCreatedItem", "m_AttributeList")),
-        570082728042388878u64 => {
-            Some(("DT_ScriptCreatedItem", "m_NetworkedDynamicAttributesForDemos"))
-        }
+        570082728042388878u64 => Some((
+            "DT_ScriptCreatedItem",
+            "m_NetworkedDynamicAttributesForDemos",
+        )),
         16173314348580045578u64 => Some(("DT_ScriptCreatedItem", "m_bInitialized")),
         8308089280484392185u64 => {
             Some(("DT_ScriptCreatedItem", "m_bOnlyIterateItemViewAttributes"))
@@ -1139,9 +941,7 @@ pub fn get_prop_names(
         1136494118791851951u64 => Some(("DT_ScriptCreatedItem", "m_iAccountID")),
         4931161556831243076u64 => Some(("DT_ScriptCreatedItem", "m_iEntityLevel")),
         6412909079676651973u64 => Some(("DT_ScriptCreatedItem", "m_iEntityQuality")),
-        13444166425656641027u64 => {
-            Some(("DT_ScriptCreatedItem", "m_iItemDefinitionIndex"))
-        }
+        13444166425656641027u64 => Some(("DT_ScriptCreatedItem", "m_iItemDefinitionIndex")),
         9835095664206099863u64 => Some(("DT_ScriptCreatedItem", "m_iItemIDHigh")),
         9667217002202509789u64 => Some(("DT_ScriptCreatedItem", "m_iItemIDLow")),
         2664458104193857833u64 => Some(("DT_ScriptCreatedItem", "m_iTeamNumber")),
@@ -1162,9 +962,7 @@ pub fn get_prop_names(
         5308385330272876970u64 => Some(("DT_SlideshowDisplay", "m_szDisplayText")),
         5691755573936915476u64 => Some(("DT_SlideshowDisplay", "m_szSlideshowDirectory")),
         16749144924608867882u64 => Some(("DT_SmokeStack", "baseclass")),
-        12460839418322149252u64 => {
-            Some(("DT_SmokeStack", "m_AmbientLight.m_flIntensity"))
-        }
+        12460839418322149252u64 => Some(("DT_SmokeStack", "m_AmbientLight.m_flIntensity")),
         6012515736489917478u64 => Some(("DT_SmokeStack", "m_AmbientLight.m_vColor")),
         15595266523751013805u64 => Some(("DT_SmokeStack", "m_AmbientLight.m_vPos")),
         6609717569919402999u64 => Some(("DT_SmokeStack", "m_DirLight.m_flIntensity")),
@@ -1501,31 +1299,20 @@ pub fn get_prop_names(
         10642027310653757124u64 => Some(("DT_TETFExplosion", "m_vecOrigin[2]")),
         6584802487867774737u64 => Some(("DT_TETFParticleEffect", "baseclass")),
         176025285012321247u64 => Some(("DT_TETFParticleEffect", "entindex")),
-        6542097112926352462u64 => {
-            Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_eParticleAttachment"))
-        }
-        3932969823774159247u64 => {
-            Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[0]"))
-        }
-        3463705957569073224u64 => {
-            Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[1]"))
-        }
-        5288080521798412873u64 => {
-            Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[2]"))
-        }
-        9320262432422183789u64 => {
-            Some(("DT_TETFParticleEffect", "m_CustomColors.m_vecColor1"))
-        }
-        9323077182189836274u64 => {
-            Some(("DT_TETFParticleEffect", "m_CustomColors.m_vecColor2"))
-        }
+        6542097112926352462u64 => Some((
+            "DT_TETFParticleEffect",
+            "m_ControlPoint1.m_eParticleAttachment",
+        )),
+        3932969823774159247u64 => Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[0]")),
+        3463705957569073224u64 => Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[1]")),
+        5288080521798412873u64 => Some(("DT_TETFParticleEffect", "m_ControlPoint1.m_vecOffset[2]")),
+        9320262432422183789u64 => Some(("DT_TETFParticleEffect", "m_CustomColors.m_vecColor1")),
+        9323077182189836274u64 => Some(("DT_TETFParticleEffect", "m_CustomColors.m_vecColor2")),
         13376960549802941744u64 => Some(("DT_TETFParticleEffect", "m_bControlPoint1")),
         6224861019298613607u64 => Some(("DT_TETFParticleEffect", "m_bCustomColors")),
         15886282426575032016u64 => Some(("DT_TETFParticleEffect", "m_bResetParticles")),
         3340605646083506174u64 => Some(("DT_TETFParticleEffect", "m_iAttachType")),
-        13426684681092049224u64 => {
-            Some(("DT_TETFParticleEffect", "m_iAttachmentPointIndex"))
-        }
+        13426684681092049224u64 => Some(("DT_TETFParticleEffect", "m_iAttachmentPointIndex")),
         36474605466937610u64 => Some(("DT_TETFParticleEffect", "m_iParticleSystemIndex")),
         15803149409074318078u64 => Some(("DT_TETFParticleEffect", "m_vecAngles")),
         12673370125834815576u64 => Some(("DT_TETFParticleEffect", "m_vecOrigin[0]")),
@@ -1549,9 +1336,7 @@ pub fn get_prop_names(
         3907057021428663692u64 => Some(("DT_TFBaseRocket", "m_vInitialVelocity")),
         16666368649603102391u64 => Some(("DT_TFBaseRocket", "m_vecOrigin")),
         10757498929721725308u64 => Some(("DT_TFBotHintEngineerNest", "baseclass")),
-        9694853923341582225u64 => {
-            Some(("DT_TFBotHintEngineerNest", "m_bHasActiveTeleporter"))
-        }
+        9694853923341582225u64 => Some(("DT_TFBotHintEngineerNest", "m_bHasActiveTeleporter")),
         1057117146229135166u64 => Some(("DT_TFCannon", "baseclass")),
         6908811666746669411u64 => Some(("DT_TFDroppedWeapon", "baseclass")),
         5577822078145368885u64 => Some(("DT_TFDroppedWeapon", "m_Item")),
@@ -1561,9 +1346,7 @@ pub fn get_prop_names(
         3136455976364110795u64 => Some(("DT_TFFlameManager", "m_flFlameDrag")),
         5563320511495781339u64 => Some(("DT_TFFlameManager", "m_flFlameEndSizeMult")),
         12563230953753191399u64 => Some(("DT_TFFlameManager", "m_flFlameGravity")),
-        16757173692405404021u64 => {
-            Some(("DT_TFFlameManager", "m_flFlameIgnorePlayerVelocity"))
-        }
+        16757173692405404021u64 => Some(("DT_TFFlameManager", "m_flFlameIgnorePlayerVelocity")),
         5304463784614196616u64 => Some(("DT_TFFlameManager", "m_flFlameLifeTime")),
         10535782174958962852u64 => {
             Some(("DT_TFFlameManager", "m_flFlameReflectionAdditionalLifeTime"))
@@ -1575,51 +1358,33 @@ pub fn get_prop_names(
         17389908919252614132u64 => Some(("DT_TFFlameManager", "m_flFlameStartSizeMult")),
         2701239937078247234u64 => Some(("DT_TFFlameManager", "m_flFlameUp")),
         9542601273415188279u64 => Some(("DT_TFFlameManager", "m_flRandomLifeTimeOffset")),
-        16289768184728776809u64 => {
-            Some(("DT_TFFlameManager", "m_flRedirectedFlameSizeMult"))
-        }
+        16289768184728776809u64 => Some(("DT_TFFlameManager", "m_flRedirectedFlameSizeMult")),
         1742440989253951239u64 => Some(("DT_TFFlameManager", "m_flSpreadDegree")),
         16454098667507787807u64 => Some(("DT_TFFlameManager", "m_hAttacker")),
         7883578044087259326u64 => Some(("DT_TFFlameManager", "m_hWeapon")),
-        1137322188742262934u64 => {
-            Some(("DT_TFFlameManager", "m_iMaxFlameReflectionCount"))
-        }
+        1137322188742262934u64 => Some(("DT_TFFlameManager", "m_iMaxFlameReflectionCount")),
         3938552470589463786u64 => Some(("DT_TFFlameManager", "m_nShouldReflect")),
         5843597919412475388u64 => Some(("DT_TFFlameRocket", "baseclass")),
-        1519437576535719208u64 => {
-            Some(("DT_TFGameRules", "m_bAllowTrainingAchievements"))
-        }
+        1519437576535719208u64 => Some(("DT_TFGameRules", "m_bAllowTrainingAchievements")),
         8078845543541044142u64 => Some(("DT_TFGameRules", "m_bBountyModeEnabled")),
         7865111346810721469u64 => Some(("DT_TFGameRules", "m_bCompetitiveMode")),
-        2009809779261873794u64 => {
-            Some(("DT_TFGameRules", "m_bHaveMinPlayersToEnableReady"))
-        }
+        2009809779261873794u64 => Some(("DT_TFGameRules", "m_bHaveMinPlayersToEnableReady")),
         11652225448812591895u64 => Some(("DT_TFGameRules", "m_bHelltowerPlayersInHell")),
         2186276668938128304u64 => Some(("DT_TFGameRules", "m_bIsInItemTestingMode")),
         11042492953028957530u64 => Some(("DT_TFGameRules", "m_bIsInTraining")),
         16682836678563923912u64 => Some(("DT_TFGameRules", "m_bIsTrainingHUDVisible")),
         10508832861176801672u64 => Some(("DT_TFGameRules", "m_bIsUsingSpells")),
-        6500432625847509978u64 => {
-            Some(("DT_TFGameRules", "m_bIsWaitingForTrainingContinue"))
-        }
-        13567631647616280722u64 => {
-            Some(("DT_TFGameRules", "m_bMannVsMachineAlarmStatus"))
-        }
+        6500432625847509978u64 => Some(("DT_TFGameRules", "m_bIsWaitingForTrainingContinue")),
+        13567631647616280722u64 => Some(("DT_TFGameRules", "m_bMannVsMachineAlarmStatus")),
         16105508676691426802u64 => Some(("DT_TFGameRules", "m_bMapHasMatchSummaryStage")),
         2220920686009069200u64 => Some(("DT_TFGameRules", "m_bMatchEnded")),
-        9593078190126985921u64 => {
-            Some(("DT_TFGameRules", "m_bPlayersAreOnMatchSummaryStage"))
-        }
+        9593078190126985921u64 => Some(("DT_TFGameRules", "m_bPlayersAreOnMatchSummaryStage")),
         10458824523513855227u64 => Some(("DT_TFGameRules", "m_bPlayingHybrid_CTF_CP")),
         448807795343741873u64 => Some(("DT_TFGameRules", "m_bPlayingKoth")),
         998398475513051441u64 => Some(("DT_TFGameRules", "m_bPlayingMannVsMachine")),
         17349486215842584714u64 => Some(("DT_TFGameRules", "m_bPlayingMedieval")),
-        2939098533427406702u64 => {
-            Some(("DT_TFGameRules", "m_bPlayingRobotDestructionMode"))
-        }
-        4586199180287230135u64 => {
-            Some(("DT_TFGameRules", "m_bPlayingSpecialDeliveryMode"))
-        }
+        2939098533427406702u64 => Some(("DT_TFGameRules", "m_bPlayingRobotDestructionMode")),
+        4586199180287230135u64 => Some(("DT_TFGameRules", "m_bPlayingSpecialDeliveryMode")),
         4315315735035020952u64 => Some(("DT_TFGameRules", "m_bPowerupMode")),
         6911024999663273931u64 => Some(("DT_TFGameRules", "m_bShowMatchSummary")),
         12421438954172708401u64 => Some(("DT_TFGameRules", "m_bStopWatchWinner")),
@@ -1627,9 +1392,7 @@ pub fn get_prop_names(
         2343526807179177200u64 => Some(("DT_TFGameRules", "m_bTruceActive")),
         1003842331011414072u64 => Some(("DT_TFGameRules", "m_ePlayerWantsRematch")),
         9052821624391218815u64 => Some(("DT_TFGameRules", "m_eRematchState")),
-        14934685673846116320u64 => {
-            Some(("DT_TFGameRules", "m_fBossNormalizedTravelDistance"))
-        }
+        14934685673846116320u64 => Some(("DT_TFGameRules", "m_fBossNormalizedTravelDistance")),
         13629499624731959983u64 => Some(("DT_TFGameRules", "m_fHalloweenEffectDuration")),
         3345151251675861024u64 => Some(("DT_TFGameRules", "m_fHalloweenEffectStartTime")),
         7500312199056929943u64 => Some(("DT_TFGameRules", "m_flCapturePointEnableTime")),
@@ -1661,34 +1424,20 @@ pub fn get_prop_names(
         7692815414064293452u64 => Some(("DT_TFGlow", "m_hTarget")),
         14113121779433971679u64 => Some(("DT_TFGlow", "m_iMode")),
         420507324454454151u64 => Some(("DT_TFHalloweenMinigame", "baseclass")),
-        14860990830486658803u64 => {
-            Some(("DT_TFHalloweenMinigame_FallingPlatforms", "baseclass"))
-        }
+        14860990830486658803u64 => Some(("DT_TFHalloweenMinigame_FallingPlatforms", "baseclass")),
         10387546850855081955u64 => Some(("DT_TFHellZap", "baseclass")),
         4595132133150625896u64 => Some(("DT_TFItem", "baseclass")),
         11455141167982501301u64 => Some(("DT_TFLaserPointer", "baseclass")),
-        2355899791785364457u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "\"player_object_array\""))
-        }
-        2854777259191992101u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "m_angEyeAngles[0]"))
-        }
-        2270671602466230550u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "m_angEyeAngles[1]"))
-        }
+        2355899791785364457u64 => Some(("DT_TFLocalPlayerExclusive", "\"player_object_array\"")),
+        2854777259191992101u64 => Some(("DT_TFLocalPlayerExclusive", "m_angEyeAngles[0]")),
+        2270671602466230550u64 => Some(("DT_TFLocalPlayerExclusive", "m_angEyeAngles[1]")),
         15490410258299980966u64 => Some(("DT_TFLocalPlayerExclusive", "m_bIsCoaching")),
-        15600098204991556272u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "m_bMatchSafeToLeave"))
-        }
+        15600098204991556272u64 => Some(("DT_TFLocalPlayerExclusive", "m_bMatchSafeToLeave")),
         15183661536505159926u64 => Some(("DT_TFLocalPlayerExclusive", "m_hCoach")),
         4446759084696780097u64 => Some(("DT_TFLocalPlayerExclusive", "m_hStudent")),
         7463087239777297769u64 => Some(("DT_TFLocalPlayerExclusive", "m_nCurrency")),
-        6802275605408829328u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "m_nExperienceLevel"))
-        }
-        1038990937238887613u64 => {
-            Some(("DT_TFLocalPlayerExclusive", "m_nExperienceLevelProgress"))
-        }
+        6802275605408829328u64 => Some(("DT_TFLocalPlayerExclusive", "m_nExperienceLevel")),
+        1038990937238887613u64 => Some(("DT_TFLocalPlayerExclusive", "m_nExperienceLevelProgress")),
         3008076477471646514u64 => Some(("DT_TFLocalPlayerExclusive", "m_vecOrigin")),
         8637325494603745508u64 => Some(("DT_TFLocalPlayerExclusive", "m_vecOrigin[2]")),
         439464678884156141u64 => Some(("DT_TFLunchBox_Drink", "baseclass")),
@@ -1699,20 +1448,12 @@ pub fn get_prop_names(
         5135381610869586175u64 => Some(("DT_TFMinigame", "m_nMinigameTeamScore")),
         2188900221780572065u64 => Some(("DT_TFMinigame", "m_pszHudResFile")),
         15897538479185705410u64 => Some(("DT_TFMinigameLogic", "m_hActiveMinigame")),
-        15496889328616325576u64 => {
-            Some(("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[0]"))
-        }
-        15966153194821411599u64 => {
-            Some(("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[1]"))
-        }
+        15496889328616325576u64 => Some(("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[0]")),
+        15966153194821411599u64 => Some(("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[1]")),
         1431675682721348091u64 => Some(("DT_TFNonLocalPlayerExclusive", "m_vecOrigin")),
-        5446920940402922251u64 => {
-            Some(("DT_TFNonLocalPlayerExclusive", "m_vecOrigin[2]"))
-        }
+        5446920940402922251u64 => Some(("DT_TFNonLocalPlayerExclusive", "m_vecOrigin[2]")),
         18334659138702607112u64 => Some(("DT_TFObjectiveResource", "baseclass")),
-        4575154636832413047u64 => {
-            Some(("DT_TFObjectiveResource", "m_bMannVsMachineBetweenWaves"))
-        }
+        4575154636832413047u64 => Some(("DT_TFObjectiveResource", "m_bMannVsMachineBetweenWaves")),
         4797638343371263506u64 => {
             Some(("DT_TFObjectiveResource", "m_bMannVsMachineWaveClassActive"))
         }
@@ -1722,28 +1463,19 @@ pub fn get_prop_names(
         13288804666577293506u64 => {
             Some(("DT_TFObjectiveResource", "m_flMannVsMachineNextWaveTime"))
         }
-        11929927671945168139u64 => {
-            Some(("DT_TFObjectiveResource", "m_flMvMBaseBombUpgradeTime"))
-        }
-        13505806967720020855u64 => {
-            Some(("DT_TFObjectiveResource", "m_flMvMNextBombUpgradeTime"))
-        }
+        11929927671945168139u64 => Some(("DT_TFObjectiveResource", "m_flMvMBaseBombUpgradeTime")),
+        13505806967720020855u64 => Some(("DT_TFObjectiveResource", "m_flMvMNextBombUpgradeTime")),
         9478226788110647277u64 => Some(("DT_TFObjectiveResource", "m_iChallengeIndex")),
         13662811373935201870u64 => {
             Some(("DT_TFObjectiveResource", "m_iszMannVsMachineWaveClassNames"))
         }
-        14125941359358500862u64 => {
-            Some(("DT_TFObjectiveResource", "m_iszMannVsMachineWaveClassNames2"))
-        }
-        13283479491072032159u64 => {
-            Some(("DT_TFObjectiveResource", "m_iszMvMPopfileName"))
-        }
-        3141572634512091591u64 => {
-            Some(("DT_TFObjectiveResource", "m_nFlagCarrierUpgradeLevel"))
-        }
-        13702672100241298347u64 => {
-            Some(("DT_TFObjectiveResource", "m_nMannVsMachineMaxWaveCount"))
-        }
+        14125941359358500862u64 => Some((
+            "DT_TFObjectiveResource",
+            "m_iszMannVsMachineWaveClassNames2",
+        )),
+        13283479491072032159u64 => Some(("DT_TFObjectiveResource", "m_iszMvMPopfileName")),
+        3141572634512091591u64 => Some(("DT_TFObjectiveResource", "m_nFlagCarrierUpgradeLevel")),
+        13702672100241298347u64 => Some(("DT_TFObjectiveResource", "m_nMannVsMachineMaxWaveCount")),
         14479845184716420260u64 => {
             Some(("DT_TFObjectiveResource", "m_nMannVsMachineWaveClassCounts"))
         }
@@ -1756,15 +1488,11 @@ pub fn get_prop_names(
         11508700711658591349u64 => {
             Some(("DT_TFObjectiveResource", "m_nMannVsMachineWaveClassFlags2"))
         }
-        7227979331359746109u64 => {
-            Some(("DT_TFObjectiveResource", "m_nMannVsMachineWaveCount"))
-        }
+        7227979331359746109u64 => Some(("DT_TFObjectiveResource", "m_nMannVsMachineWaveCount")),
         1069285676895186995u64 => {
             Some(("DT_TFObjectiveResource", "m_nMannVsMachineWaveEnemyCount"))
         }
-        1466090976134144518u64 => {
-            Some(("DT_TFObjectiveResource", "m_nMvMEventPopfileType"))
-        }
+        1466090976134144518u64 => Some(("DT_TFObjectiveResource", "m_nMvMEventPopfileType")),
         4166591886263057385u64 => Some(("DT_TFObjectiveResource", "m_nMvMWorldMoney")),
         13299511838875128394u64 => Some(("DT_TFPEPBrawlerBlaster", "baseclass")),
         17108076728579629388u64 => Some(("DT_TFParachute", "baseclass")),
@@ -1837,47 +1565,23 @@ pub fn get_prop_names(
         9530282495848511690u64 => Some(("DT_TFPlayer", "overlay_vars")),
         12892934495131611572u64 => Some(("DT_TFPlayer", "tflocaldata")),
         5540499732856528391u64 => Some(("DT_TFPlayer", "tfnonlocaldata")),
-        7249864104174644610u64 => {
-            Some(("DT_TFPlayerClassShared", "m_angCustomModelRotation"))
-        }
-        7891561342236285696u64 => {
-            Some(("DT_TFPlayerClassShared", "m_bCustomModelRotates"))
-        }
-        5661877542053184554u64 => {
-            Some(("DT_TFPlayerClassShared", "m_bCustomModelRotationSet"))
-        }
-        12236343874382570979u64 => {
-            Some(("DT_TFPlayerClassShared", "m_bCustomModelVisibleToSelf"))
-        }
-        2214526246742245878u64 => {
-            Some(("DT_TFPlayerClassShared", "m_bUseClassAnimations"))
-        }
+        7249864104174644610u64 => Some(("DT_TFPlayerClassShared", "m_angCustomModelRotation")),
+        7891561342236285696u64 => Some(("DT_TFPlayerClassShared", "m_bCustomModelRotates")),
+        5661877542053184554u64 => Some(("DT_TFPlayerClassShared", "m_bCustomModelRotationSet")),
+        12236343874382570979u64 => Some(("DT_TFPlayerClassShared", "m_bCustomModelVisibleToSelf")),
+        2214526246742245878u64 => Some(("DT_TFPlayerClassShared", "m_bUseClassAnimations")),
         2825349581366125159u64 => Some(("DT_TFPlayerClassShared", "m_iClass")),
-        14929819972727047015u64 => {
-            Some(("DT_TFPlayerClassShared", "m_iClassModelParity"))
-        }
+        14929819972727047015u64 => Some(("DT_TFPlayerClassShared", "m_iClassModelParity")),
         8853562029396887365u64 => Some(("DT_TFPlayerClassShared", "m_iszClassIcon")),
         9299532423604932782u64 => Some(("DT_TFPlayerClassShared", "m_iszCustomModel")),
-        3605541538603075295u64 => {
-            Some(("DT_TFPlayerClassShared", "m_vecCustomModelOffset"))
-        }
-        8109358974358448859u64 => {
-            Some(("DT_TFPlayerConditionListExclusive", "_condition_bits"))
-        }
+        3605541538603075295u64 => Some(("DT_TFPlayerClassShared", "m_vecCustomModelOffset")),
+        8109358974358448859u64 => Some(("DT_TFPlayerConditionListExclusive", "_condition_bits")),
         17722716055336985602u64 => Some(("DT_TFPlayerConditionSource", "m_pProvider")),
         10248945773196542992u64 => Some(("DT_TFPlayerDestructionLogic", "baseclass")),
-        5156957243461434651u64 => {
-            Some(("DT_TFPlayerDestructionLogic", "m_bUsingCountdownImage"))
-        }
-        12491625350289392601u64 => {
-            Some(("DT_TFPlayerDestructionLogic", "m_hBlueTeamLeader"))
-        }
-        16909734097181653644u64 => {
-            Some(("DT_TFPlayerDestructionLogic", "m_hRedTeamLeader"))
-        }
-        10722194028370111079u64 => {
-            Some(("DT_TFPlayerDestructionLogic", "m_iszCountdownImage"))
-        }
+        5156957243461434651u64 => Some(("DT_TFPlayerDestructionLogic", "m_bUsingCountdownImage")),
+        12491625350289392601u64 => Some(("DT_TFPlayerDestructionLogic", "m_hBlueTeamLeader")),
+        16909734097181653644u64 => Some(("DT_TFPlayerDestructionLogic", "m_hRedTeamLeader")),
+        10722194028370111079u64 => Some(("DT_TFPlayerDestructionLogic", "m_iszCountdownImage")),
         7612658407222882550u64 => Some(("DT_TFPlayerResource", "baseclass")),
         17700542660589565789u64 => Some(("DT_TFPlayerResource", "m_bArenaSpectator")),
         4207975465077930456u64 => Some(("DT_TFPlayerResource", "m_flConnectTime")),
@@ -1897,70 +1601,36 @@ pub fn get_prop_names(
         18157388711444408095u64 => Some(("DT_TFPlayerResource", "m_iHealingAssist")),
         15085920427971391680u64 => Some(("DT_TFPlayerResource", "m_iMaxBuffedHealth")),
         5653953536196887992u64 => Some(("DT_TFPlayerResource", "m_iMaxHealth")),
-        11696566803975617270u64 => {
-            Some(("DT_TFPlayerResource", "m_iPartyLeaderBlueTeamIndex"))
-        }
-        2054940335926020477u64 => {
-            Some(("DT_TFPlayerResource", "m_iPartyLeaderRedTeamIndex"))
-        }
+        11696566803975617270u64 => Some(("DT_TFPlayerResource", "m_iPartyLeaderBlueTeamIndex")),
+        2054940335926020477u64 => Some(("DT_TFPlayerResource", "m_iPartyLeaderRedTeamIndex")),
         8699252127192966809u64 => Some(("DT_TFPlayerResource", "m_iPlayerClass")),
-        6704078495147373702u64 => {
-            Some(("DT_TFPlayerResource", "m_iPlayerClassWhenKilled"))
-        }
+        6704078495147373702u64 => Some(("DT_TFPlayerResource", "m_iPlayerClassWhenKilled")),
         12788727291211533199u64 => Some(("DT_TFPlayerResource", "m_iPlayerLevel")),
         10874692585148385673u64 => Some(("DT_TFPlayerResource", "m_iStreaks")),
         17428890270970208490u64 => Some(("DT_TFPlayerResource", "m_iTotalScore")),
-        16586024212263748746u64 => {
-            Some(("DT_TFPlayerResource", "m_iUpgradeRefundCredits"))
-        }
-        17680963770361692319u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iBackstabs"))
-        }
-        3224714055136190323u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iBonusPoints"))
-        }
-        16174441437982525942u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iBuildingsBuilt"))
-        }
+        16586024212263748746u64 => Some(("DT_TFPlayerResource", "m_iUpgradeRefundCredits")),
+        17680963770361692319u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iBackstabs")),
+        3224714055136190323u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iBonusPoints")),
+        16174441437982525942u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iBuildingsBuilt")),
         6671651359607407371u64 => {
             Some(("DT_TFPlayerScoringDataExclusive", "m_iBuildingsDestroyed"))
         }
-        4437120948640711658u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iCaptures"))
-        }
+        4437120948640711658u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iCaptures")),
         2310419630852119968u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iCrits")),
-        13850963706537747988u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iDamageDone"))
-        }
+        13850963706537747988u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iDamageDone")),
         10678164487375062394u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iDeaths")),
-        17356718221504493224u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iDefenses"))
-        }
-        3020202442825994948u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iDominations"))
-        }
-        6052806862059603118u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iHeadshots"))
-        }
-        13594920310935082852u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iHealPoints"))
-        }
+        17356718221504493224u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iDefenses")),
+        3020202442825994948u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iDominations")),
+        6052806862059603118u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iHeadshots")),
+        13594920310935082852u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iHealPoints")),
         6755946340314293828u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iInvulns")),
-        10176801774546911515u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iKillAssists"))
-        }
+        10176801774546911515u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iKillAssists")),
         11660639819126944296u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iKills")),
         2426254399929860246u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iPoints")),
-        9637589603182506964u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iResupplyPoints"))
-        }
+        9637589603182506964u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iResupplyPoints")),
         4455851378629347009u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iRevenge")),
-        18302889089109974372u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iSuicides"))
-        }
-        12833867606768280111u64 => {
-            Some(("DT_TFPlayerScoringDataExclusive", "m_iTeleports"))
-        }
+        18302889089109974372u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iSuicides")),
+        12833867606768280111u64 => Some(("DT_TFPlayerScoringDataExclusive", "m_iTeleports")),
         13640076862556929535u64 => Some(("DT_TFPlayerShared", "m_ConditionData")),
         15138242856073670715u64 => Some(("DT_TFPlayerShared", "m_ConditionList")),
         6198142612083178798u64 => Some(("DT_TFPlayerShared", "m_askForBallTime")),
@@ -1968,9 +1638,7 @@ pub fn get_prop_names(
         7347773854865773172u64 => Some(("DT_TFPlayerShared", "m_bCarryingObject")),
         14376035618414412444u64 => Some(("DT_TFPlayerShared", "m_bFeignDeathReady")),
         12259859103740215171u64 => Some(("DT_TFPlayerShared", "m_bHasPasstimeBall")),
-        4455350095516214322u64 => {
-            Some(("DT_TFPlayerShared", "m_bIsTargetedForPasstimePass"))
-        }
+        4455350095516214322u64 => Some(("DT_TFPlayerShared", "m_bIsTargetedForPasstimePass")),
         5838919372959573624u64 => Some(("DT_TFPlayerShared", "m_bJumping")),
         19340862012048690u64 => Some(("DT_TFPlayerShared", "m_bKingRuneBuffActive")),
         2168903779110072292u64 => Some(("DT_TFPlayerShared", "m_bLoadoutUnavailable")),
@@ -1983,9 +1651,7 @@ pub fn get_prop_names(
         10620109144072782656u64 => Some(("DT_TFPlayerShared", "m_flFirstPrimaryAttack")),
         14843775226164806883u64 => Some(("DT_TFPlayerShared", "m_flHolsterAnimTime")),
         10336504216876497537u64 => Some(("DT_TFPlayerShared", "m_flHypeMeter")),
-        218051690691615885u64 => {
-            Some(("DT_TFPlayerShared", "m_flInvisChangeCompleteTime"))
-        }
+        218051690691615885u64 => Some(("DT_TFPlayerShared", "m_flInvisChangeCompleteTime")),
         3150733167809423204u64 => Some(("DT_TFPlayerShared", "m_flMovementStunTime")),
         2406326727072302926u64 => Some(("DT_TFPlayerShared", "m_flNextNoiseMakerTime")),
         2833658322849843380u64 => Some(("DT_TFPlayerShared", "m_flRuneCharge")),
@@ -2003,9 +1669,7 @@ pub fn get_prop_names(
         14376191046083514006u64 => Some(("DT_TFPlayerShared", "m_iDisguiseHealth")),
         2071173860217244535u64 => Some(("DT_TFPlayerShared", "m_iDisguiseTargetIndex")),
         4386630627084353964u64 => Some(("DT_TFPlayerShared", "m_iItemFindBonus")),
-        13018720741200056505u64 => {
-            Some(("DT_TFPlayerShared", "m_iKillCountSinceLastDeploy"))
-        }
+        13018720741200056505u64 => Some(("DT_TFPlayerShared", "m_iKillCountSinceLastDeploy")),
         10849469538206417414u64 => Some(("DT_TFPlayerShared", "m_iMovementStunAmount")),
         11413856900318138181u64 => Some(("DT_TFPlayerShared", "m_iMovementStunParity")),
         1107376634035073720u64 => Some(("DT_TFPlayerShared", "m_iNextMeleeCrit")),
@@ -2021,9 +1685,7 @@ pub fn get_prop_names(
         3930609604368626551u64 => Some(("DT_TFPlayerShared", "m_nDisguiseClass")),
         9748785180780691560u64 => Some(("DT_TFPlayerShared", "m_nDisguiseSkinOverride")),
         7530743234452068868u64 => Some(("DT_TFPlayerShared", "m_nDisguiseTeam")),
-        18218083380655909929u64 => {
-            Some(("DT_TFPlayerShared", "m_nHalloweenBombHeadStage"))
-        }
+        18218083380655909929u64 => Some(("DT_TFPlayerShared", "m_nHalloweenBombHeadStage")),
         7927935797743283012u64 => Some(("DT_TFPlayerShared", "m_nMaskClass")),
         13919718662559767836u64 => Some(("DT_TFPlayerShared", "m_nNumHealers")),
         4711286069984596877u64 => Some(("DT_TFPlayerShared", "m_nPlayerCond")),
@@ -2034,43 +1696,23 @@ pub fn get_prop_names(
         6997136048966888830u64 => Some(("DT_TFPlayerShared", "m_nPlayerState")),
         2245046823419043341u64 => Some(("DT_TFPlayerShared", "m_nStreaks")),
         13227057019132638210u64 => Some(("DT_TFPlayerShared", "m_nTeamTeleporterUsed")),
-        6850962631760212227u64 => {
-            Some(("DT_TFPlayerShared", "m_unTauntSourceItemID_High"))
-        }
-        7956084466773733649u64 => {
-            Some(("DT_TFPlayerShared", "m_unTauntSourceItemID_Low"))
-        }
+        6850962631760212227u64 => Some(("DT_TFPlayerShared", "m_unTauntSourceItemID_High")),
+        7956084466773733649u64 => Some(("DT_TFPlayerShared", "m_unTauntSourceItemID_Low")),
         13319027686375000106u64 => Some(("DT_TFPlayerShared", "tfsharedlocaldata")),
         13515211804134568111u64 => Some(("DT_TFPlayerSharedLocal", "m_RoundScoreData")),
         11658671531568813399u64 => Some(("DT_TFPlayerSharedLocal", "m_ScoreData")),
         10573114432959501698u64 => Some(("DT_TFPlayerSharedLocal", "m_bInUpgradeZone")),
-        6235798292393519521u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_bLastDisguisedAsOwnTeam"))
-        }
+        6235798292393519521u64 => Some(("DT_TFPlayerSharedLocal", "m_bLastDisguisedAsOwnTeam")),
         6383445034036932063u64 => Some(("DT_TFPlayerSharedLocal", "m_bPlayerDominated")),
-        5106268198471469488u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_bPlayerDominatingMe"))
-        }
+        5106268198471469488u64 => Some(("DT_TFPlayerSharedLocal", "m_bPlayerDominatingMe")),
         8703332696775965354u64 => Some(("DT_TFPlayerSharedLocal", "m_bRageDraining")),
-        17815527772808308975u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_flItemChargeMeter"))
-        }
-        6190595888268647202u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_flNextRageEarnTime"))
-        }
+        17815527772808308975u64 => Some(("DT_TFPlayerSharedLocal", "m_flItemChargeMeter")),
+        6190595888268647202u64 => Some(("DT_TFPlayerSharedLocal", "m_flNextRageEarnTime")),
         9364048440766555013u64 => Some(("DT_TFPlayerSharedLocal", "m_flRageMeter")),
-        13248562547516894870u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_flStealthNextChangeTime"))
-        }
-        332842319886115406u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_flStealthNoAttackExpire"))
-        }
-        14396091422816444542u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_nDesiredDisguiseClass"))
-        }
-        13635661560440991919u64 => {
-            Some(("DT_TFPlayerSharedLocal", "m_nDesiredDisguiseTeam"))
-        }
+        13248562547516894870u64 => Some(("DT_TFPlayerSharedLocal", "m_flStealthNextChangeTime")),
+        332842319886115406u64 => Some(("DT_TFPlayerSharedLocal", "m_flStealthNoAttackExpire")),
+        14396091422816444542u64 => Some(("DT_TFPlayerSharedLocal", "m_nDesiredDisguiseClass")),
+        13635661560440991919u64 => Some(("DT_TFPlayerSharedLocal", "m_nDesiredDisguiseTeam")),
         16802735114717414726u64 => Some(("DT_TFPointManager", "baseclass")),
         11407323403926547683u64 => Some(("DT_TFPointManager", "m_nRandomSeed")),
         14592916104900028575u64 => Some(("DT_TFPointManager", "m_nSpawnTime")),
@@ -2084,12 +1726,8 @@ pub fn get_prop_names(
         4789184390952531014u64 => Some(("DT_TFProjectile_Arrow", "m_bCritical")),
         6860211990544602615u64 => Some(("DT_TFProjectile_Arrow", "m_iProjectileType")),
         16732170025238567113u64 => Some(("DT_TFProjectile_BallOfFire", "baseclass")),
-        3551886767247335557u64 => {
-            Some(("DT_TFProjectile_BallOfFire", "m_vecInitialVelocity"))
-        }
-        14013310836056119883u64 => {
-            Some(("DT_TFProjectile_BallOfFire", "m_vecSpawnOrigin"))
-        }
+        3551886767247335557u64 => Some(("DT_TFProjectile_BallOfFire", "m_vecInitialVelocity")),
+        14013310836056119883u64 => Some(("DT_TFProjectile_BallOfFire", "m_vecSpawnOrigin")),
         1694264126009137687u64 => Some(("DT_TFProjectile_Cleaver", "baseclass")),
         11742405590819450090u64 => Some(("DT_TFProjectile_EnergyBall", "baseclass")),
         2241173520409474385u64 => Some(("DT_TFProjectile_EnergyBall", "m_bChargedShot")),
@@ -2116,12 +1754,8 @@ pub fn get_prop_names(
         15010647634537197984u64 => Some(("DT_TFProjectile_SpellFireball", "baseclass")),
         4807593640550589405u64 => Some(("DT_TFProjectile_SpellKartBats", "baseclass")),
         16949553242176008798u64 => Some(("DT_TFProjectile_SpellKartOrb", "baseclass")),
-        10842204632356957470u64 => {
-            Some(("DT_TFProjectile_SpellLightningOrb", "baseclass"))
-        }
-        14182772427390563713u64 => {
-            Some(("DT_TFProjectile_SpellMeteorShower", "baseclass"))
-        }
+        10842204632356957470u64 => Some(("DT_TFProjectile_SpellLightningOrb", "baseclass")),
+        14182772427390563713u64 => Some(("DT_TFProjectile_SpellMeteorShower", "baseclass")),
         17703005378366755113u64 => Some(("DT_TFProjectile_SpellMirv", "baseclass")),
         14914850774318660739u64 => Some(("DT_TFProjectile_SpellPumpkin", "baseclass")),
         5479354589192301957u64 => Some(("DT_TFProjectile_SpellSpawnBoss", "baseclass")),
@@ -2129,9 +1763,7 @@ pub fn get_prop_names(
         4908690425231541948u64 => Some(("DT_TFProjectile_SpellSpawnZombie", "baseclass")),
         12128142407924414902u64 => Some(("DT_TFProjectile_StunBall", "baseclass")),
         17709749369402976757u64 => Some(("DT_TFProjectile_Throwable", "baseclass")),
-        16511027951888279189u64 => {
-            Some(("DT_TFProjectile_ThrowableBreadMonster", "baseclass"))
-        }
+        16511027951888279189u64 => Some(("DT_TFProjectile_ThrowableBreadMonster", "baseclass")),
         10478321330033024438u64 => Some(("DT_TFProjectile_ThrowableBrick", "baseclass")),
         4302692227327169871u64 => Some(("DT_TFProjectile_ThrowableRepel", "baseclass")),
         538080235901856197u64 => Some(("DT_TFPumpkinBomb", "baseclass")),
@@ -2163,36 +1795,18 @@ pub fn get_prop_names(
         17731752119435714618u64 => Some(("DT_TFReviveMarker", "m_iHealth")),
         14390269941393668274u64 => Some(("DT_TFReviveMarker", "m_iMaxHealth")),
         16453247229432364389u64 => Some(("DT_TFReviveMarker", "m_nRevives")),
-        2488259357860265392u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_eWinningMethod"))
-        }
-        506528478121562763u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flBlueFinaleEndTime"))
-        }
-        8630855110816100811u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flBlueTeamRespawnScale"))
-        }
-        5631486662947798357u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flCountdownEndTime"))
-        }
-        10170855019148588755u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flFinaleLength"))
-        }
-        11511520958397168054u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flRedFinaleEndTime"))
-        }
-        14657347363419301188u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_flRedTeamRespawnScale"))
-        }
+        2488259357860265392u64 => Some(("DT_TFRobotDestructionLogic", "m_eWinningMethod")),
+        506528478121562763u64 => Some(("DT_TFRobotDestructionLogic", "m_flBlueFinaleEndTime")),
+        8630855110816100811u64 => Some(("DT_TFRobotDestructionLogic", "m_flBlueTeamRespawnScale")),
+        5631486662947798357u64 => Some(("DT_TFRobotDestructionLogic", "m_flCountdownEndTime")),
+        10170855019148588755u64 => Some(("DT_TFRobotDestructionLogic", "m_flFinaleLength")),
+        11511520958397168054u64 => Some(("DT_TFRobotDestructionLogic", "m_flRedFinaleEndTime")),
+        14657347363419301188u64 => Some(("DT_TFRobotDestructionLogic", "m_flRedTeamRespawnScale")),
         3565292228082004016u64 => Some(("DT_TFRobotDestructionLogic", "m_nBlueScore")),
-        1395860945333357306u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_nBlueTargetPoints"))
-        }
+        1395860945333357306u64 => Some(("DT_TFRobotDestructionLogic", "m_nBlueTargetPoints")),
         13389409819629425385u64 => Some(("DT_TFRobotDestructionLogic", "m_nMaxPoints")),
         869770776688375497u64 => Some(("DT_TFRobotDestructionLogic", "m_nRedScore")),
-        15904034070044032921u64 => {
-            Some(("DT_TFRobotDestructionLogic", "m_nRedTargetPoints"))
-        }
+        15904034070044032921u64 => Some(("DT_TFRobotDestructionLogic", "m_nRedTargetPoints")),
         2755343747665576427u64 => Some(("DT_TFRobotDestructionLogic", "m_szResFile")),
         2201527720632819052u64 => Some(("DT_TFRobotDestruction_Robot", "baseclass")),
         7705455076013337908u64 => Some(("DT_TFRobotDestruction_Robot", "m_eType")),
@@ -2201,20 +1815,14 @@ pub fn get_prop_names(
         9802884593882878670u64 => {
             Some(("DT_TFRobotDestruction_RobotGroup", "m_flLastAttackedTime"))
         }
-        9281803239523811882u64 => {
-            Some(("DT_TFRobotDestruction_RobotGroup", "m_flRespawnEndTime"))
-        }
+        9281803239523811882u64 => Some(("DT_TFRobotDestruction_RobotGroup", "m_flRespawnEndTime")),
         13465781202845365165u64 => {
             Some(("DT_TFRobotDestruction_RobotGroup", "m_flRespawnStartTime"))
         }
         829484812022296518u64 => Some(("DT_TFRobotDestruction_RobotGroup", "m_iTeamNum")),
-        1145437368572679092u64 => {
-            Some(("DT_TFRobotDestruction_RobotGroup", "m_nGroupNumber"))
-        }
+        1145437368572679092u64 => Some(("DT_TFRobotDestruction_RobotGroup", "m_nGroupNumber")),
         13178000760587000109u64 => Some(("DT_TFRobotDestruction_RobotGroup", "m_nState")),
-        11557301641532402157u64 => {
-            Some(("DT_TFRobotDestruction_RobotGroup", "m_pszHudIcon"))
-        }
+        11557301641532402157u64 => Some(("DT_TFRobotDestruction_RobotGroup", "m_pszHudIcon")),
         13871980323154206106u64 => Some(("DT_TFSMG", "baseclass")),
         1978713319633702385u64 => Some(("DT_TFScatterGun", "baseclass")),
         793901454180408765u64 => Some(("DT_TFSendHealersDataTable", "m_nActiveWpnClip")),
@@ -2244,9 +1852,7 @@ pub fn get_prop_names(
         238952999266517002u64 => Some(("DT_TFWeaponBase", "m_bBeingRepurposedForTaunt")),
         7341739013090182216u64 => Some(("DT_TFWeaponBase", "m_bDisguiseWeapon")),
         12299830798386868253u64 => Some(("DT_TFWeaponBase", "m_bLowered")),
-        10393353798185679505u64 => {
-            Some(("DT_TFWeaponBase", "m_bReloadedThroughAnimEvent"))
-        }
+        10393353798185679505u64 => Some(("DT_TFWeaponBase", "m_bReloadedThroughAnimEvent")),
         9746418183918285979u64 => Some(("DT_TFWeaponBase", "m_bResetParity")),
         7703029780449879205u64 => Some(("DT_TFWeaponBase", "m_flEnergy")),
         2524252340529910052u64 => Some(("DT_TFWeaponBase", "m_flInspectAnimEndTime")),
@@ -2260,13 +1866,9 @@ pub fn get_prop_names(
         1877908459972235479u64 => Some(("DT_TFWeaponBaseGrenadeProj", "baseclass")),
         2466846292560825136u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_angRotation")),
         18129208258165246287u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_bCritical")),
-        14816665825169615596u64 => {
-            Some(("DT_TFWeaponBaseGrenadeProj", "m_hDeflectOwner"))
-        }
+        14816665825169615596u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_hDeflectOwner")),
         15910156225133181161u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_iDeflected")),
-        16030785045297919863u64 => {
-            Some(("DT_TFWeaponBaseGrenadeProj", "m_vInitialVelocity"))
-        }
+        16030785045297919863u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_vInitialVelocity")),
         7201706417639549802u64 => Some(("DT_TFWeaponBaseGrenadeProj", "m_vecOrigin")),
         15153146917426415418u64 => Some(("DT_TFWeaponBaseGun", "baseclass")),
         4284095325278254512u64 => Some(("DT_TFWeaponBaseMelee", "baseclass")),
@@ -2283,9 +1885,7 @@ pub fn get_prop_names(
         6911360958986844267u64 => Some(("DT_TFWeaponBuffItem", "baseclass")),
         5916096045553985727u64 => Some(("DT_TFWeaponBuilder", "BuilderLocalData")),
         8840995701055450580u64 => Some(("DT_TFWeaponBuilder", "baseclass")),
-        16018273266360131492u64 => {
-            Some(("DT_TFWeaponBuilder", "m_flWheatleyTalkingUntil"))
-        }
+        16018273266360131492u64 => Some(("DT_TFWeaponBuilder", "m_flWheatleyTalkingUntil")),
         18297629592260019187u64 => Some(("DT_TFWeaponBuilder", "m_iBuildState")),
         13703834646564863544u64 => Some(("DT_TFWeaponBuilder", "m_iObjectMode")),
         11272366756849564851u64 => Some(("DT_TFWeaponCleaver", "baseclass")),
@@ -2302,17 +1902,11 @@ pub fn get_prop_names(
         15248262520233306394u64 => Some(("DT_TFWeaponKnife", "m_bKnifeExists")),
         1290621820141012070u64 => Some(("DT_TFWeaponKnife", "m_bReadyToBackstab")),
         261816387391465162u64 => Some(("DT_TFWeaponKnife", "m_flKnifeMeltTimestamp")),
-        8348412092415632560u64 => {
-            Some(("DT_TFWeaponKnife", "m_flKnifeRegenerateDuration"))
-        }
-        10680082844746950705u64 => {
-            Some(("DT_TFWeaponMedigunDataNonLocal", "m_flChargeLevel"))
-        }
+        8348412092415632560u64 => Some(("DT_TFWeaponKnife", "m_flKnifeRegenerateDuration")),
+        10680082844746950705u64 => Some(("DT_TFWeaponMedigunDataNonLocal", "m_flChargeLevel")),
         14322443331861418940u64 => Some(("DT_TFWeaponPDA", "baseclass")),
         866198076290749321u64 => Some(("DT_TFWeaponPDAExpansion_Dispenser", "baseclass")),
-        10550287788295773126u64 => {
-            Some(("DT_TFWeaponPDAExpansion_Teleporter", "baseclass"))
-        }
+        10550287788295773126u64 => Some(("DT_TFWeaponPDAExpansion_Teleporter", "baseclass")),
         14912089340891657015u64 => Some(("DT_TFWeaponPDA_Engineer_Build", "baseclass")),
         15192163711255752217u64 => Some(("DT_TFWeaponPDA_Engineer_Destroy", "baseclass")),
         155424477105195551u64 => Some(("DT_TFWeaponPDA_Spy", "baseclass")),
@@ -2332,9 +1926,7 @@ pub fn get_prop_names(
         8247423999282715316u64 => Some(("DT_TFWeaponSpellBook", "baseclass")),
         1355120005829625559u64 => Some(("DT_TFWeaponSpellBook", "m_bFiredAttack")),
         11938777711593683949u64 => Some(("DT_TFWeaponSpellBook", "m_flTimeNextSpell")),
-        15739619913096587929u64 => {
-            Some(("DT_TFWeaponSpellBook", "m_iSelectedSpellIndex"))
-        }
+        15739619913096587929u64 => Some(("DT_TFWeaponSpellBook", "m_iSelectedSpellIndex")),
         6228803539782541901u64 => Some(("DT_TFWeaponSpellBook", "m_iSpellCharges")),
         7042779919315246121u64 => Some(("DT_TFWeaponStickBomb", "baseclass")),
         16682550675401826609u64 => Some(("DT_TFWeaponStickBomb", "m_iDetonated")),
@@ -2381,53 +1973,34 @@ pub fn get_prop_names(
         1183813146715819129u64 => Some(("DT_TeamTrainWatcher", "m_hGlowEnt")),
         18065443311897023007u64 => Some(("DT_TeamTrainWatcher", "m_iTrainSpeedLevel")),
         17337167978138758609u64 => Some(("DT_TeamTrainWatcher", "m_nNumCappers")),
-        3769044050020656199u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_TeamRespawnWaveTimes"))
-        }
-        1840601812648433533u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_bAwaitingReadyRestart"))
-        }
+        3769044050020656199u64 => Some(("DT_TeamplayRoundBasedRules", "m_TeamRespawnWaveTimes")),
+        1840601812648433533u64 => Some(("DT_TeamplayRoundBasedRules", "m_bAwaitingReadyRestart")),
         17472021955271892919u64 => {
             Some(("DT_TeamplayRoundBasedRules", "m_bCheatsEnabledDuringLevel"))
         }
         7697033308867870453u64 => Some(("DT_TeamplayRoundBasedRules", "m_bInOvertime")),
         8951057560776888337u64 => Some(("DT_TeamplayRoundBasedRules", "m_bInSetup")),
-        3634063335773859450u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_bInWaitingForPlayers"))
-        }
-        568390723081368564u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_bMultipleTrains"))
-        }
+        3634063335773859450u64 => Some(("DT_TeamplayRoundBasedRules", "m_bInWaitingForPlayers")),
+        568390723081368564u64 => Some(("DT_TeamplayRoundBasedRules", "m_bMultipleTrains")),
         9158469900010144837u64 => Some(("DT_TeamplayRoundBasedRules", "m_bPlayerReady")),
         9126896830518175752u64 => Some(("DT_TeamplayRoundBasedRules", "m_bStopWatch")),
         17505861364436260012u64 => {
             Some(("DT_TeamplayRoundBasedRules", "m_bSwitchedTeamsThisRound"))
         }
         13102233919763610425u64 => Some(("DT_TeamplayRoundBasedRules", "m_bTeamReady")),
-        11520242942379493867u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_flCountdownTime"))
-        }
-        12551706823833948281u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_flMapResetTime"))
-        }
-        8834130812020299059u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_flNextRespawnWave"))
-        }
-        3638667356767018345u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_flRestartRoundTime"))
-        }
-        12570022626856076296u64 => {
-            Some(("DT_TeamplayRoundBasedRules", "m_flStateTransitionTime"))
-        }
+        11520242942379493867u64 => Some(("DT_TeamplayRoundBasedRules", "m_flCountdownTime")),
+        12551706823833948281u64 => Some(("DT_TeamplayRoundBasedRules", "m_flMapResetTime")),
+        8834130812020299059u64 => Some(("DT_TeamplayRoundBasedRules", "m_flNextRespawnWave")),
+        3638667356767018345u64 => Some(("DT_TeamplayRoundBasedRules", "m_flRestartRoundTime")),
+        12570022626856076296u64 => Some(("DT_TeamplayRoundBasedRules", "m_flStateTransitionTime")),
         14894834847121989153u64 => Some(("DT_TeamplayRoundBasedRules", "m_iRoundState")),
         12323048553518703167u64 => Some(("DT_TeamplayRoundBasedRules", "m_iWinningTeam")),
         7688690215610714435u64 => Some(("DT_TeamplayRoundBasedRules", "m_nRoundsPlayed")),
         3909918602834404432u64 => Some(("DT_TeamplayRoundBasedRulesProxy", "baseclass")),
-        12675478000229394536u64 => {
-            Some(
-                ("DT_TeamplayRoundBasedRulesProxy", "teamplayroundbased_gamerules_data"),
-            )
-        }
+        12675478000229394536u64 => Some((
+            "DT_TeamplayRoundBasedRulesProxy",
+            "teamplayroundbased_gamerules_data",
+        )),
         16789549748701517246u64 => Some(("DT_TeleportVortex", "baseclass")),
         1585779299108791655u64 => Some(("DT_TeleportVortex", "m_iState")),
         10414639220533856150u64 => Some(("DT_Tesla", "baseclass")),
@@ -2465,12 +2038,8 @@ pub fn get_prop_names(
         12734808021541887372u64 => Some(("DT_WORLD", "m_flWaveHeight")),
         171538238674988579u64 => Some(("DT_WORLD", "m_iszDetailSpriteMaterial")),
         17280899839930290558u64 => Some(("DT_WaterBullet", "baseclass")),
-        9589936884534067881u64 => {
-            Some(("DT_WaterLODControl", "m_flCheapWaterEndDistance"))
-        }
-        9947121641112050854u64 => {
-            Some(("DT_WaterLODControl", "m_flCheapWaterStartDistance"))
-        }
+        9589936884534067881u64 => Some(("DT_WaterLODControl", "m_flCheapWaterEndDistance")),
+        9947121641112050854u64 => Some(("DT_WaterLODControl", "m_flCheapWaterStartDistance")),
         5249608886909110228u64 => Some(("DT_WeaponChargedSMG", "baseclass")),
         1743123092148919758u64 => Some(("DT_WeaponChargedSMG", "m_flMinicritCharge")),
         2197198122745307194u64 => Some(("DT_WeaponCompoundBow", "baseclass")),
@@ -2479,9 +2048,7 @@ pub fn get_prop_names(
         4861873545713552938u64 => Some(("DT_WeaponDRGPomson", "baseclass")),
         9630823746847383925u64 => Some(("DT_WeaponFlameBall", "baseclass")),
         8369367647103916745u64 => Some(("DT_WeaponFlameBall", "m_flRechargeScale")),
-        17352185945850447107u64 => {
-            Some(("DT_WeaponFlameThrower", "LocalFlameThrowerData"))
-        }
+        17352185945850447107u64 => Some(("DT_WeaponFlameThrower", "LocalFlameThrowerData")),
         18383866324137430829u64 => Some(("DT_WeaponFlameThrower", "baseclass")),
         3776490372795891802u64 => Some(("DT_WeaponFlameThrower", "m_bCritFire")),
         6261685785015862540u64 => Some(("DT_WeaponFlameThrower", "m_bHitTarget")),
@@ -2490,9 +2057,7 @@ pub fn get_prop_names(
         10564768266751156041u64 => Some(("DT_WeaponFlareGun", "baseclass")),
         17877192080530687310u64 => Some(("DT_WeaponFlareGun", "m_flChargeBeginTime")),
         12115275093436982466u64 => Some(("DT_WeaponFlareGun_Revenge", "baseclass")),
-        14016443750437486906u64 => {
-            Some(("DT_WeaponFlareGun_Revenge", "m_fLastExtinguishTime"))
-        }
+        14016443750437486906u64 => Some(("DT_WeaponFlareGun_Revenge", "m_fLastExtinguishTime")),
         15016924890826864049u64 => Some(("DT_WeaponGrenadeLauncher", "baseclass")),
         1700651623293842179u64 => Some(("DT_WeaponGrenadeLauncher", "m_flDetonateTime")),
         4570970399831902168u64 => Some(("DT_WeaponGrenadeLauncher", "m_iCurrentTube")),
@@ -2501,18 +2066,14 @@ pub fn get_prop_names(
         13014581304645777871u64 => Some(("DT_WeaponIFMBaseCamera", "baseclass")),
         9069779483228148426u64 => Some(("DT_WeaponIFMBaseCamera", "m_angRenderAngles")),
         2439309287405946914u64 => Some(("DT_WeaponIFMBaseCamera", "m_flRenderArmLength")),
-        5258692580598323193u64 => {
-            Some(("DT_WeaponIFMBaseCamera", "m_flRenderAspectRatio"))
-        }
+        5258692580598323193u64 => Some(("DT_WeaponIFMBaseCamera", "m_flRenderAspectRatio")),
         10124480453973277717u64 => Some(("DT_WeaponIFMBaseCamera", "m_flRenderFOV")),
         9154514883778471157u64 => Some(("DT_WeaponIFMBaseCamera", "m_vecRenderPosition")),
         17315982218331265186u64 => Some(("DT_WeaponIFMSteadyCam", "baseclass")),
         17557645954865645428u64 => Some(("DT_WeaponLunchBox", "baseclass")),
         1836879092463416116u64 => Some(("DT_WeaponLunchBox", "m_bBroken")),
         18050229696589327727u64 => Some(("DT_WeaponMedigun", "LocalTFWeaponMedigunData")),
-        17905087994580451662u64 => {
-            Some(("DT_WeaponMedigun", "NonLocalTFWeaponMedigunData"))
-        }
+        17905087994580451662u64 => Some(("DT_WeaponMedigun", "NonLocalTFWeaponMedigunData")),
         7839557282419475896u64 => Some(("DT_WeaponMedigun", "baseclass")),
         10597824636109764371u64 => Some(("DT_WeaponMedigun", "m_bAttacking")),
         5079259778519160016u64 => Some(("DT_WeaponMedigun", "m_bChargeRelease")),
@@ -2524,9 +2085,7 @@ pub fn get_prop_names(
         8469331909856512570u64 => Some(("DT_WeaponMinigun", "baseclass")),
         16228268275425358053u64 => Some(("DT_WeaponMinigun", "m_bCritShot")),
         3814692596291380319u64 => Some(("DT_WeaponMinigun", "m_iWeaponState")),
-        2751213190836236879u64 => {
-            Some(("DT_WeaponPipebombLauncher", "PipebombLauncherLocalData"))
-        }
+        2751213190836236879u64 => Some(("DT_WeaponPipebombLauncher", "PipebombLauncherLocalData")),
         17384155663803683951u64 => Some(("DT_WeaponPipebombLauncher", "baseclass")),
         1667950891985876038u64 => Some(("DT_WeaponPistol", "baseclass")),
         6104910371144863853u64 => Some(("DT_WeaponPistol_Scout", "baseclass")),
@@ -2536,12 +2095,8 @@ pub fn get_prop_names(
         12777409271429993909u64 => Some(("DT_WeaponRaygun", "m_bUseNewProjectileCode")),
         8290738880515933250u64 => Some(("DT_WeaponRevolver", "baseclass")),
         2350834459646160183u64 => Some(("DT_WeaponRocketLauncher", "baseclass")),
-        6500154596923033956u64 => {
-            Some(("DT_WeaponRocketLauncher_AirStrike", "baseclass"))
-        }
-        12312353368644989384u64 => {
-            Some(("DT_WeaponRocketLauncher_DirectHit", "baseclass"))
-        }
+        6500154596923033956u64 => Some(("DT_WeaponRocketLauncher_AirStrike", "baseclass")),
+        12312353368644989384u64 => Some(("DT_WeaponRocketLauncher_DirectHit", "baseclass")),
         1487046910738861119u64 => Some(("DT_WeaponRocketLauncher_Mortar", "baseclass")),
         15134921543580708068u64 => Some(("DT_WeaponSyringeGun", "baseclass")),
         16527650451819869423u64 => Some(("DT_WearableItem", "baseclass")),
@@ -7203,4 +6758,3 @@ pub fn get_prop_names(
         _ => None,
     }
 }
-
diff --git a/src/demo/vector.rs b/src/demo/vector.rs
index 53c0bb1..859e8d6 100644
--- a/src/demo/vector.rs
+++ b/src/demo/vector.rs
@@ -1,7 +1,7 @@
-use std::ops::{Add, Sub};
 use bitbuffer::{BitRead, BitWrite};
 use parse_display::Display;
 use serde::{Deserialize, Serialize};
+use std::ops::{Add, Sub};
 
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(BitRead, BitWrite, Debug, Clone, Copy, Default, Serialize, Deserialize, Display)]