chore: generalize IAssetDumper interface

2026-02-14 19:33:02 +00:00 · 2025-10-15 20:06:01 +01:00
parent c6e9cbedda
commit 6a84d1ea68
152 changed files with 1051 additions and 586 deletions
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp
@@ -133,7 +133,12 @@ namespace

 namespace font_icon
 {
-    void CsvDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<FontIcon>& asset)
+    CsvDumperT6::CsvDumperT6(const AssetPool<AssetFontIcon::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void CsvDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetFontIcon::Type>& asset)
    {
        const auto assetFile = context.OpenAssetFile(asset.m_name);

--- a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
@@ -5,9 +5,12 @@

 namespace font_icon
 {
-    class CsvDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
+    class CsvDumperT6 final : public AbstractAssetDumper<T6::AssetFontIcon>
    {
+    public:
+        explicit CsvDumperT6(const AssetPool<T6::AssetFontIcon::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::FontIcon>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetFontIcon::Type>& asset) override;
    };
 } // namespace font_icon
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.cpp
@@ -9,12 +9,12 @@ using namespace T6;

 namespace font_icon
 {
-    std::unique_ptr<IAssetDumper<FontIcon>> CreateDumperT6()
+    std::unique_ptr<IAssetDumper> CreateDumperT6(const AssetPool<AssetFontIcon::Type>& pool)
    {
 #ifdef DUMP_FONT_ICON_AS_CSV
-        return std::make_unique<CsvDumperT6>();
+        return std::make_unique<CsvDumperT6>(pool);
 #else
-        return std::make_unique<JsonDumperT6>();
+        return std::make_unique<JsonDumperT6>(pool);
 #endif
    }
 } // namespace font_icon
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.h
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.h
@@ -7,5 +7,5 @@

 namespace font_icon
 {
-    std::unique_ptr<IAssetDumper<T6::FontIcon>> CreateDumperT6();
+    std::unique_ptr<IAssetDumper> CreateDumperT6(const AssetPool<T6::AssetFontIcon::Type>& pool);
 } // namespace font_icon
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
@@ -78,7 +78,12 @@ namespace

 namespace font_icon
 {
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<FontIcon>& asset)
+    JsonDumperT6::JsonDumperT6(const AssetPool<AssetFontIcon::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetFontIcon::Type>& asset)
    {
        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset.m_name));

--- a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
@@ -5,9 +5,12 @@

 namespace font_icon
 {
-    class JsonDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
+    class JsonDumperT6 final : public AbstractAssetDumper<T6::AssetFontIcon>
    {
+    public:
+        explicit JsonDumperT6(const AssetPool<T6::AssetFontIcon::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::FontIcon>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetFontIcon::Type>& asset) override;
    };
 } // namespace font_icon
--- a/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
@@ -77,7 +77,8 @@ namespace

 namespace image
 {
-    DumperT6::DumperT6()
+    DumperT6::DumperT6(const AssetPool<AssetImage::Type>& pool)
+        : AbstractAssetDumper(pool)
    {
        switch (ObjWriting::Configuration.ImageOutputFormat)
        {
@@ -94,7 +95,7 @@ namespace image
        }
    }

-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetImage::Type>& asset)
    {
        const auto* image = asset.Asset();
        const auto texture = LoadImageData(context.m_obj_search_path, *image);
--- a/src/ObjWriting/Game/T6/Image/ImageDumperT6.h
+++ b/src/ObjWriting/Game/T6/Image/ImageDumperT6.h
@@ -8,13 +8,13 @@

 namespace image
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::GfxImage>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetImage>
    {
    public:
-        DumperT6();
+        explicit DumperT6(const AssetPool<T6::AssetImage::Type>& pool);

    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::GfxImage>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetImage::Type>& asset) override;

    private:
        std::unique_ptr<IImageWriter> m_writer;
--- a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
@@ -98,7 +98,12 @@ namespace

 namespace leaderboard
 {
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LeaderboardDef>& asset)
+    JsonDumperT6::JsonDumperT6(const AssetPool<AssetLeaderboard::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetLeaderboard::Type>& asset)
    {
        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset.m_name));

