feat: 1.2.4-dev.1 | fix up some localization shit and fix tests not creating folders

Author: DexrnZacAttack

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.26)
 project(LCE VERSION 1.2.4)
 
-set(VERSION_SUFFIX "-dev.0") # used for non-stable versions
+set(VERSION_SUFFIX "-dev.1") # used for non-stable versions
 set(CMAKE_CXX_STANDARD 17)
 
 add_definitions(-DCOMPILER_NAME="${CMAKE_CXX_COMPILER_ID}")
@@ -38,34 +38,47 @@ set(ZLIB_FILES
 )
 
 set(HEADERS
+        # Windows
         include/Resources/resource.h
         include/Resources/resource.rc
 
+        # libLCE
         include/libLCE.h
         include/libLCEExports.h
-        include/World/Region.h
-        include/World/Chunk.h
+        # Save
         include/Save/SaveFile.h
         include/Save/SaveFileOld.h
         include/Save/SaveFileCommons.h
+        include/Save/Thumb.h
+        # IO
+        include/IO/Serializable.h
         include/IO/BinaryIO.h
-        include/Filesystem/Filesystem.h
-        include/Filesystem/File.h
+        # ARC
         include/Archive/Archive.h
+        # COL
         include/Color/Color.h
         include/Color/ColorFile.h
+        # LOC
         include/Localization/LocalizationFile.h
         include/Localization/Language.h
+        # MSSCMP
         include/Soundbank/Soundbank.h
         include/Soundbank/BinkaFile.h
-        include/Compression/Compression.h
-        include/Save/Thumb.h
+        # World
         include/World/SplitSave.h
         include/World/Block.h
+        include/World/Region.h
+        include/World/Chunk.h
+        # Other
+        include/Compression/Compression.h
+        # Filesystem
         include/Filesystem/FSObject.h
         include/Filesystem/Directory.h
+        include/Filesystem/Filesystem.h
+        include/Filesystem/File.h
+        # Bindings
         include/Bindings/EmscriptenBindings.h
-        include/IO/Serializable.h
+        # Unsorted
 )
 
 set(FILES
@@ -111,15 +124,15 @@ else ()
         add_compile_options(
                 "$<$<COMPILE_LANGUAGE:CXX>:-O3;-ffast-math;-march=native;-fpic;-ftree-vectorize>"
         )
-
-        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-            add_compile_options(
-                    "-D_GLIBCXX_DEBUG"
-            )
-        endif ()
     endif ()
     unset(ENABLE_OPTIMIZATIONS CACHE)
 
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        add_compile_options(
+                "-D_GLIBCXX_DEBUG"
+        )
+    endif ()
+
     set(ENVIRONMENT_TYPE "Native")
     set(LIB_TYPE SHARED)
     add_library(LCE ${LIB_TYPE} ${HEADERS} ${FILES} ${LODEPNG_FILES} ${ZLIB_FILES})

include/Localization/Language.h

@@ -6,7 +6,6 @@
 #define LANGUAGE_H
 
 #include "IO/Serializable.h"
-#include "LocStringId.h"
 
 #include <IO/BinaryIO.h>
 #include <libLCE.h>
@@ -64,13 +63,22 @@ namespace lce::loc {
         };
 
         explicit Language(io::BinaryIO &io, std::vector<uint32_t> &keys);
+
+        Language(const uint8_t _byte, const uint32_t _shouldReadByte,
+                 std::string _code, std::vector<uint32_t> &keys)
+            : mUnk(_byte), mShouldReadByte(_shouldReadByte), mKeys(&keys),
+              mName(std::move(_code)) {
+            for (auto &key : keys) {
+                mStrings.emplace(key, "");
+            }
+        }
+
         Language(const uint8_t _byte, const uint32_t _shouldReadByte,
                  std::string _code)
             : mUnk(_byte), mShouldReadByte(_shouldReadByte),
               mKeys(new std::vector<uint32_t>()), mName(std::move(_code)) {}
 
-        std::unordered_map<LocStringId, std::string, LocIdHash, LocIdKeyEqual> &
-        getStrings();
+        std::unordered_map<uint32_t, std::string> &getStrings();
 
         const std::string &getName() const;
 
@@ -126,8 +134,7 @@ namespace lce::loc {
                     // this is changed...
 
         std::string mName;
-        std::unordered_map<LocStringId, std::string, LocIdHash, LocIdKeyEqual>
-            mStrings;
+        std::unordered_map<uint32_t, std::string> mStrings;
     };
 } // namespace lce::loc
 

include/Localization/LocStringId.h

