feat(data): load XML data palletes, tilesets, brushes, etc.

ImguiMapEditor/Brushes/BrushRegistry.h

@@ -82,6 +82,7 @@ class BrushRegistry {
   void registerBorderTemplate(uint32_t id, BorderBlock border);
   const BorderBlock *getBorderTemplate(uint32_t id) const;
   const BorderItemMetadata *getBorderItemMetadata(uint16_t itemId) const;
+  size_t getBorderTemplateCount() const { return border_templates_.size(); }
 
   /**
    * Clear all brushes from the registry.

ImguiMapEditor/CMakeLists.txt

@@ -437,7 +437,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/stb
     ${Stb_INCLUDE_DIR}
 )
-)
 
 add_executable(BrushSmoke
     ${BRUSH_SMOKE_SOURCES}
@@ -537,10 +536,6 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "${CMAKE_CURRENT_SOURCE_DIR}/clients_templates.json"
         "$<TARGET_FILE_DIR:${PROJECT_NAME}>/data/clients_templates.json"
-    # Copy entire sample_data directory tree (includes tilesets/, creatures/, items/, etc.)
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "${CMAKE_CURRENT_SOURCE_DIR}/sample_data"
-        "$<TARGET_FILE_DIR:${PROJECT_NAME}>/data"
     # Copy shaders
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${CMAKE_CURRENT_SOURCE_DIR}/shaders"
@@ -552,6 +547,19 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMENT "Copying data files..."
 )
 
+# Copy version-specific data directory (guarded — only if it exists)
+set(TME_DATA_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/../data")
+if(EXISTS "${TME_DATA_SOURCE}")
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${TME_DATA_SOURCE}"
+            "$<TARGET_FILE_DIR:${PROJECT_NAME}>/data"
+        COMMENT "Copying version data folders..."
+    )
+else()
+    message(WARNING "Data directory not found at ${TME_DATA_SOURCE} — version-specific data will not be copied to build output")
+endif()
+
 # Installation
 install(TARGETS ${PROJECT_NAME}
     RUNTIME DESTINATION bin

ImguiMapEditor/Domain/ClientVersion.cpp

@@ -12,21 +12,33 @@ ClientVersion::ClientVersion(uint32_t index, uint32_t version, const std::string
 }
 
 std::filesystem::path ClientVersion::getItemMetadataPath() const {
+    // 1. User-provided path from preferences (explicit override)
     if (!custom_items_db_path_.empty()) {
         return custom_items_db_path_;
     }
-    if (client_path_.empty()) {
-        return {};
-    }
-    switch (data_source_) {
-    case ItemDataSource::SRV:
-        return client_path_ / "items.srv";
-    case ItemDataSource::OTB:
-        return client_path_ / "items.otb";
-    case ItemDataSource::DAT:
-    default:
-        return {};
+
+    // 2. Default: data/[dataDirectory]/items.otb (or items.srv)
+    auto data_dir = resolveDataPath();
+    if (!data_dir.empty()) {
+        switch (data_source_) {
+        case ItemDataSource::SRV: {
+            auto srv = data_dir / "items.srv";
+            if (std::filesystem::exists(srv)) return srv;
+            break;
+        }
+        case ItemDataSource::OTB: {
+            auto otb = data_dir / "items.otb";
+            if (std::filesystem::exists(otb)) return otb;
+            break;
+        }
+        case ItemDataSource::DAT:
+        default:
+            break;
+        }
     }
+
+    // 3. No fallback — client_path_ is not used for items.otb
+    return {};
 }
 
 bool ClientVersion::hasValidPaths() const {

ImguiMapEditor/Domain/ClientVersion.h

@@ -112,8 +112,45 @@ class ClientVersion {
   void setDefault(bool is_default) { is_default_ = is_default; }
 
   // Data directory and description
+  // setDataDirectory normalizes paths like "data/1098" or absolute paths ending
+  // in "/data/<version>" to just the final segment (e.g., "1098").
+  // autoDetectDataDirectory() and MapLoadingService both depend on
+  // std::filesystem::current_path() to resolve data/[version]/ at runtime.
   const std::string &getDataDirectory() const { return data_directory_; }
-  void setDataDirectory(const std::string &dir) { data_directory_ = dir; }
+  void setDataDirectory(const std::string &dir) {
+    // Normalize: reduce .../data/<version> to just <version>
+    std::filesystem::path p(dir);
+    if (p.has_parent_path() && p.parent_path().filename() == "data") {
+      data_directory_ = p.filename().string();
+    } else {
+      data_directory_ = dir;
+    }
+  }
+
+  // Resolve the version-specific data directory to an absolute path.
+  // Returns empty path if data_directory_ is not set or doesn't exist.
+  // Handles both "1098" and "data/1098" formats.
+  std::filesystem::path resolveDataPath() const {
+    if (data_directory_.empty()) return {};
+    auto candidate = std::filesystem::current_path() / "data" / data_directory_;
+    if (std::filesystem::exists(candidate)) return candidate;
+    // Try stripping "data/" prefix if present
+    std::filesystem::path dir_path(data_directory_);
+    if (dir_path.has_parent_path() && dir_path.parent_path().filename() == "data") {
+      auto stripped = std::filesystem::current_path() / "data" / dir_path.filename();
+      if (std::filesystem::exists(stripped)) return stripped;
+    }
+    return {};
+  }
+
+  // Auto-detect data directory: checks if data/[version]/ exists
+  void autoDetectDataDirectory() {
+    auto candidate = std::filesystem::current_path() / "data" / std::to_string(version_);
+    if (std::filesystem::exists(candidate)) {
+      data_directory_ = std::to_string(version_);
+    }
+  }
+
   const std::string &getDescription() const { return description_; }
   void setDescription(const std::string &desc) { description_ = desc; }
 

ImguiMapEditor/Domain/Tile.cpp

@@ -54,7 +54,6 @@ Tile::~Tile() = default;
 void Tile::setOpaqueData(std::unique_ptr<IO::InvalidZoneState> data) {
     opaque_data_ = std::move(data);
 }
-}
 
 void Tile::setGround(std::unique_ptr<Item> item) {
   ground_ = std::move(item);

ImguiMapEditor/Presentation/MainWindow.h

@@ -10,10 +10,12 @@
 #include "UI/Dialogs/Properties/SpawnPropertiesDialog.h"
 #include "UI/Map/MapContextMenu.h"
 #include "UI/Map/MapPanel.h"
+#include "UI/Panels/NewMapPanel.h"
 #include "UI/Windows/IngameBoxWindow.h"
 #include <functional>
 #include <memory>
 #include <optional>
+#include <filesystem>
 
 namespace MapEditor::Rendering {
 class MapRenderer;
@@ -153,6 +155,10 @@ class MainWindow {
   UI::ItemPropertiesDialog properties_dialog_;
   UI::SpawnPropertiesDialog spawn_properties_dialog_;
   UI::CreaturePropertiesDialog creature_properties_dialog_;
+
+  // Editor-state modal dialog callbacks
+  std::function<void(const UI::NewMapPanel::State&)> new_map_callback_;
+  std::function<void(const std::filesystem::path&, uint32_t)> open_sec_callback_;
 };
 
 } // namespace Presentation

ImguiMapEditor/Services/ClientVersionRegistry.cpp

@@ -35,6 +35,18 @@ bool ClientVersionRegistry::loadDefaults(const ConfigService &config) {
           setNextIndex(versions_.rbegin()->first);
       }
       spdlog::info("Loaded {} saved clients from: {}", versions_.size(), path.string());
+
+      // Auto-detect data directories for versions without one set
+      for (auto &[index, cv] : versions_) {
+        if (cv.getDataDirectory().empty()) {
+          cv.autoDetectDataDirectory();
+          if (!cv.getDataDirectory().empty()) {
+            spdlog::info("Auto-detected data directory for '{}': {}",
+                         cv.getName(), cv.getDataDirectory());
+          }
+        }
+      }
+
       return true;
     }
   }

ImguiMapEditor/Services/Map/MapLoadingService.cpp

@@ -15,7 +15,7 @@ namespace Services {
 
 MapLoadingService::MapLoadingService(ClientVersionRegistry &version_registry,
                                      ViewSettings &view_settings,
-                                     Brushes::BrushRegistry &brush_registry,
+                                     ::MapEditor::Brushes::BrushRegistry &brush_registry,
                                      TilesetService &tileset_service,
                                      const OtbmSettings &otbm_settings)
     : version_registry_(version_registry), view_settings_(view_settings),
@@ -567,11 +567,14 @@ bool MapLoadingService::loadClientData(
                            ? pending_path
                            : pending_path.parent_path();
 
-  if (!tryLoadCreatures(map_dir, client_path)) {
+  // Resolve version data path once — used for creatures, items, tilesets, palettes
+  const std::filesystem::path version_data_path = version_info->resolveDataPath();
+
+  if (!tryLoadCreatures(map_dir, client_path, version_data_path)) {
     spdlog::warn("No creature data loaded. Spawns may look incorrect.");
   }
 
-  if (!tryLoadItems(map_dir, client_path)) {
+  if (!tryLoadItems(map_dir, client_path, version_data_path)) {
     spdlog::warn("No items.xml loaded. Item names may be missing.");
   }
 
@@ -595,21 +598,23 @@ bool MapLoadingService::loadClientData(
     }
   }
 
-  // Use injected TilesetService instead of creating locally
-  // Always use the application's data folder for tilesets and palettes,
-  // NOT the map directory - these are app resources, not per-map resources
-  std::filesystem::path app_data_path =
-      std::filesystem::current_path() / "data";
-
-  bool tilesets_loaded = tileset_service_.loadMaterials(app_data_path);
-  if (!tilesets_loaded) {
-    spdlog::warn("materials.xml could not be loaded. Falling back to direct tileset/palette loading.");
-    tilesets_loaded = tileset_service_.loadTilesets(app_data_path);
+  // Load tilesets, palettes, brushes from version data directory
+  if (version_data_path.empty()) {
+    spdlog::warn("Data directory '{}' not found. Skipping materials/tilesets/palettes loading.",
+                 version_info->getDataDirectory());
+  } else {
+    spdlog::info("Loading materials from: {}", version_data_path.string());
+    bool tilesets_loaded = tileset_service_.loadMaterials(version_data_path);
     if (!tilesets_loaded) {
-      spdlog::warn("No tilesets found. The palette will be empty.");
-    }
-    if (!tileset_service_.loadPalettes(app_data_path)) {
-      spdlog::warn("No palettes loaded. Ribbon palette buttons will be empty.");
+      spdlog::warn("materials.xml not found in '{}'. Falling back to direct loading.",
+                   version_data_path.string());
+      tilesets_loaded = tileset_service_.loadTilesets(version_data_path);
+      if (!tilesets_loaded) {
+        spdlog::warn("No tilesets found in '{}'.", version_data_path.string());
+      }
+      if (!tileset_service_.loadPalettes(version_data_path)) {
+        spdlog::warn("No palettes found in '{}'.", version_data_path.string());
+      }
     }
   }
 
@@ -676,29 +681,53 @@ Domain::Position MapLoadingService::findCameraCenter() const {
 
 bool MapLoadingService::tryLoadCreatures(
     const std::filesystem::path &map_dir,
-    const std::filesystem::path &client_path) {
+    const std::filesystem::path &client_path,
+    const std::filesystem::path &version_data_path) {
   const auto load = [this](const std::filesystem::path &path) {
     return client_data_service_->loadCreatureData(path);
   };
 
   if (tryLoadResource("creatures.xml", map_dir, client_path, load)) {
     return true;
   }
-  return tryLoadResource(std::filesystem::path("creatures") / "creatures.xml",
-                         map_dir, client_path, load);
+  if (tryLoadResource(std::filesystem::path("creatures") / "creatures.xml",
+                         map_dir, client_path, load)) {
+    return true;
+  }
+  // Try version-specific data folder
+  if (!version_data_path.empty()) {
+    auto version_file = version_data_path / "creatures" / "creatures.xml";
+    if (std::filesystem::exists(version_file) && load(version_file)) {
+      spdlog::info("Loaded creatures.xml from version data folder");
+      return true;
+    }
+  }
+  return false;
 }
 
 bool MapLoadingService::tryLoadItems(const std::filesystem::path &map_dir,
-                                     const std::filesystem::path &client_path) {
+                                     const std::filesystem::path &client_path,
+                                     const std::filesystem::path &version_data_path) {
   const auto load = [this](const std::filesystem::path &path) {
     return client_data_service_->loadItemData(path);
   };
 
   if (tryLoadResource("items.xml", map_dir, client_path, load)) {
     return true;
   }
-  return tryLoadResource(std::filesystem::path("items") / "items.xml", map_dir,
-                         client_path, load);
+  if (tryLoadResource(std::filesystem::path("items") / "items.xml", map_dir,
+                         client_path, load)) {
+    return true;
+  }
+  // Try version-specific data folder
+  if (!version_data_path.empty()) {
+    auto version_file = version_data_path / "items" / "items.xml";
+    if (std::filesystem::exists(version_file) && load(version_file)) {
+      spdlog::info("Loaded items.xml from version data folder");
+      return true;
+    }
+  }
+  return false;
 }
 
 void MapLoadingService::loadWaypoints(const std::filesystem::path &otbm_path,

ImguiMapEditor/Services/Map/MapLoadingService.h

@@ -160,9 +160,11 @@ class MapLoadingService {
                                   Services::ClientDataService &client_data);
 
   bool tryLoadCreatures(const std::filesystem::path &map_dir,
-                        const std::filesystem::path &client_path);
+                        const std::filesystem::path &client_path,
+                        const std::filesystem::path &version_data_path);
   bool tryLoadItems(const std::filesystem::path &map_dir,
-                    const std::filesystem::path &client_path);
+                    const std::filesystem::path &client_path,
+                    const std::filesystem::path &version_data_path);
 
   void loadWaypoints(const std::filesystem::path &otbm_path,
                      Domain::ChunkedMap &map);

ImguiMapEditor/UI/Dialogs/EditTownsDialog.cpp

@@ -1,4 +1,5 @@
 #include "EditTownsDialog.h"
+#include "../../Utils/StringCopy.h"
 #include "Application/MapTabManager.h"
 #include "Application/EditorSession.h"
 #include "Domain/MapInstance.h"

ImguiMapEditor/UI/Dialogs/Properties/MapPropertiesDialog.cpp

@@ -121,27 +121,6 @@ MapPropertiesDialog::Result MapPropertiesDialog::render() {
   return result;
 }
 
-void MapPropertiesDialog::loadFromMap() {
-  if (!map_)
-    return;
-
-  // Description
-  ::MapEditor::Utils::copyTruncate(description_buffer_, map_->getDescription());
-
-  // Dimensions
-  width_ = map_->getWidth();
-  height_ = map_->getHeight();
-
-  // Version info
-  const auto &version = map_->getVersion();
-  otbm_version_ = version.otbm_version;
-  client_version_ = version.client_version;
-
-  // External files
-  ::MapEditor::Utils::copyTruncate(house_filename_, map_->getHouseFile());
-
-  ::MapEditor::Utils::copyTruncate(spawn_filename_, map_->getSpawnFile());
-}
 
 void MapPropertiesDialog::applyToMap() {
   if (!map_)

ImguiMapEditor/UI/PreferencesDialog.cpp

@@ -1,6 +1,7 @@
 // Prevent GLFW from including OpenGL headers (glad provides them)
 #define GLFW_INCLUDE_NONE
 #include "PreferencesDialog.h"
+#include "../Utils/StringCopy.h"
 #include "UI/Core/Theme.h"
 #include "../ext/imhotkey/imHotKey.h"
 #include "IO/HotkeyJsonReader.h"