--- a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
@@ -5,9 +5,12 @@

 namespace leaderboard
 {
-    class JsonDumperT6 final : public AbstractAssetDumper<T6::LeaderboardDef>
+    class JsonDumperT6 final : public AbstractAssetDumper<T6::AssetLeaderboard>
    {
+    public:
+        explicit JsonDumperT6(const AssetPool<T6::AssetLeaderboard::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::LeaderboardDef>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetLeaderboard::Type>& asset) override;
    };
 } // namespace leaderboard
--- a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
@@ -11,14 +11,14 @@ using namespace T6;

 namespace localize
 {
-    size_t DumperT6::GetProgressTotalCount(const AssetPool<T6::LocalizeEntry>& pool) const
+    DumperT6::DumperT6(const AssetPool<AssetLocalize::Type>& pool)
+        : AbstractSingleProgressAssetDumper(pool)
    {
-        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
    }

-    void DumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    void DumperT6::Dump(AssetDumpingContext& context)
    {
-        if (pool.m_asset_lookup.empty())
+        if (m_pool.m_asset_lookup.empty())
            return;

        const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -35,7 +35,7 @@ namespace localize

            stringFileDumper.SetNotes("");

-            for (const auto* localizeEntry : pool)
+            for (const auto* localizeEntry : m_pool)
            {
                stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
            }
--- a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
+++ b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
@@ -5,10 +5,11 @@

 namespace localize
 {
-    class DumperT6 final : public IAssetDumper<T6::LocalizeEntry>
+    class DumperT6 final : public AbstractSingleProgressAssetDumper<T6::AssetLocalize>
    {
    public:
-        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::LocalizeEntry>& pool) const override;
-        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::LocalizeEntry>& pool) override;
+        explicit DumperT6(const AssetPool<T6::AssetLocalize::Type>& pool);
+
+        void Dump(AssetDumpingContext& context) override;
    };
 } // namespace localize
--- a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
@@ -6,7 +6,12 @@ using namespace T6;

 namespace map_ents
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MapEnts>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetMapEnts::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetMapEnts::Type>& asset)
    {
        const auto* mapEnts = asset.Asset();

--- a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
+++ b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
@@ -5,9 +5,12 @@

 namespace map_ents
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::MapEnts>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetMapEnts>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetMapEnts::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::MapEnts>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetMapEnts::Type>& asset) override;
    };
 } // namespace map_ents
--- a/src/ObjWriting/Game/T6/ObjWriterT6.cpp
+++ b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
@@ -27,96 +27,88 @@
 #include "Weapon/WeaponDumperT6.h"
 #include "ZBarrier/ZBarrierDumperT6.h"

-#include <functional>
-
 using namespace T6;

 bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
-#define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
-    if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
+#define REGISTER_DUMPER(dumperType, poolName)                                                                                                                  \
+    if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(dumperType::AssetType_t::EnumEntry))                                                         \
    {                                                                                                                                                          \
-        dumperType dumper;                                                                                                                                     \
-        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
-        dumpingFunctions.emplace_back(                                                                                                                         \
-            [](AssetDumpingContext& funcContext, const GameAssetPoolT6* funcPools)                                                                             \
-            {                                                                                                                                                  \
-                dumperType dumper;                                                                                                                             \
-                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
-            });                                                                                                                                                \
+        dumpers.emplace_back(std::make_unique<dumperType>(*assetPools->poolName));                                                                             \
    }
-#define DUMP_ASSET_POOL_WITH_FACTORY(createDumper, poolName, assetType)                                                                                        \
-    if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
+#define REGISTER_DUMPER_WITH_FACTORY(createDumper, poolName, asset)                                                                                            \
+    if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(asset::EnumEntry))                                                                           \
    {                                                                                                                                                          \
-        auto dumper = createDumper;                                                                                                                            \
-        totalProgress += dumper->GetProgressTotalCount(*assetPools->poolName);                                                                                 \
-        dumpingFunctions.emplace_back(                                                                                                                         \
-            [](AssetDumpingContext& funcContext, const GameAssetPoolT6* funcPools)                                                                             \
-            {                                                                                                                                                  \
-                auto dumper = createDumper;                                                                                                                    \
-                dumper->DumpPool(funcContext, *funcPools->poolName);                                                                                           \
-            });                                                                                                                                                \
+        auto dumper = createDumper(*assetPools->poolName);                                                                                                     \
+        if (dumper)                                                                                                                                            \
+            dumpers.emplace_back(std::move(dumper));                                                                                                           \
    }

    const auto* assetPools = dynamic_cast<GameAssetPoolT6*>(context.m_zone.m_pools.get());