@@ -33,9 +33,15 @@ namespace lce::loc {
         size_t getSize() const override;
         uint8_t *serialize() const override;
 
+        Language *createLanguage(const std::string &name,
+                                 const uint8_t _byte = 2,
+                                 const uint32_t _shouldReadByte = 1);
+
         Language *getLanguage(const std::string &name);
 
-        uint32_t &createString(uint32_t id);
+        bool languageExists(const std::string &name);
+
+        uint32_t createString(uint32_t id);
 
         /** Nicer looking way to add data-driven strings
          *

include/Localization/LocalizationFile.h

@@ -29,7 +29,7 @@ namespace lce::loc {
             }
 
             const uint32_t ss = io.readBE<uint16_t>();
-            mStrings.emplace(std::cref(keys[s]), io.readString(ss));
+            mStrings.emplace(keys[s], io.readString(ss));
         }
     }
 
@@ -76,14 +76,13 @@ namespace lce::loc {
         return addString(str, std::hash<std::string>{}(str));
     }
 
-    std::unordered_map<LocStringId, std::string, LocIdHash, LocIdKeyEqual> &
-    Language::getStrings() {
+    std::unordered_map<uint32_t, std::string> &Language::getStrings() {
         return this->mStrings;
     }
 
     const std::string &Language::getName() const { return this->mName; }
 
-    void Language::setString(uint32_t id, const std::string &str) {
+    void Language::setString(const uint32_t id, const std::string &str) {
         if (!mStrings.count(id))
             throw std::runtime_error("String has does not exist in map");
 
@@ -98,7 +97,7 @@ namespace lce::loc {
         return h;
     }
 
-    std::string &Language::getString(uint32_t id) { return mStrings[id]; }
+    std::string &Language::getString(const uint32_t id) { return mStrings[id]; }
 
     std::string &Language::getString(const std::string &id) {
         return getString(std::hash<std::string>{}(id));

src/Localization/Language.cpp

@@ -99,6 +99,19 @@ namespace lce::loc {
 
         return io.getData();
     }
+    Language *LocalizationFile::createLanguage(const std::string &name,
+                                               const uint8_t _byte,
+                                               const uint32_t _shouldReadByte) {
+        if (languageExists(name))
+            throw std::runtime_error("Language already exists with name: " +
+                                     name);
+
+        Language::Id id = Language::Id(name);
+        Language language = Language(_byte, _shouldReadByte, name, this->mKeys);
+        this->mLanguages.emplace(id, language);
+
+        return getLanguage(name);
+    }
 
     Language *LocalizationFile::getLanguage(const std::string &name) {
         for (auto &[id, lang] : mLanguages) {
@@ -108,19 +121,23 @@ namespace lce::loc {
 
         return nullptr;
     }
+    bool LocalizationFile::languageExists(const std::string &name) {
+        for (auto &[id, lang] : mLanguages) {
+            if (id.getName() == name)
+                return true;
+        }
+
+        return false;
+    }
 
-    uint32_t &LocalizationFile::createString(const uint32_t id) {
+    uint32_t LocalizationFile::createString(const uint32_t id) {
         mKeys.reserve(mKeys.size() + 1);
         mKeys.push_back(id);
 
-        // TODO: fix, we have access to mKeys in the Language anyways...
-        // we keep taking references to the ID everywhere lol
-        uint32_t &key = this->mKeys.back();
-
         for (auto &[i, lang] : mLanguages)
-            lang.addString("", key);
+            lang.addString("", id);
 
-        return key;
+        return id;
     }
 
     uint32_t LocalizationFile::setString(const std::string &language,
@@ -139,15 +156,10 @@ namespace lce::loc {
         if (!lang)
             throw std::runtime_error("Language not found: " + language);
 
-        uint32_t *h;
-
-        auto n = std::find(mKeys.begin(), mKeys.end(), id);
-        if (n == mKeys.end())
-            h = &createString(id);
-        else
-            h = &(*n);
+        const auto n = std::find(mKeys.begin(), mKeys.end(), id);
+        const uint32_t h = (n == mKeys.end()) ? createString(id) : *n;
 
-        lang->setString(*h, str);
+        lang->setString(h, str);
     }
 
     std::pair<const Language::Id, Language> *

src/Localization/LocalizationFile.cpp

@@ -28,27 +28,33 @@ namespace lce::tests::formats {
 
     void locTest() {
         std::string n = "example.loc";
-        std::filesystem::create_directories(util::output / (n + ".dir"));
 
         OPEN_FILE(n, f);
 
         loc::LocalizationFile file = loc::LocalizationFile(f.data());
 
 #if WRITE_LOC
+        std::filesystem::create_directories(util::output / (n + ".dir"));
         for (auto &[i, l] : file.getLanguages()) {
             std::ofstream o(util::output / (n + ".dir") /
                             (i.getName() + ".txt"));
 
             for (const auto &[id, str] : l.getStrings()) {
-                o << "[0x" << std::hex << id.get() << "] " << str << std::endl;
+                o << "[0x" << std::hex << id << "] " << str << std::endl;
             }
 
             o.close();
         }
-
 #endif
 
         file.setString("en-EN", "test.hello", "Hello!");
+        file.setString("fi-FI", "test.hello", "Hei!");
+
+        if (!file.languageExists("TestLang")) {
+            file.createLanguage("TestLang");
+        }
+
+        file.setString("TestLang", "test.hello", "Hello, world!");
 
         std::cout << file.getString("en-EN", "test.hello") << std::endl;
 
@@ -99,6 +105,7 @@ namespace lce::tests::formats {
     }
 
     void saveFromFolderTest() {
+        std::filesystem::create_directories(util::examples / "FSSaveFolder");
         fs::Directory *d = new fs::Directory(util::examples / "FSSaveFolder");
         fs::Filesystem *fs = new fs::Filesystem(d);
 

tests/tests/formats.cpp

@@ -48,6 +48,7 @@ namespace lce::tests::vfs {
             });
     }
     void runForEach() {
+        std::filesystem::create_directories(util::examples / "VFSTestFolder");
         const fs::Directory *d =
             new fs::Directory(util::examples / "VFSTestFolder");