移动文件

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "RELEASE/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"]
 	path = RELEASE/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI
 	url = https://github.com/OEOTYAN/LiteLoaderBDS-CUI.git
+[submodule "ParticleAPI-1.16.40"]
+	path = ParticleAPI-1.16.40
+	url = https://github.com/quizhizhe/ParticleAPI-1.16.40
+[submodule "PermissionAPI-1.16.40"]
+	path = PermissionAPI-1.16.40
+	url = https://github.com/quizhizhe/PermissionAPI-1.16.40

CMakeLists.txt

@@ -1,8 +1,13 @@
 cmake_minimum_required(VERSION 3.21)
 project(LL-Parent)
 
+set(LiteLoader_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LiteLoader)
+set(Demangler_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Tools/Demangler)
+set(SCRIPTENGINE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/ScriptEngine)
+set(SCRIPTX_SOURCE_DIR ${CMAKE_SOURCE_DIR}/ScriptX)
+
 # Add sub directories
-add_subdirectory(PreLoader)
+add_subdirectory(LLPreLoader)
 add_subdirectory(LiteLoader)
 add_subdirectory(ScriptEngine/CMake/ScriptEngine-Lua)
 add_subdirectory(ScriptEngine/CMake/ScriptEngine-QuickJs)

LLPreLoader/CMakeLists.txt