+    std::vector<std::unique_ptr<IAssetDumper>> dumpers;

-    size_t totalProgress = 0uz;
-    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolT6*)>> dumpingFunctions;
+    REGISTER_DUMPER(phys_preset::InfoStringDumperT6, m_phys_preset)
+    REGISTER_DUMPER(phys_constraints::InfoStringDumperT6, m_phys_constraints)
+    // REGISTER_DUMPER(AssetDumperDestructibleDef, m_destructible_def)
+    // REGISTER_DUMPER(AssetDumperXAnimParts, m_xanim_parts)
+    REGISTER_DUMPER(xmodel::DumperT6, m_xmodel)
+    REGISTER_DUMPER(material::JsonDumperT6, m_material)
+    REGISTER_DUMPER(techset::DumperT6, m_technique_set)
+    REGISTER_DUMPER(image::DumperT6, m_image)
+    REGISTER_DUMPER(sound::SndBankDumperT6, m_sound_bank)
+    // REGISTER_DUMPER(AssetDumperSndPatch, m_sound_patch)
+    // REGISTER_DUMPER(AssetDumperClipMap, m_clip_map)
+    // REGISTER_DUMPER(AssetDumperComWorld, m_com_world)
+    // REGISTER_DUMPER(AssetDumperGameWorldSp, m_game_world_sp)
+    // REGISTER_DUMPER(AssetDumperGameWorldMp, m_game_world_mp)
+    REGISTER_DUMPER(map_ents::DumperT6, m_map_ents)
+    // REGISTER_DUMPER(AssetDumperGfxWorld, m_gfx_world)
+    // REGISTER_DUMPER(AssetDumperGfxLightDef, m_gfx_light_def)
+    // REGISTER_DUMPER(AssetDumperFont, m_font)
+    REGISTER_DUMPER_WITH_FACTORY(font_icon::CreateDumperT6, m_font_icon, AssetFontIcon)
+    // REGISTER_DUMPER(AssetDumperMenuList, m_menu_list)
+    // REGISTER_DUMPER(AssetDumperMenuDef, m_menu_def)
+    REGISTER_DUMPER(localize::DumperT6, m_localize)
+    REGISTER_DUMPER(weapon::DumperT6, m_weapon)
+    REGISTER_DUMPER(attachment::DumperT6, m_attachment)
+    REGISTER_DUMPER(attachment_unique::DumperT6, m_attachment_unique)
+    REGISTER_DUMPER(camo::JsonDumperT6, m_camo)
+    REGISTER_DUMPER(sound::SndDriverGlobalsDumperT6, m_snd_driver_globals)
+    // REGISTER_DUMPER(AssetDumperFxEffectDef, m_fx)
+    // REGISTER_DUMPER(AssetDumperFxImpactTable, m_fx_impact_table)
+    REGISTER_DUMPER(raw_file::DumperT6, m_raw_file)
+    REGISTER_DUMPER(string_table::DumperT6, m_string_table)
+    REGISTER_DUMPER(leaderboard::JsonDumperT6, m_leaderboard)
+    // REGISTER_DUMPER(AssetDumperXGlobals, m_xglobals)
+    // REGISTER_DUMPER(AssetDumperDDLRoot, m_ddl)
+    // REGISTER_DUMPER(AssetDumperGlasses, m_glasses)
+    // REGISTER_DUMPER(AssetDumperEmblemSet, m_emblem_set)
+    REGISTER_DUMPER(script::DumperT6, m_script)
+    // REGISTER_DUMPER(AssetDumperKeyValuePairs, m_key_value_pairs)
+    REGISTER_DUMPER(vehicle::DumperT6, m_vehicle)
+    // REGISTER_DUMPER(AssetDumperMemoryBlock, m_memory_block)
+    // REGISTER_DUMPER(AssetDumperAddonMapEnts, m_addon_map_ents)
+    REGISTER_DUMPER(tracer::DumperT6, m_tracer)
+    // REGISTER_DUMPER(AssetDumperSkinnedVertsDef, m_skinned_verts)
+    REGISTER_DUMPER(qdb::DumperT6, m_qdb)
+    REGISTER_DUMPER(slug::DumperT6, m_slug)
+    // REGISTER_DUMPER(AssetDumperFootstepTableDef, m_footstep_table)
+    // REGISTER_DUMPER(AssetDumperFootstepFXTableDef, m_footstep_fx_table)
+    REGISTER_DUMPER(z_barrier::DumperT6, m_zbarrier)

-    DUMP_ASSET_POOL(phys_preset::InfoStringDumperT6, m_phys_preset, ASSET_TYPE_PHYSPRESET)
-    DUMP_ASSET_POOL(phys_constraints::InfoStringDumperT6, m_phys_constraints, ASSET_TYPE_PHYSCONSTRAINTS)
-    // DUMP_ASSET_POOL(AssetDumperDestructibleDef, m_destructible_def, ASSET_TYPE_DESTRUCTIBLEDEF)
-    // DUMP_ASSET_POOL(AssetDumperXAnimParts, m_xanim_parts, ASSET_TYPE_XANIMPARTS)
-    DUMP_ASSET_POOL(xmodel::DumperT6, m_xmodel, ASSET_TYPE_XMODEL)
-    DUMP_ASSET_POOL(material::JsonDumperT6, m_material, ASSET_TYPE_MATERIAL)
-    DUMP_ASSET_POOL(techset::DumperT6, m_technique_set, ASSET_TYPE_TECHNIQUE_SET)
-    DUMP_ASSET_POOL(image::DumperT6, m_image, ASSET_TYPE_IMAGE)
-    DUMP_ASSET_POOL(sound::SndBankDumperT6, m_sound_bank, ASSET_TYPE_SOUND)
-    // DUMP_ASSET_POOL(AssetDumperSndPatch, m_sound_patch, ASSET_TYPE_SOUND_PATCH)
-    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_PVS)
-    // DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
-    // DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
-    // DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)
-    DUMP_ASSET_POOL(map_ents::DumperT6, m_map_ents, ASSET_TYPE_MAP_ENTS)
-    // DUMP_ASSET_POOL(AssetDumperGfxWorld, m_gfx_world, ASSET_TYPE_GFXWORLD)
-    // DUMP_ASSET_POOL(AssetDumperGfxLightDef, m_gfx_light_def, ASSET_TYPE_LIGHT_DEF)
-    // DUMP_ASSET_POOL(AssetDumperFont, m_font, ASSET_TYPE_FONT)
-    DUMP_ASSET_POOL_WITH_FACTORY(font_icon::CreateDumperT6(), m_font_icon, ASSET_TYPE_FONTICON)
-    // DUMP_ASSET_POOL(AssetDumperMenuList, m_menu_list, ASSET_TYPE_MENULIST)
-    // DUMP_ASSET_POOL(AssetDumperMenuDef, m_menu_def, ASSET_TYPE_MENU)
-    DUMP_ASSET_POOL(localize::DumperT6, m_localize, ASSET_TYPE_LOCALIZE_ENTRY)
-    DUMP_ASSET_POOL(weapon::DumperT6, m_weapon, ASSET_TYPE_WEAPON)
-    DUMP_ASSET_POOL(attachment::DumperT6, m_attachment, ASSET_TYPE_ATTACHMENT)
-    DUMP_ASSET_POOL(attachment_unique::DumperT6, m_attachment_unique, ASSET_TYPE_ATTACHMENT_UNIQUE)
-    DUMP_ASSET_POOL(camo::JsonDumperT6, m_camo, ASSET_TYPE_WEAPON_CAMO)
-    DUMP_ASSET_POOL(sound::SndDriverGlobalsDumperT6, m_snd_driver_globals, ASSET_TYPE_SNDDRIVER_GLOBALS)
-    // DUMP_ASSET_POOL(AssetDumperFxEffectDef, m_fx, ASSET_TYPE_FX)
-    // DUMP_ASSET_POOL(AssetDumperFxImpactTable, m_fx_impact_table, ASSET_TYPE_IMPACT_FX)
-    DUMP_ASSET_POOL(raw_file::DumperT6, m_raw_file, ASSET_TYPE_RAWFILE)
-    DUMP_ASSET_POOL(string_table::DumperT6, m_string_table, ASSET_TYPE_STRINGTABLE)
-    DUMP_ASSET_POOL(leaderboard::JsonDumperT6, m_leaderboard, ASSET_TYPE_LEADERBOARD)
-    // DUMP_ASSET_POOL(AssetDumperXGlobals, m_xglobals, ASSET_TYPE_XGLOBALS)
-    // DUMP_ASSET_POOL(AssetDumperDDLRoot, m_ddl, ASSET_TYPE_DDL)
-    // DUMP_ASSET_POOL(AssetDumperGlasses, m_glasses, ASSET_TYPE_GLASSES)
-    // DUMP_ASSET_POOL(AssetDumperEmblemSet, m_emblem_set, ASSET_TYPE_EMBLEMSET)
-    DUMP_ASSET_POOL(script::DumperT6, m_script, ASSET_TYPE_SCRIPTPARSETREE)
-    // DUMP_ASSET_POOL(AssetDumperKeyValuePairs, m_key_value_pairs, ASSET_TYPE_KEYVALUEPAIRS)
-    DUMP_ASSET_POOL(vehicle::DumperT6, m_vehicle, ASSET_TYPE_VEHICLEDEF)
-    // DUMP_ASSET_POOL(AssetDumperMemoryBlock, m_memory_block, ASSET_TYPE_MEMORYBLOCK)
-    // DUMP_ASSET_POOL(AssetDumperAddonMapEnts, m_addon_map_ents, ASSET_TYPE_ADDON_MAP_ENTS)
-    DUMP_ASSET_POOL(tracer::DumperT6, m_tracer, ASSET_TYPE_TRACER)
-    // DUMP_ASSET_POOL(AssetDumperSkinnedVertsDef, m_skinned_verts, ASSET_TYPE_SKINNEDVERTS)
-    DUMP_ASSET_POOL(qdb::DumperT6, m_qdb, ASSET_TYPE_QDB)
-    DUMP_ASSET_POOL(slug::DumperT6, m_slug, ASSET_TYPE_SLUG)
-    // DUMP_ASSET_POOL(AssetDumperFootstepTableDef, m_footstep_table, ASSET_TYPE_FOOTSTEP_TABLE)
-    // DUMP_ASSET_POOL(AssetDumperFootstepFXTableDef, m_footstep_fx_table, ASSET_TYPE_FOOTSTEPFX_TABLE)
-    DUMP_ASSET_POOL(z_barrier::DumperT6, m_zbarrier, ASSET_TYPE_ZBARRIER)
+    if (context.ShouldTrackProgress())
+    {
+        size_t totalProgress = 0uz;
+        for (const auto& dumper : dumpers)
+            totalProgress += dumper->GetProgressTotalCount();

-    context.SetTotalProgress(totalProgress);
-    for (const auto& func : dumpingFunctions)
-        func(context, assetPools);
+        context.SetTotalProgress(totalProgress);
+    }
+
+    for (const auto& dumper : dumpers)
+        dumper->Dump(context);

    return true;