@@ -22,8 +22,8 @@ add_link_options(
 
 link_directories(${CMAKE_SOURCE_DIR}/x64/Release/)
 
-aux_source_directory(../LiteLoader/Lib/third-party/rawpdb DIR_LIB_SRCS)
+aux_source_directory(third-party/rawpdb DIR_LIB_SRCS)
-add_library(LLPreLoader SHARED dllmain.cpp SymDB.cpp PreLoader.cpp Utils.cpp ${DIR_LIB_SRCS})
+add_library(LLPreLoader SHARED src/dllmain.cpp src/SymDB.cpp src/PreLoader.cpp src/Utils.cpp ${DIR_LIB_SRCS})
 target_link_libraries(LLPreLoader SymDBHelper
         "${CMAKE_SOURCE_DIR}/LiteLoader/Lib/third-party/detours/detours.lib"
         "${CMAKE_SOURCE_DIR}/LiteLoader/Lib/Demangler.lib")

LLPreLoader/include/FakeSymbol.hpp

@@ -2,7 +2,7 @@
 
 #include <optional>
 #include <string>
-#include "../Tools/Demangler/include/MicrosoftDemangle.h"
+#include "Tools/Demangler/include/MicrosoftDemangle.h"
 
 namespace FakeSymbol {
 

LLPreLoader/include/pch.h

@@ -9,7 +9,7 @@
 #endif
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#include <windows.h>
+#include <Windows.h>
 #include <filesystem>
 #include <fstream>
 #include <iostream>

LLPreLoader/src/PreLoader.cpp

@@ -1,9 +1,9 @@
-#include "pch.h"
+#include "../include/pch.h"
-#include "Logger.h"
+#include "../include/Logger.h"
 #include <string>
 #include <set>
 #include <filesystem>
-#include <windows.h>
+#include <Windows.h>
 
 using std::string;
 using std::wstring;

LLPreLoader/src/SymDB.cpp

@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "../include/pch.h"
 #include <cstdio>
 #include <filesystem>
 #include <fstream>
@@ -20,12 +20,12 @@
 
 #include "../LiteLoader/Header/third-party/parallel_hashmap/phmap.h"
 
-#include "Logger.h"
+#include "../include/Logger.h"
 #include "../LiteLoader/Header/third-party/FMT/printf.h"
 #include <iomanip>
-#include "Utils.h"
+#include "../include/Utils.h"
 
-#include "FakeSymbol.hpp"
+#include "../include/FakeSymbol.hpp"
 
 using std::list;
 using std::string, std::string_view;

LLPreLoader/src/Utils.cpp

@@ -1,5 +1,5 @@
-#include "pch.h"
+#include "../include/pch.h"
-#include "Utils.h"
+#include "../include/Utils.h"
 #include <Psapi.h>
 std::string GetCallerModuleFileName(unsigned long FramesToSkip) {
     static const int maxFrameCount = 1;

LLPreLoader/src/dllmain.cpp

@@ -1,6 +1,6 @@
 // dllmain.cpp : 定义 DLL 应用程序的入口点。
-#include "pch.h"
+#include "../include/pch.h"
-#include "Logger.h"
+#include "../include/Logger.h"
 void fixUpLibDir();
 void loadDlls();
 #pragma comment(linker, "/export:GetServerSymbol=LLPreLoader.dlsym_real")

LiteLoader/CMakeLists.txt

@@ -9,62 +9,87 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/x64/)
 set(TARGET_DIR ${CMAKE_SOURCE_DIR}/x64/Release/)
 
 file(GLOB_RECURSE SRC_FILES
-        ${PROJECT_SOURCE_DIR}/Lib/third-party/nbt-cpp/*.cpp
+        ${PROJECT_SOURCE_DIR}/third-party/nbt-cpp/*.cpp
-        ${PROJECT_SOURCE_DIR}/Header/*.cpp
+        ${PROJECT_SOURCE_DIR}/include/*.h
-        ${PROJECT_SOURCE_DIR}/Header/*.hpp
+        ${PROJECT_SOURCE_DIR}/include/*.hpp
-        ${PROJECT_SOURCE_DIR}/Header/*.h
+        ${PROJECT_SOURCE_DIR}/src/*.cpp
-        ${PROJECT_SOURCE_DIR}/Kernel/*.cpp
+        ${PROJECT_SOURCE_DIR}/src/*.hpp
-        ${PROJECT_SOURCE_DIR}/Kernel/*.hpp
+        ${PROJECT_SOURCE_DIR}/src/*.h
-        ${PROJECT_SOURCE_DIR}/Kernel/*.h
+        ${PROJECT_SOURCE_DIR}/src/*.rc
-        ${PROJECT_SOURCE_DIR}/Main/*.cpp
-        ${PROJECT_SOURCE_DIR}/Main/*.hpp
-        ${PROJECT_SOURCE_DIR}/Main/*.h
-        ${PROJECT_SOURCE_DIR}/Resource/*.rc
-        ${PROJECT_SOURCE_DIR}/Resource/*.h
 )
 
-add_definitions(
+# third-party source files
-        -DUNICODE -DNDEBUG -DLITELOADER_EXPORTS -DWIN32_LEAN_AND_MEAN
+file(GLOB_RECURSE THIRD_PARTY_SRC_FILES ${PROJECT_SOURCE_DIR}/third-party/src/*)
-        -DCPPHTTPLIB_OPENSSL_SUPPORT -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS
+
-        -D_USRDLL -D_AMD64_ -DNOMINMAX
+add_library(LiteLoader SHARED ${SRC_FILES} ${THIRD_PARTY_SRC_FILES})
+
+# Replace Compile Flag /EHsc to /EHa
+string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
+target_compile_options(
+        LiteLoader
+        PRIVATE /permissive- /MD /MP /analyze:external- /GS /GL /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /FC /nologo /Ot /diagnostics:column /utf-8
 )
 
-add_compile_options(
+target_compile_definitions(
-        /permissive /MP /analyze:external- /GS /GL /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise
+        LiteLoader
-        /external:W1 /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHa /nologo /Ot /diagnostics:column
+        PRIVATE -DUNICODE -DNDEBUG -DLITELOADER_EXPORTS -DWIN32_LEAN_AND_MEAN -DCPPHTTPLIB_OPENSSL_SUPPORT -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -D_USRDLL -D_AMD64_ -DNOMINMAX
-        /utf-8
 )
 
-add_link_options(
+# use delayload to import BDS APIs manually(bedrock_server.dll does not need to exist)
-        /MANIFEST /LTCG:incremental /NXCOMPAT /DEBUG:FULL /DLL /MACHINE:X64 /OPT:REF /INCREMENTAL:NO /SUBSYSTEM:CONSOLE
+target_link_options(
-        /MANIFESTUAC:NO /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1
+        LiteLoader
-        /DELAYLOAD:bedrock_server.dll # use delayload to import BDS APIs manually(bedrock_server.dll does not need to exist)
+        PRIVATE /MANIFEST /LTCG:incremental /NXCOMPAT /DEBUG:FULL /DLL /MACHINE:X64 /OPT:REF /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1 /DELAYLOAD:bedrock_server.dll
 )
 
-include_directories(${PROJECT_SOURCE_DIR})
+target_link_libraries(
-include_directories(${PROJECT_SOURCE_DIR}/Header)
+        LiteLoader
-include_directories(${PROJECT_SOURCE_DIR}/Header/third-party)
+        "${PROJECT_SOURCE_DIR}/third-party/lib/leveldb/leveldb.lib"
-include_directories(${CMAKE_SOURCE_DIR})
+        "${PROJECT_SOURCE_DIR}/third-party/lib/openssl/libcrypto.lib"
-
+        "${PROJECT_SOURCE_DIR}/third-party/lib/openssl/libssl.lib"
-link_directories(${PROJECT_SOURCE_DIR})
+        "${PROJECT_SOURCE_DIR}/third-party/lib/SQLiteCpp/SQLiteCpp.lib"
-link_directories(${CMAKE_SOURCE_DIR}/x64/Release)
+        "${PROJECT_SOURCE_DIR}/third-party/lib/SQLiteCpp/sqlite3.lib"
-
+        "${PROJECT_SOURCE_DIR}/third-party/lib/mysql/mysqlclient.lib"
-add_library(LiteLoader SHARED ${SRC_FILES})
+        "${PROJECT_SOURCE_DIR}/third-party/lib/compact_enc_det/ced.lib"
-
+        "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dyncall_s.lib"
-target_link_libraries(LiteLoader LLPreLoader
+        "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dyncallback_s.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/leveldb/leveldb.lib"
+        "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dynload_s.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/openssl/libcrypto.lib"
+        "${PROJECT_SOURCE_DIR}/third-party/lib/dbghelp/dbghelp.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/openssl/libssl.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/SQLiteCpp/SQLiteCpp.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/SQLiteCpp/sqlite3.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/mysql/mysqlclient.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/compact_enc_det/ced.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/dyncall/dyncall_s.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/dyncall/dyncallback_s.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/dyncall/dynload_s.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/compact_enc_det/ced.lib"
-        "${PROJECT_SOURCE_DIR}/Lib/third-party/dbghelp/dbghelp.lib"
         # Please make sure that the BDS APIs ImportLibrary is at the bottom of the list to ensure proper linking.
         "${PROJECT_SOURCE_DIR}/Lib/bedrock_server_api.lib"
         "${PROJECT_SOURCE_DIR}/Lib/bedrock_server_var.lib"
+        LLPreLoader
+)
+
+target_include_directories(
+        LiteLoader SYSTEM
+        PRIVATE ${PROJECT_SOURCE_DIR}/third-party/include
+)
+
+target_include_directories(
+        LiteLoader
+        PRIVATE ${PROJECT_SOURCE_DIR}/include/
+        PRIVATE ${CMAKE_SOURCE_DIR}
+)
+
+add_custom_command(
+        TARGET LiteLoader PRE_BUILD
+        COMMAND ${CMAKE_SOURCE_DIR}/scripts/PrepareLibraries.cmd ${CMAKE_SOURCE_DIR}
+)
+
+# Copy the built DLL and PDB to the output directory
+add_custom_command(
+        TARGET LiteLoader POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:LiteLoader> ${CMAKE_BINARY_DIR}/output/
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PDB_FILE:LiteLoader> ${CMAKE_BINARY_DIR}/pdb/
+        COMMENT "Copying LiteLoader DLL and PDB to output directory"
+        VERBATIM
+)
+
+# Copy the built lib to the SDK directory
+add_custom_command(
+        TARGET LiteLoader POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:LiteLoader> ${CMAKE_BINARY_DIR}/sdk/lib/
+        COMMENT "Copying LiteLoader Lib to SDK directory"
+        VERBATIM
 )

LiteLoader/Header/Impl/ObjectivePacketHelper.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include "../Global.h"
-
-LIAPI uint64_t NewScoreId();

LiteLoader/Header/Utils/CryptHelper.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "../Global.h"
-#include <string>
-
-LIAPI std::string CalcMD5(const std::string& str);
-LIAPI std::string CalcSHA1(const std::string& str);

LiteLoader/Header/third-party/entt/entt.hpp

@@ -1,51 +0,0 @@
-#include "config/version.h"
-#include "core/algorithm.hpp"
-#include "core/any.hpp"
-#include "core/attribute.h"
-#include "core/family.hpp"
-#include "core/hashed_string.hpp"
-#include "core/ident.hpp"
-#include "core/monostate.hpp"
-#include "core/type_info.hpp"
-#include "core/type_traits.hpp"
-#include "core/utility.hpp"
-#include "entity/component.hpp"
-#include "entity/entity.hpp"
-#include "entity/group.hpp"
-#include "entity/handle.hpp"
-#include "entity/helper.hpp"
-#include "entity/observer.hpp"
-#include "entity/organizer.hpp"
-#include "entity/poly_storage.hpp"
-#include "entity/registry.hpp"
-#include "entity/runtime_view.hpp"
-#include "entity/snapshot.hpp"
-#include "entity/sparse_set.hpp"
-#include "entity/storage.hpp"
-#include "entity/utility.hpp"
-#include "entity/view.hpp"
-#include "locator/locator.hpp"
-#include "meta/adl_pointer.hpp"
-#include "meta/container.hpp"
-#include "meta/ctx.hpp"
-#include "meta/factory.hpp"
-#include "meta/meta.hpp"
-#include "meta/node.hpp"
-#include "meta/pointer.hpp"
-#include "meta/policy.hpp"
-#include "meta/range.hpp"
-#include "meta/resolve.hpp"
-#include "meta/template.hpp"
-#include "meta/type_traits.hpp"
-#include "meta/utility.hpp"
-#include "platform/android-ndk-r17.hpp"
-#include "poly/poly.hpp"
-#include "process/process.hpp"
-#include "process/scheduler.hpp"
-#include "resource/cache.hpp"
-#include "resource/handle.hpp"
-#include "resource/loader.hpp"
-#include "signal/delegate.hpp"
-#include "signal/dispatcher.hpp"
-#include "signal/emitter.hpp"
-#include "signal/sigh.hpp"

LiteLoader/Header/third-party/entt/fwd.hpp

@@ -1,5 +0,0 @@
-#include "core/fwd.hpp"
-#include "entity/fwd.hpp"
-#include "poly/fwd.hpp"
-#include "resource/fwd.hpp"
-#include "signal/fwd.hpp"

LiteLoader/Kernel/PermissionAPI.cpp

@@ -1,3 +0,0 @@
-#include <PermissionAPI.h>
-
-DynPermissionAPI Permission::api{};

LiteLoader/Resource/LiteLoader.rc

@@ -1,97 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-#include "../Main/Version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// 中文(简体，中国) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION LITELOADER_VERSION_MAJOR,LITELOADER_VERSION_MINOR,LITELOADER_VERSION_REVISION,LITELOADER_VERSION_ACTIONS
- PRODUCTVERSION LITELOADER_VERSION_MAJOR,LITELOADER_VERSION_MINOR,LITELOADER_VERSION_REVISION,LITELOADER_VERSION_ACTIONS
- FILEFLAGSMASK 0x3fL
- FILEFLAGS LITELOADER_FILE_VERSION_FLAG
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080404b0"
-        BEGIN
-            VALUE "CompanyName", "LiteLoaderDev"
-            VALUE "FileDescription", "A Light-Weight Plugin Loader for Bedrock Dedicated Server"
-            VALUE "FileVersion", LITELOADER_FILE_VERSION_STRING
-            VALUE "InternalName", "LiteLoader.dll"
-            VALUE "LegalCopyright", "LiteLoader Developer"
-            VALUE "OriginalFilename", "LiteLoader.dll"
-            VALUE "ProductName", "LiteLoader For BDS"
-            VALUE "ProductVersion", LITELOADER_FILE_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x804, 1200
-    END
-END
-
-#endif    // 中文(简体，中国) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

LiteLoader/Resource/resource.h

@@ -1,13 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by LiteLoader.rc
-
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
-

LiteLoader/cpp.hint

@@ -1,7 +0,0 @@
-// 提示文件帮助 Visual Studio IDE 解释 Visual C++ 标识符,
-// 如函数和宏的名称。
-// 有关详细信息，请参见 https://go.microsoft.com/fwlink/?linkid=865984
-#define LIAPI __declspec(dllexport)
-#define MCAPI __declspec(dllimport)
-#define IF_LISTENED(EVENT) if(EVENT::hasListener()) { try
-#define IF_LISTENED_END(EVENT) catch(...) { Logger::Error("Event Callback Failed!"); Logger::Error("Uncaught Exception Detected!"); Logger::Error("In Event: " #EVENT ""); } }

LiteLoader/include/liteloader/AddonsHelper.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <vector>
-#include <LLAPI.h>
+#include "llapi/LLAPI.h"
 
 void InitAddonsHelper();
 

LiteLoader/include/liteloader/Config.h

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <thread>
-#include <LLAPI.h>
+#include "llapi/LLAPI.h"
 
 /////////////////////// CrashLogger ///////////////////////
 // When comes with these plugins, disable builtin CrashLogger since they will cause crash

LiteLoader/include/liteloader/LiteLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LoggerAPI.h>
+#include "include/llapi/LoggerAPI.h"
 extern Logger logger;
 extern time_t startTime;
 extern time_t endTime;

LiteLoader/include/liteloader/PluginManager.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <Global.h>
+#include "include/llapi/Global.h"
-#include <windows.h>
+#include <Windows.h>
 #include <string>
 #include <unordered_map>
 

LiteLoader/include/llapi/DynamicCommandAPI.h

@@ -10,8 +10,8 @@
  #include "MC/CommandRegistry.hpp"
  #include "MC/CommandSelector.hpp"
  #include "MC/CommandPosition.hpp"
- #include "Utils/WinHelper.h"
+ #include "include/llapi/utils/WinHelper.h"
- #include <third-party/magic_enum/magic_enum.hpp>
+ #include "Header/third-party/magic_enum/magic_enum.hpp"
 
  ///////////////////////////////////////////////////////
  // Dynamic Command Registry

LiteLoader/include/llapi/EventAPI.h

@@ -36,8 +36,8 @@
 #include <list>
 #include <string>
 #include <unordered_map>
-#include <LLAPI.h>
+#include "LLAPI.h"
-#include <Utils/WinHelper.h>
+#include "include/llapi/utils/WinHelper.h"
 
 class Actor;
 class ServerPlayer;

LiteLoader/include/llapi/Global.h

@@ -66,7 +66,7 @@
 #include "third-party/FMT/printf.h"
 
 #include "GlobalServiceAPI.h"
-#include "Utils/Optional.h"
+#include "include/llapi/utils/Optional.h"
 
 // basic mc types
 #include "MC/Types.hpp"

LiteLoader/include/llapi/HookAPI.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Global.h"
-#include "Utils/Hash.h"
+#include "include/llapi/utils/Hash.h"
 #include <vector>
 #include <string>
 #include <thread>

LiteLoader/include/llapi/I18nAPI.h

@@ -35,13 +35,13 @@
 
 #include "Global.h"
 #include "LLAPI.h"
-#include "Utils/FileHelper.h"
+#include "include/llapi/utils/FileHelper.h"
-#include "Utils/PluginOwnData.h"
+#include "include/llapi/utils/PluginOwnData.h"
 #include "third-party/Nlohmann/json.hpp"
 #include "third-party/FMT/core.h"
 #include "third-party/FMT/os.h"
 #include <string>
-#include "Utils/StringHelper.h"
+#include "include/llapi/utils/StringHelper.h"
 
 /**
  * @brief I18nBase API class.

LiteLoader/include/llapi/KVDBAPI.h

@@ -4,7 +4,7 @@
 #include "third-party/leveldb/db.h"
 #include "third-party/leveldb/filter_policy.h"
 #include "third-party/leveldb/iterator.h"
-#include <Global.h>
+#include "Global.h"
 #include <functional>
 #include <string_view>
 #include <unordered_map>

LiteLoader/include/llapi/LLAPI.h

@@ -11,11 +11,11 @@
 #define NOMINMAX
 #endif
 
-#include <windows.h>
+#include <Windows.h>
 
 #include "Global.h"
-#include "Utils/WinHelper.h"
+#include "llapi/utils/WinHelper.h"
-#include "Utils/PluginOwnData.h"
+#include "llapi/utils/PluginOwnData.h"
 
 // LL types
 namespace LL {

LiteLoader/include/llapi/LoggerAPI.h

@@ -35,11 +35,11 @@
 #include "third-party/FMT/core.h"
 #include "third-party/FMT/os.h"
 #include "third-party/FMT/printf.h"
-#include "Utils/CsLock.h"
+#include "include/llapi/utils/CsLock.h"
-#include "Utils/WinHelper.h"
+#include "include/llapi/utils/WinHelper.h"
-#include "Utils/FileHelper.h"
+#include "include/llapi/utils/FileHelper.h"
-#include "Utils/PluginOwnData.h"
+#include "include/llapi/utils/PluginOwnData.h"
-#include "Utils/StringHelper.h"
+#include "include/llapi/utils/StringHelper.h"
 #include "I18nAPI.h"
 #include <string>
 #include <sstream>

LiteLoader/include/llapi/ParticleAPI.h

@@ -7,7 +7,7 @@
  *
  */
 #pragma once
-#include <LLAPI.h>
+#include "LLAPI.h"
 #include "Global.h"
 
 class ParticleAPI {

LiteLoader/include/llapi/PermissionAPI.h

@@ -7,7 +7,7 @@
  *
  */
 #pragma once
-#include <LLAPI.h>
+#include "LLAPI.h"
 #include "PERM/Role.hpp"
 
 /**

LiteLoader/include/llapi/PlayerInfoAPI.h

@@ -7,7 +7,7 @@
  *
  */
 #pragma once
-#include <Global.h>
+#include "Global.h"
 #include <string>
 namespace PlayerInfo {
 

LiteLoader/include/llapi/RemoteCallAPI.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Global.h"
-#include "Utils/WinHelper.h"
+#include "include/llapi/utils/WinHelper.h"
 #include "third-party/Nlohmann/json.hpp"
 #include "MC/CompoundTag.hpp"
 #include "MC/Container.hpp"

LiteLoader/include/llapi/ScheduleAPI.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "Global.h"
 #include <functional>
-#include "Utils/WinHelper.h"
+#include "include/llapi/utils/WinHelper.h"
 
 ///////////////////////////////////////////////////////
 // Schedule future callback plans

LiteLoader/include/llapi/ServerAPI.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <string>
-#include <Global.h>
+#include "Global.h"
 
 namespace LL {
 LIAPI std::string getBdsVersion();

LiteLoader/include/llapi/db/Any.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../Global.h"
+#include "include/llapi/Global.h"
 #include "Types.h"
 
 #pragma region AnyConversion
@@ -8,7 +8,7 @@ namespace DB
 {
 // Declare Any class
 class Any;
-} // namespace DB
+} // namespace db
 
 /**
  * @brief Function to convert Any to T.
@@ -605,9 +605,9 @@ public:
     /**
      * @brief Get the value as Date
      * 
-     * @tparam T         = DB::Date
+     * @tparam T         = db::Date
-     * @return DB::Date  The value
+     * @return db::Date  The value
-     * @throws std::bad_cast  If the value cannot be converted to DB::Date
+     * @throws std::bad_cast  If the value cannot be converted to db::Date
      */
     template <>
     Date get() const
@@ -631,9 +631,9 @@ public:
     /**
      * @brief Get the value as Time
      * 
-     * @tparam T         = DB::Time
+     * @tparam T         = db::Time
-     * @return DB::Time  The value
+     * @return db::Time  The value
-     * @throws std::bad_cast  If the value cannot be converted to DB::Time
+     * @throws std::bad_cast  If the value cannot be converted to db::Time
      */
     template <>
     Time get() const
@@ -657,9 +657,9 @@ public:
     /**
      * @brief Get the value as DateTime
      * 
-     * @tparam T              = DB::DateTime
+     * @tparam T              = db::DateTime
-     * @return DB::DateTime   The value
+     * @return db::DateTime   The value
-     * @throws std::bad_cast  If the value cannot be converted to DB::DateTime
+     * @throws std::bad_cast  If the value cannot be converted to db::DateTime
      */
     template <>
     DateTime get() const
@@ -682,9 +682,9 @@ public:
     /**
      * @brief Get the value as ByteArray
      * 
-     * @tparam T              = DB::ByteArray
+     * @tparam T              = db::ByteArray
-     * @return DB::ByteArray  The value
+     * @return db::ByteArray  The value
-     * @throws std::bad_cast  If the value cannot be converted to DB::ByteArray
+     * @throws std::bad_cast  If the value cannot be converted to db::ByteArray
      */
     template <>
     ByteArray get() const
@@ -725,4 +725,4 @@ public:
 
 };
 
-} // namespace DB
+} // namespace db