-#undef DUMP_ASSET_POOL
+#undef REGISTER_DUMPER
 }
--- a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
@@ -61,7 +61,12 @@ namespace

 namespace phys_constraints
 {
-    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysConstraints>& asset)
+    InfoStringDumperT6::InfoStringDumperT6(const AssetPool<AssetPhysConstraints::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetPhysConstraints::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
+++ b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace phys_constraints
 {
-    class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysConstraints>
+    class InfoStringDumperT6 final : public AbstractAssetDumper<T6::AssetPhysConstraints>
    {
+    public:
+        explicit InfoStringDumperT6(const AssetPool<T6::AssetPhysConstraints::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::PhysConstraints>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetPhysConstraints::Type>& asset) override;
    };
 } // namespace phys_constraints
--- a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
@@ -82,7 +82,12 @@ namespace

 namespace phys_preset
 {
-    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysPreset>& asset)
+    InfoStringDumperT6::InfoStringDumperT6(const AssetPool<AssetPhysPreset::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetPhysPreset::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
+++ b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace phys_preset
 {
-    class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysPreset>
+    class InfoStringDumperT6 final : public AbstractAssetDumper<T6::AssetPhysPreset>
    {
+    public:
+        explicit InfoStringDumperT6(const AssetPool<T6::AssetPhysPreset::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::PhysPreset>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetPhysPreset::Type>& asset) override;
    };
 } // namespace phys_preset
--- a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
@@ -4,7 +4,12 @@ using namespace T6;

 namespace qdb
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Qdb>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetQdb::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetQdb::Type>& asset)
    {
        const auto* qdb = asset.Asset();
        const auto assetFile = context.OpenAssetFile(asset.m_name);
--- a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
+++ b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
@@ -5,9 +5,12 @@

 namespace qdb
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::Qdb>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetQdb>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetQdb::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::Qdb>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetQdb::Type>& asset) override;
    };
 } // namespace qdb
--- a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
@@ -77,7 +77,12 @@ namespace

 namespace raw_file
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetRawFile::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetRawFile::Type>& asset)
    {
        const auto* rawFile = asset.Asset();
        const auto assetFile = context.OpenAssetFile(asset.m_name);
--- a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
+++ b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
@@ -5,9 +5,12 @@

 namespace raw_file
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::RawFile>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetRawFile>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetRawFile::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::RawFile>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetRawFile::Type>& asset) override;
    };
 } // namespace raw_file
--- a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
@@ -4,7 +4,12 @@ using namespace T6;

 namespace script
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<ScriptParseTree>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetScript::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetScript::Type>& asset)
    {
        const auto* scriptParseTree = asset.Asset();
        const auto assetFile = context.OpenAssetFile(asset.m_name);
--- a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
+++ b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
@@ -5,9 +5,12 @@

 namespace script
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::ScriptParseTree>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetScript>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetScript::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::ScriptParseTree>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetScript::Type>& asset) override;
    };
 } // namespace script
--- a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
@@ -4,7 +4,12 @@ using namespace T6;

 namespace slug
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Slug>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetSlug::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetSlug::Type>& asset)
    {
        const auto* slug = asset.Asset();
        const auto assetFile = context.OpenAssetFile(asset.m_name);
--- a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
+++ b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
@@ -5,9 +5,12 @@

 namespace slug
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::Slug>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetSlug>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetSlug::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::Slug>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetSlug::Type>& asset) override;
    };
 } // namespace slug
--- a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
@@ -198,7 +198,7 @@ namespace

    constexpr auto FORMATTING_RETRIES = 5;

-    class LoadedSoundBankHashes
+    class LoadedSoundBankHashes : public IZoneAssetDumperState
    {
    public:
        void Initialize()
@@ -901,36 +901,30 @@ namespace
            *duckFile << duckObj.dump(4) << "\n";
        }
    }
-
-    void DumpSndBank(const AssetDumpingContext& context, const LoadedSoundBankHashes& hashes, const XAssetInfo<SndBank>& sndBankInfo)
-    {
-        const auto* sndBank = sndBankInfo.Asset();
-
-        DumpSndBankAliases(context, hashes, *sndBank);
-        DumpSoundRadverb(context, *sndBank);
-        DumpSoundDucks(context, *sndBank);
-    }
 } // namespace

 namespace sound
 {
-    size_t SndBankDumperT6::GetProgressTotalCount(const AssetPool<SndBank>& pool) const
+    SndBankDumperT6::SndBankDumperT6(const AssetPool<AssetSoundBank::Type>& pool)
+        : AbstractAssetDumper(pool)
    {
-        return pool.m_asset_lookup.size();
    }

-    void SndBankDumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<SndBank>& pool)
+    void SndBankDumperT6::Dump(AssetDumpingContext& context)
    {
-        LoadedSoundBankHashes soundBankHashes;
-        soundBankHashes.Initialize();
-        for (const auto* assetInfo : pool)
-        {
-            if (!assetInfo->m_name.empty() && assetInfo->m_name[0] == ',')
-                continue;
+        auto* hashes = context.GetZoneAssetDumperState<LoadedSoundBankHashes>();
+        hashes->Initialize();

-            DumpSndBank(context, soundBankHashes, *assetInfo);
+        AbstractAssetDumper::Dump(context);
+    }

-            context.IncrementProgress();
-        }
+    void SndBankDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetSoundBank::Type>& asset)
+    {
+        const auto* sndBank = asset.Asset();
+        const auto* hashes = context.GetZoneAssetDumperState<LoadedSoundBankHashes>();
+
+        DumpSndBankAliases(context, *hashes, *sndBank);
+        DumpSoundRadverb(context, *sndBank);
+        DumpSoundDucks(context, *sndBank);
    }
 } // namespace sound
--- a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
+++ b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
@@ -5,10 +5,13 @@

 namespace sound
 {
-    class SndBankDumperT6 final : public IAssetDumper<T6::SndBank>
+    class SndBankDumperT6 final : public AbstractAssetDumper<T6::AssetSoundBank>
    {
    public:
-        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::SndBank>& pool) const override;
-        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::SndBank>& pool) override;
+        explicit SndBankDumperT6(const AssetPool<T6::AssetSoundBank::Type>& pool);
+        void Dump(AssetDumpingContext& context) override;
+
+    protected:
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<Asset<9, T6::SndBank>::Type>& asset) override;
    };
 } // namespace sound
--- a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
@@ -385,15 +385,15 @@ namespace

 namespace sound
 {
-    size_t SndDriverGlobalsDumperT6::GetProgressTotalCount(const AssetPool<T6::SndDriverGlobals>& pool) const
+    SndDriverGlobalsDumperT6::SndDriverGlobalsDumperT6(const AssetPool<AssetSoundDriverGlobals::Type>& pool)
+        : AbstractSingleProgressAssetDumper(pool)
    {
-        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
    }

-    void SndDriverGlobalsDumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<SndDriverGlobals>& pool)
+    void SndDriverGlobalsDumperT6::Dump(AssetDumpingContext& context)
    {
        Internal internal(context);
-        internal.DumpPool(pool);
+        internal.DumpPool(m_pool);

        context.IncrementProgress();
    }
--- a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
+++ b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
@@ -5,10 +5,11 @@

 namespace sound
 {
-    class SndDriverGlobalsDumperT6 final : public IAssetDumper<T6::SndDriverGlobals>
+    class SndDriverGlobalsDumperT6 final : public AbstractSingleProgressAssetDumper<T6::AssetSoundDriverGlobals>
    {
    public:
-        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::SndDriverGlobals>& pool) const override;
-        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::SndDriverGlobals>& pool) override;
+        explicit SndDriverGlobalsDumperT6(const AssetPool<T6::AssetSoundDriverGlobals::Type>& pool);
+
+        void Dump(AssetDumpingContext& context) override;
    };
 } // namespace sound
--- a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
@@ -6,7 +6,12 @@ using namespace T6;

 namespace string_table
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetStringTable::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetStringTable::Type>& asset)
    {
        const auto* stringTable = asset.Asset();
        const auto assetFile = context.OpenAssetFile(asset.m_name);
--- a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
+++ b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
@@ -5,9 +5,12 @@

 namespace string_table
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::StringTable>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetStringTable>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetStringTable::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::StringTable>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetStringTable::Type>& asset) override;
    };
 } // namespace string_table
--- a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
@@ -77,7 +77,12 @@ namespace

 namespace techset
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MaterialTechniqueSet>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetTechniqueSet::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetTechniqueSet::Type>& asset)
    {
        const auto* techniqueSet = asset.Asset();
        auto* shaderState = context.GetZoneAssetDumperState<ShaderZoneState>();
--- a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
+++ b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
@@ -5,9 +5,12 @@

 namespace techset
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::MaterialTechniqueSet>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetTechniqueSet>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetTechniqueSet::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::MaterialTechniqueSet>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetTechniqueSet::Type>& asset) override;
    };
 } // namespace techset
--- a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
@@ -60,7 +60,12 @@ namespace

 namespace tracer
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<TracerDef>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetTracer::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetTracer::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
+++ b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace tracer
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::TracerDef>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetTracer>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetTracer::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::TracerDef>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetTracer::Type>& asset) override;
    };
 } // namespace tracer
--- a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
@@ -111,7 +111,12 @@ namespace

 namespace vehicle
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<VehicleDef>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetVehicle::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetVehicle::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
+++ b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace vehicle
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::VehicleDef>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetVehicle>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetVehicle::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::VehicleDef>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetVehicle::Type>& asset) override;
    };
 } // namespace vehicle
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
@@ -67,7 +67,12 @@ namespace

 namespace attachment
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponAttachment>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetAttachment::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetAttachment::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace attachment
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachment>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetAttachment>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetAttachment::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponAttachment>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetAttachment::Type>& asset) override;
    };
 } // namespace attachment
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
@@ -131,7 +131,12 @@ namespace

 namespace attachment_unique
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponAttachmentUnique>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetAttachmentUnique::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetAttachmentUnique::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace attachment_unique
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachmentUnique>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetAttachmentUnique>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetAttachmentUnique::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponAttachmentUnique>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetAttachmentUnique::Type>& asset) override;
    };
 } // namespace attachment_unique
--- a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
@@ -104,7 +104,12 @@ namespace

 namespace camo
 {
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponCamo>& asset)
+    JsonDumperT6::JsonDumperT6(const AssetPool<AssetWeaponCamo::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetWeaponCamo::Type>& asset)
    {
        const auto fileName = GetJsonFileNameForAssetName(asset.m_name);
        const auto assetFile = context.OpenAssetFile(fileName);
--- a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
@@ -5,9 +5,12 @@

 namespace camo
 {
-    class JsonDumperT6 final : public AbstractAssetDumper<T6::WeaponCamo>
+    class JsonDumperT6 final : public AbstractAssetDumper<T6::AssetWeaponCamo>
    {
+    public:
+        explicit JsonDumperT6(const AssetPool<T6::AssetWeaponCamo::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponCamo>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetWeaponCamo::Type>& asset) override;
    };
 } // namespace camo
--- a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
@@ -461,7 +461,12 @@ namespace

 namespace weapon
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponVariantDef>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetWeapon::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetWeapon::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
@@ -5,9 +5,12 @@

 namespace weapon
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::WeaponVariantDef>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetWeapon>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetWeapon::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponVariantDef>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetWeapon::Type>& asset) override;
    };
 } // namespace weapon
--- a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
@@ -50,7 +50,12 @@ namespace

 namespace z_barrier
 {
-    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<ZBarrierDef>& asset)
+    DumperT6::DumperT6(const AssetPool<AssetZBarrier::Type>& pool)
+        : AbstractAssetDumper(pool)
+    {
+    }
+
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AssetZBarrier::Type>& asset)
    {
        // Only dump raw when no gdt available
        if (context.m_gdt)
--- a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
+++ b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
@@ -2,13 +2,15 @@

 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "InfoString/InfoString.h"

 namespace z_barrier
 {
-    class DumperT6 final : public AbstractAssetDumper<T6::ZBarrierDef>
+    class DumperT6 final : public AbstractAssetDumper<T6::AssetZBarrier>
    {
+    public:
+        explicit DumperT6(const AssetPool<T6::AssetZBarrier::Type>& pool);
+
    protected:
-        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::ZBarrierDef>& asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::AssetZBarrier::Type>& asset) override;
    };
 } // namespace z_barrier