diff --git a/.clang-format b/.clang-format index 87c6c85..1290f65 100644 --- a/.clang-format +++ b/.clang-format @@ -1,55 +1,53 @@ # Documents: https://clang.llvm.org/docs/ClangFormatStyleOptions.html Language: Cpp -# BasedOnStyle: LLVM +BasedOnStyle: LLVM AccessModifierOffset: -4 AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: true +AlignConsecutiveAssignments: None +AlignConsecutiveDeclarations: None AlignOperands: Align -AlwaysBreakTemplateDeclarations : true +AlwaysBreakTemplateDeclarations: Yes AlignTrailingComments: true -AllowAllArgumentsOnNextLine : true +AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine : true +AllowShortBlocksOnASingleLine: Always AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: Inline AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false -AllowShortFunctionsOnASingleLine: false -AllowShortLambdasOnASingleLine: true +AllowShortFunctionsOnASingleLine: Empty +AllowShortLambdasOnASingleLine: All AllowShortEnumsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None BinPackArguments: true BinPackParameters: true ConstructorInitializerIndentWidth: 0 ConstructorInitializerAllOnOneLineOrOnePerLine: true -ColumnLimit: 0 +BreakBeforeConceptDeclarations: Always +RequiresClausePosition: OwnLine +ColumnLimit: 120 CommentPragmas: '^ IWYU pragma:' PointerAlignment: Left IndentWidth: 4 -SortIncludes: false +SortIncludes: Never MaxEmptyLinesToKeep: 2 SpacesInSquareBrackets: false -SpacesInParentheses : false +SpacesInParentheses: false SpaceBeforeAssignmentOperators: true SpacesInContainerLiterals: true IndentWrappedFunctionNames: true KeepEmptyLinesAtTheStartOfBlocks: true +SeparateDefinitionBlocks: Always BreakConstructorInitializersBeforeComma: true SpaceAfterCStyleCast: false IndentCaseLabels: true TabWidth: 4 UseTab: Never - BreakBeforeBraces: Custom BraceWrapping: # case 语句后面 AfterCaseLabel: false # class定义后面 AfterClass: false - # 控制语句后面 - AfterControlStatement: false # enum定义后面 AfterEnum: false # 函数定义后面 diff --git a/.clangd b/.clangd new file mode 100644 index 0000000..a6d90db --- /dev/null +++ b/.clangd @@ -0,0 +1,4 @@ +Diagnostics: + Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing"] +CompileFlags: + Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..6f96f6a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,194 @@ +name: Build + +on: + workflow_dispatch: + pull_request: + push: + +env: + BUILD_TYPE: Release + +jobs: + build: + name: Build +# runs-on: self-hosted + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3.2.0 + with: + fetch-depth: 1 + submodules: 'true' + + - name: Cache BDS libraries + id: cache-bds-lib + uses: actions/cache@v3 + env: + cache-name: cache-bds-lib + with: + path: | + ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_api.lib + ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_var.lib + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/LINK.txt') }} + + - name: Download BDS if not cached + if: steps.cache-bds-lib.outputs.cache-hit != 'true' + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + mkdir Tools/Server + ServerLink=$(cat 'scripts/LINK.txt') + curl -L -o Tools/Server/server.zip "$ServerLink" + unzip Tools/Server/server.zip -d Tools/Server/ > /dev/null + shell: bash + + - name: Build libraries if not cached + if: steps.cache-bds-lib.outputs.cache-hit != 'true' + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + cd Tools + LibraryBuilder.exe Server + mkdir ..\LiteLoader\lib + move bedrock_server_api.lib ..\LiteLoader\lib + move bedrock_server_var.lib ..\LiteLoader\lib + shell: cmd + + - name: Get short SHA + id: sha_short + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Set LITELOADER_VERSION_COMMIT_SHA + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + sed -r -i 's/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA ${{ steps.sha_short.outputs.sha_short }}\r/' LiteLoader/include/liteloader/Version.h + shell: bash + + - name: Configure CMake (MSVC) + run: | + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + shell: cmd + + - name: Build all + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + shell: cmd + + - name: Pack output + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target PackOutput + shell: cmd + + - name: Pack SDK on push event + if: github.event_name == 'push' + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target PackSDK + shell: cmd + + - name: Configure CMake (ClangCL) + run: | + cmake -B ${{github.workspace}}/build_clang -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T clangcl + shell: cmd + + - name: Build SymDBHelper + run: cmake --build ${{github.workspace}}/build_clang --config ${{env.BUILD_TYPE}} --target SymDBHelper + + - name: Compress resource packs for LiteLoaderBDS CUI on push event + if: github.event_name == 'push' + run: | + cd build/output/plugins/LiteLoader/ResourcePacks + 7z a LiteLoaderBDS-CUI.tar LiteLoaderBDS-CUI + rm -r LiteLoaderBDS-CUI + shell: bash + + - name: Update C++ SDK on push event + if: github.event_name == 'push' + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + cd scripts + ./UploadSDK.cmd action + env: + REPO_KEY: ${{secrets.PUSH_TOKEN}} + USERNAME: github-actions[bot] + shell: cmd + +# - name: Download LLMoney +# working-directory: ${{ env.GITHUB_WORKSPACE }} +# run: | +# git clone https://github.com/Tooth-Hub/LLMoney.git LLMoney-bin +# cp LLMoney-bin/LLMoney.dll build/output/plugins/ +# shell: bash + + - name: Upload LiteLoaderBDS + uses: actions/upload-artifact@v3.1.0 + with: + name: LiteLoaderBDS + path: | + ${{ github.workspace }}\build\output\LLPeEditor.exe + ${{ github.workspace }}\build\output\LLPreLoader.dll + ${{ github.workspace }}\build\output\LiteLoader.dll + ${{ github.workspace }}\build\output\plugins\lib\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar + ${{ github.workspace }}\build\output\plugins\LiteLoader\PermissionAPI.dll +# ${{ github.workspace }}\build\output\plugins\LLMoney.dll + + - name: Upload PeEditor + uses: actions/upload-artifact@v3.1.0 + with: + name: PeEditor + path: ${{ github.workspace }}\build\output\LLPeEditor.exe + + - name: Upload PreLoader + uses: actions/upload-artifact@v3.1.0 + with: + name: PreLoader + path: ${{ github.workspace }}\build\output\LLPreLoader.dll + + - name: Upload LiteLoader + uses: actions/upload-artifact@v3.1.0 + with: + name: LiteLoader + path: | + ${{ github.workspace }}\build\output\LiteLoader.dll + ${{ github.workspace }}\build\output\plugins\lib\*.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe + + - name: Upload ScriptEngine + uses: actions/upload-artifact@v3.1.0 + with: + name: ScriptEngine + path: | + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar + ${{ github.workspace }}\build\output\plugins\lib\package.json + + - name: Upload LLParticle + uses: actions/upload-artifact@v3.1.0 + with: + name: LLParticle + path: | + ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar + + - name: Upload LLPermission + uses: actions/upload-artifact@v3.1.0 + with: + name: LLPermission + path: ${{ github.workspace }}\build\output\plugins\LiteLoader\PermissionAPI.dll + + - name: Upload PDB files + uses: actions/upload-artifact@v3.1.0 + with: + name: PDB + path: ${{ github.workspace }}\build\pdb\ diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml deleted file mode 100644 index c34ffa9..0000000 --- a/.github/workflows/cmake.yml +++ /dev/null @@ -1,143 +0,0 @@ -name: CMake - -on: - push: - paths: - - '**.cpp' - - '**.cc' - - '**.cxx' - - '**.c' - - '**.hpp' - - '**.hh' - - '**.hxx' - - '**.h' - - '.github/workflows/cmake.yml' - - '**/CMakeLists.txt' - -env: - BUILD_TYPE: Release - -jobs: - build: - runs-on: windows-2022 - - steps: - - uses: actions/checkout@v3.0.2 - with: - fetch-depth: 1 - #submodules: 'true' - - - name: Cache Bedrock Dedicated Server Library - id: cache-bds-lib - uses: actions/cache@v3 - env: - cache-name: cache-bds-lib - with: - path: | - ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_api.lib - ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_var.lib - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Scripts/LINK.txt') }} - - - name: Download Server - if: steps.cache-bds-lib.outputs.cache-hit != 'true' - working-directory: ${{ env.GITHUB_WORKSPACE }} - run: | - mkdir Tools/Server - ServerLink=$(cat 'Scripts/LINK.txt') - curl -L -o Tools/Server/server.zip "$ServerLink" - unzip Tools/Server/server.zip -d Tools/Server/ > /dev/null - shell: bash - - - name: Build Library - if: steps.cache-bds-lib.outputs.cache-hit != 'true' - working-directory: ${{ env.GITHUB_WORKSPACE }} - run: | - cd Tools - LibraryBuilder.exe Server - shell: cmd - - - name: Change LITELOADER_VERSION_STATUS_BETA - working-directory: ${{ env.GITHUB_WORKSPACE }} - if: false == startsWith(github.ref, 'refs/tags/') - run: | - sed -r -i 's/#define\s+LITELOADER_VERSION_STATUS\s+LITELOADER_VERSION_\w+/#define LITELOADER_VERSION_STATUS LITELOADER_VERSION_BETA/' LiteLoader/Main/Version.h - sed -r -i 's/#define\s+LITELOADER_VERSION_ACTIONS\s+.*/#define LITELOADER_VERSION_ACTIONS ${{ github.run_number }}\r/' LiteLoader/Main/Version.h - cat LiteLoader/Main/Version.h - shell: bash - - - name: Change LITELOADER_VERSION_STATUS_RELEASE - working-directory: ${{ env.GITHUB_WORKSPACE }} - if: startsWith(github.ref, 'refs/tags/') - run: | - sed -r -i 's/#define\s+LITELOADER_VERSION_STATUS\s+LITELOADER_VERSION_\w+/#define LITELOADER_VERSION_STATUS LITELOADER_VERSION_RELEASE/' LiteLoader/Main/Version.h - sed -r -i 's/#define\s+LITELOADER_VERSION_ACTIONS\s+.*/#define LITELOADER_VERSION_ACTIONS ${{ github.run_number }}\r/' LiteLoader/Main/Version.h - shell: bash - - - name: Get MSVC Path - working-directory: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\ - run: echo "MSVC_VER=$(ls | tail -n 1)" >> $GITHUB_ENV - shell: bash - - - name: Configure CMake(MSVC) - run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - shell: cmd - - - name: Build - run: | - cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - shell: cmd - - - name: Configure CMake(ClangCL) - run: | - cmake -B ${{github.workspace}}/build_clang -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T clangcl - shell: cmd - - - name: Build SymDBHelper - run: cmake --build ${{github.workspace}}/build_clang --config ${{env.BUILD_TYPE}} --target SymDBHelper - - - name: Pack Release - working-directory: ${{ env.GITHUB_WORKSPACE }} - run: | - cd Scripts - ./PackRelease.cmd action - shell: cmd - - - name: Move PDB to path - working-directory: ${{ env.GITHUB_WORKSPACE }} - run: | - mkdir PDB - cp x64/Release/*.pdb PDB - shell: bash - - - name: Upload LiteLoader - uses: actions/upload-artifact@v3.1.0 - with: - name: LiteLoader - path: ${{ github.workspace }}\RELEASE\ - - - name: Upload PDB - uses: actions/upload-artifact@v3.1.0 - with: - name: PDB - path: ${{ github.workspace }}\PDB - - - name: Prepare for creating Release - working-directory: ${{ env.GITHUB_WORKSPACE }} - id: rel - if: startsWith(github.ref, 'refs/tags/') - run: | - echo ::set-output name=tag::${GITHUB_REF#refs/*/} - mv LiteLoader.zip LiteLoader-${GITHUB_REF#refs/*/}.zip - shell: bash - - - name: Create New Release - uses: softprops/action-gh-release@v0.1.14 - if: startsWith(github.ref, 'refs/tags/') - with: - body_path: ${{ github.workspace }}\CHANGELOG.md - files: | - ${{ github.workspace }}\LiteLoader-${{ steps.rel.outputs.tag }}.zip - ${{ github.workspace }}\PDB.zip - env: - GITHUB_REPOSITORY: quizhizhe/LiteLoaderBDS-1.16.40 \ No newline at end of file diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml new file mode 100644 index 0000000..5700463 --- /dev/null +++ b/.github/workflows/publish_release.yml @@ -0,0 +1,267 @@ +name: Release + +on: + workflow_dispatch: + inputs: + tag: + required: true + description: 'Release Tag' + status: + required: true + description: 'Release Status (beta, stable)' + +env: + BUILD_TYPE: Release + +jobs: + build: + name: Build + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3.2.0 + with: + fetch-depth: 1 + submodules: 'true' + + - name: Create tag + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + git tag | xargs git tag -d + git tag ${{ github.event.inputs.tag }} + git push origin ${{ github.event.inputs.tag }} + shell: bash + + - name: Cache BDS libraries + id: cache-bds-lib + uses: actions/cache@v3 + env: + cache-name: cache-bds-lib + with: + path: | + ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_api.lib + ${{ env.GITHUB_WORKSPACE }}LiteLoader/Lib/bedrock_server_var.lib + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/LINK.txt') }} + + - name: Download BDS if not cached + if: steps.cache-bds-lib.outputs.cache-hit != 'true' + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + mkdir Tools/Server + ServerLink=$(cat 'scripts/LINK.txt') + curl -L -o Tools/Server/server.zip "$ServerLink" + unzip Tools/Server/server.zip -d Tools/Server/ > /dev/null + shell: bash + + - name: Build libraries if not cached + if: steps.cache-bds-lib.outputs.cache-hit != 'true' + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + cd Tools + LibraryBuilder.exe Server + mkdir ..\LiteLoader\lib + move bedrock_server_api.lib ..\LiteLoader\lib + move bedrock_server_var.lib ..\LiteLoader\lib + shell: cmd + + - name: Get short SHA + id: sha_short + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Set LITELOADER_VERSION_COMMIT_SHA + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + sed -r -i 's/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA ${{ steps.sha_short.outputs.sha_short }}\r/' LiteLoader/include/liteloader/Version.h + shell: bash + + - name: Set LITELOADER_VERSION_STATUS_BETA + working-directory: ${{ env.GITHUB_WORKSPACE }} + if: github.event.inputs.status == 'beta' + run: | + sed -r -i 's/#define\s+LITELOADER_VERSION_STATUS\s+LITELOADER_VERSION_\w+/#define LITELOADER_VERSION_STATUS LITELOADER_VERSION_BETA/' LiteLoader/include/liteloader/Version.h + shell: bash + + - name: Set LITELOADER_VERSION_STATUS_RELEASE + working-directory: ${{ env.GITHUB_WORKSPACE }} + if: github.event.inputs.status == 'stable' + run: | + sed -r -i 's/#define\s+LITELOADER_VERSION_STATUS\s+LITELOADER_VERSION_\w+/#define LITELOADER_VERSION_STATUS LITELOADER_VERSION_RELEASE/' LiteLoader/include/liteloader/Version.h + shell: bash + + - name: Configure CMake (MSVC) + run: | + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + shell: cmd + + - name: Build all + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + shell: cmd + + - name: Pack output + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target PackOutput + shell: cmd + + - name: Pack SDK + run: | + cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target PackSDK + shell: cmd + + - name: Configure CMake (ClangCL) + run: | + cmake -B ${{github.workspace}}/build_clang -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T clangcl + shell: cmd + + - name: Build SymDBHelper + run: cmake --build ${{github.workspace}}/build_clang --config ${{env.BUILD_TYPE}} --target SymDBHelper + + - name: Compress resource packs for LiteLoaderBDS + run: | + cd build/output/plugins/LiteLoader/ResourcePacks + 7z a LiteLoaderBDS-CUI.tar LiteLoaderBDS-CUI + rm -r LiteLoaderBDS-CUI + shell: bash + + - name: Update C++ SDK + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + cd scripts + ./UploadSDK.cmd action release + env: + REPO_KEY: ${{secrets.PUSH_TOKEN}} + USERNAME: github-actions[bot] + shell: cmd + +# - name: Download LLMoney +# working-directory: ${{ env.GITHUB_WORKSPACE }} +# run: | +# git clone https://github.com/Tooth-Hub/LLMoney.git LLMoney-bin +# cp LLMoney-bin/LLMoney.dll build/output/plugins/ +# shell: bash + + - name: Upload LiteLoaderBDS + uses: actions/upload-artifact@v3.1.0 + with: + name: LiteLoaderBDS + path: | + ${{ github.workspace }}\build\output\LLPeEditor.exe + ${{ github.workspace }}\build\output\LLPreLoader.dll + ${{ github.workspace }}\build\output\LiteLoader.dll + ${{ github.workspace }}\build\output\plugins\lib\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar + ${{ github.workspace }}\build\output\plugins\LiteLoader\PermissionAPI.dll +# ${{ github.workspace }}\build\output\plugins\LLMoney.dll + + - name: Upload PeEditor + uses: actions/upload-artifact@v3.1.0 + with: + name: PeEditor + path: ${{ github.workspace }}\build\output\LLPeEditor.exe + + - name: Upload PreLoader + uses: actions/upload-artifact@v3.1.0 + with: + name: PreLoader + path: ${{ github.workspace }}\build\output\LLPreLoader.dll + + - name: Upload LiteLoader + uses: actions/upload-artifact@v3.1.0 + with: + name: LiteLoader + path: | + ${{ github.workspace }}\build\output\LiteLoader.dll + ${{ github.workspace }}\build\output\plugins\lib\*.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ + ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe + + - name: Upload ScriptEngine + uses: actions/upload-artifact@v3.1.0 + with: + name: ScriptEngine + path: | + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar + ${{ github.workspace }}\build\output\plugins\lib\package.json + + - name: Upload LLParticle + uses: actions/upload-artifact@v3.1.0 + with: + name: LLParticle + path: | + ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar + + - name: Upload LLPermission + uses: actions/upload-artifact@v3.1.0 + with: + name: LLPermission + path: ${{ github.workspace }}\build\output\plugins\LiteLoader\PermissionAPI.dll + + - name: Upload PDB files + uses: actions/upload-artifact@v3.1.0 + with: + name: PDB + path: ${{ github.workspace }}\build\pdb\ + + publish_release: + name: Publish release + needs: build + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + path: build/ + + - name: Pack artifacts + run: | + cd build/ + zip -9r LiteLoaderBDS.zip LiteLoaderBDS/* + zip -9r PDB.zip PDB/* + zip -9r Modules.zip PeEditor PreLoader LiteLoader ScriptEngine LLParticle LLPermission + shell: bash + + - name: Create release + if: github.event.inputs.status == 'stable' + uses: ncipollo/release-action@v1 + with: + prerelease: false + tag: ${{ github.event.inputs.tag }} + bodyFile: RELEASE_NOTES.md + artifacts: | + build/LiteLoaderBDS.zip + build/Modules.zip + build/PDB.zip + env: + GITHUB_REPOSITORY: quizhizhe/LiteLoaderBDS-1.16.40 + + - name: Create pre-release + if: github.event.inputs.status != 'stable' + uses: ncipollo/release-action@v1 + with: + prerelease: true + tag: ${{ github.event.inputs.tag }} + bodyFile: RELEASE_NOTES.md + artifacts: | + build/Modules.zip + build/PDB.zip + env: + GITHUB_REPOSITORY: quizhizhe/LiteLoaderBDS-1.16.40 diff --git a/.gitignore b/.gitignore index 8fed6d9..ea54988 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ **/bedrock_server_api.lib **/bedrock_server_var.lib **/SymDB_DelayLoadHelper.lib -LiteLoader/Lib/SymDBHelper.lib +LiteLoader/lib/SymDBHelper.lib **/*.lastcodeanalysissucceeded *.zip @@ -27,8 +27,8 @@ RELEASE/plugins/LiteLoader/pdb cmake-build-release/ /out -LiteLoader/Lib/Demangler.pdb -LiteLoader/Lib/Demangler.lib +LiteLoader/lib/Demangler.pdb +LiteLoader/lib/Demangler.lib /build **/Directory.build.props diff --git a/.gitmodules b/.gitmodules index ec5c972..a8b90a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ -[submodule "RELEASE/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"] - path = RELEASE/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI +[submodule "assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"] + path = assets/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 diff --git a/CMake/CleanOutput.cmake b/CMake/CleanOutput.cmake new file mode 100644 index 0000000..5bed533 --- /dev/null +++ b/CMake/CleanOutput.cmake @@ -0,0 +1,8 @@ +add_custom_target( + CleanOutput + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/output + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/pdb + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/sdk + COMMENT "Cleaning output/pdb/sdk directory" + VERBATIM +) diff --git a/CMake/PackOutput.cmake b/CMake/PackOutput.cmake new file mode 100644 index 0000000..ec868c4 --- /dev/null +++ b/CMake/PackOutput.cmake @@ -0,0 +1,29 @@ +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/pdb) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/output) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/output/plugins/LiteLoader/) + +add_custom_target(PackOutput) + +# Copy assets to output after build all. +add_custom_command( + TARGET PackOutput POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets/plugins ${CMAKE_BINARY_DIR}/output/plugins/ + COMMENT "Copying assets to output" + VERBATIM +) + +# Copy ScriptEngine BaseLib to output after build all. +add_custom_command( + TARGET PackOutput POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/ScriptEngine/assets ${CMAKE_BINARY_DIR}/output/plugins/lib/ + COMMENT "Copying ScriptEngine BaseLib to output" + VERBATIM +) + +# Copy LLPeEditor to output after build all. +add_custom_command( + TARGET PackOutput POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/LLPeEditor.exe ${CMAKE_BINARY_DIR}/output/ + COMMENT "Copying LLPeEditor to output" + VERBATIM +) diff --git a/CMake/PackSDK.cmake b/CMake/PackSDK.cmake new file mode 100644 index 0000000..263fc5d --- /dev/null +++ b/CMake/PackSDK.cmake @@ -0,0 +1,20 @@ +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/sdk) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/sdk/include) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/sdk/include/llapi) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/sdk/tools) +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/sdk/lib) + +add_custom_target(PackSDK) + +add_custom_command( + TARGET PackSDK POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LiteLoader_SOURCE_DIR}/include/llapi ${CMAKE_BINARY_DIR}/sdk/include/llapi + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LiteLoader_SOURCE_DIR}/third-party/include ${CMAKE_BINARY_DIR}/sdk/include + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/LibraryBuilder.exe ${CMAKE_BINARY_DIR}/sdk/tools/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/LLPeEditor.exe ${CMAKE_BINARY_DIR}/sdk/tools/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/SDK-submodule-add.cmd ${CMAKE_BINARY_DIR}/sdk/tools/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/SDK-submodule-update.cmd ${CMAKE_BINARY_DIR}/sdk/tools/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Tools/SDK-subtree.cmd ${CMAKE_BINARY_DIR}/sdk/tools/ + COMMENT "Copying SDK files" + VERBATIM +) diff --git a/CMakeLists.txt b/CMakeLists.txt index be4fb73..09c3bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,25 @@ cmake_minimum_required(VERSION 3.21) -project(LL-Parent) +project(LiteLoaderBDS) + +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) add_subdirectory(ScriptEngine/CMake/ScriptEngine-NodeJs) add_subdirectory(Tools/Demangler) -add_subdirectory(ScriptEngine/third-party/ScriptX/CMake/ScriptX-Lua) -add_subdirectory(ScriptEngine/third-party/ScriptX/CMake/ScriptX-QuickJs) -add_subdirectory(ScriptEngine/third-party/ScriptX/CMake/ScriptX-NodeJs) -add_subdirectory(Tools/SymDBHelper) \ No newline at end of file +add_subdirectory(Tools/ScriptX/CMake/ScriptX-Lua) +add_subdirectory(Tools/ScriptX/CMake/ScriptX-QuickJs) +add_subdirectory(Tools/ScriptX/CMake/ScriptX-NodeJs) +add_subdirectory(Tools/SymDBHelper) +add_subdirectory(ParticleAPI-1.16.40) +add_subdirectory(PermissionAPI-1.16.40/PermissionAPI) + +include(${CMAKE_SOURCE_DIR}/CMake/PackOutput.cmake) +include(${CMAKE_SOURCE_DIR}/CMake/PackSDK.cmake) +include(${CMAKE_SOURCE_DIR}/CMake/CleanOutput.cmake) \ No newline at end of file diff --git a/LLPreLoader/CMakeLists.txt b/LLPreLoader/CMakeLists.txt new file mode 100644 index 0000000..ab10e17 --- /dev/null +++ b/LLPreLoader/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.21) +project(LLPreLoader) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_BUILD_TYPE Release) + +add_definitions(-D"NDEBUG" -D"_WINDOWS" -D"_USRDLL" -D"_WINDLL" -D"_UNICODE" -D"UNICODE") + +add_compile_options( + /permissive- /GS /GL /W0 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise + /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column +) + +add_link_options( + /MANIFEST /LTCG:incremental /NXCOMPAT /DEBUG /DLL /MACHINE:X64 /OPT:REF /INCREMENTAL:NO + /SUBSYSTEM:WINDOWS /MANIFESTUAC:NO /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1 +) + +aux_source_directory(${PROJECT_SOURCE_DIR}/third-party/rawpdb DIR_LIB_SRCS) +aux_source_directory(${PROJECT_SOURCE_DIR}/src PROJECT_SRCS) +aux_source_directory(${PROJECT_SOURCE_DIR}/include PROJECT_INCLUDES) + +add_library(LLPreLoader SHARED ${PROJECT_INCLUDES} ${PROJECT_SRCS} ${DIR_LIB_SRCS}) +target_link_libraries( + LLPreLoader SymDBHelper Demangler + "${LiteLoader_SOURCE_DIR}/third-party/lib/detours/detours.lib" +) + +target_include_directories( + LLPreLoader + PRIVATE ${LiteLoader_SOURCE_DIR}/include + PRIVATE ${LiteLoader_SOURCE_DIR}/third-party/include + PRIVATE ${PROJECT_SOURCE_DIR}/include + PRIVATE ${PROJECT_SOURCE_DIR}/third-party + PRIVATE ${Demangler_SOURCE_DIR}/include +) + +# Copy the dll and pdb to the output directory +add_custom_command( + TARGET LLPreLoader POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/output/ + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/pdb/ + COMMENT "Copying dll and pdb to output directory" + VERBATIM +) \ No newline at end of file diff --git a/PreLoader/FakeSymbol.hpp b/LLPreLoader/include/FakeSymbol.hpp similarity index 98% rename from PreLoader/FakeSymbol.hpp rename to LLPreLoader/include/FakeSymbol.hpp index aded1c7..e5913a8 100644 --- a/PreLoader/FakeSymbol.hpp +++ b/LLPreLoader/include/FakeSymbol.hpp @@ -2,7 +2,7 @@ #include #include -#include "../Tools/Demangler/include/MicrosoftDemangle.h" +#include "MicrosoftDemangle.h" namespace FakeSymbol { diff --git a/PreLoader/Logger.h b/LLPreLoader/include/Logger.h similarity index 88% rename from PreLoader/Logger.h rename to LLPreLoader/include/Logger.h index 56d8240..c11113f 100644 --- a/PreLoader/Logger.h +++ b/LLPreLoader/include/Logger.h @@ -2,12 +2,12 @@ #ifndef FMT_HEADER_ONLY #define FMT_HEADER_ONLY #endif -#include "../LiteLoader/Header/third-party/FMT/chrono.h" -#include "../LiteLoader/Header/third-party/FMT/color.h" -#include "../LiteLoader/Header/third-party/FMT/core.h" -#include "../LiteLoader/Header/third-party/FMT/os.h" -#include "../LiteLoader/Header/third-party/FMT/format.h" -#include "../LiteLoader/Header/third-party/Nlohmann/json.hpp" +#include "FMT/chrono.h" +#include "FMT/color.h" +#include "FMT/core.h" +#include "FMT/os.h" +#include "FMT/format.h" +#include "Nlohmann/json.hpp" #include #include #include diff --git a/PreLoader/Utils.h b/LLPreLoader/include/Utils.h similarity index 100% rename from PreLoader/Utils.h rename to LLPreLoader/include/Utils.h diff --git a/PreLoader/pch.h b/LLPreLoader/include/pch.h similarity index 94% rename from PreLoader/pch.h rename to LLPreLoader/include/pch.h index df83bbe..2c75cbb 100644 --- a/PreLoader/pch.h +++ b/LLPreLoader/include/pch.h @@ -9,7 +9,7 @@ #endif #define WIN32_LEAN_AND_MEAN #define NOMINMAX -#include +#include #include #include #include diff --git a/PreLoader/PreLoader.cpp b/LLPreLoader/src/PreLoader.cpp similarity index 98% rename from PreLoader/PreLoader.cpp rename to LLPreLoader/src/PreLoader.cpp index d19310a..71317d6 100644 --- a/PreLoader/PreLoader.cpp +++ b/LLPreLoader/src/PreLoader.cpp @@ -1,9 +1,9 @@ -#include "pch.h" -#include "Logger.h" +#include "../include/pch.h" +#include "../include/Logger.h" #include #include #include -#include +#include using std::string; using std::wstring; diff --git a/PreLoader/SymDB.cpp b/LLPreLoader/src/SymDB.cpp similarity index 94% rename from PreLoader/SymDB.cpp rename to LLPreLoader/src/SymDB.cpp index 951d958..c0969af 100644 --- a/PreLoader/SymDB.cpp +++ b/LLPreLoader/src/SymDB.cpp @@ -1,4 +1,4 @@ -#include "pch.h" +#include "../include/pch.h" #include #include #include @@ -10,22 +10,22 @@ #include #include -#include "../LiteLoader/Header/Utils/Hash.h" -#include "../LiteLoader/Header/third-party/detours/detours.h" -#include "../LiteLoader/Lib/third-party/rawpdb/PDB.h" -#include "../LiteLoader/Lib/third-party/rawpdb/PDB_RawFile.h" -#include "../LiteLoader/Lib/third-party/rawpdb/PDB_InfoStream.h" -#include "../LiteLoader/Lib/third-party/rawpdb/PDB_DBIStream.h" -#include "../LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_DisableWarningsPop.h" +#include "llapi/utils/Hash.h" +#include "detours/detours.h" +#include "rawpdb/PDB.h" +#include "rawpdb/PDB_RawFile.h" +#include "rawpdb/PDB_InfoStream.h" +#include "rawpdb/PDB_DBIStream.h" +#include "rawpdb/Foundation/PDB_DisableWarningsPop.h" -#include "../LiteLoader/Header/third-party/parallel_hashmap/phmap.h" +#include "parallel_hashmap/phmap.h" #include "Logger.h" -#include "../LiteLoader/Header/third-party/FMT/printf.h" +#include "FMT/printf.h" #include #include "Utils.h" -#include "FakeSymbol.hpp" +#include "../include/FakeSymbol.hpp" using std::list; using std::string, std::string_view; diff --git a/PreLoader/Utils.cpp b/LLPreLoader/src/Utils.cpp similarity index 92% rename from PreLoader/Utils.cpp rename to LLPreLoader/src/Utils.cpp index 961f860..2773e2f 100644 --- a/PreLoader/Utils.cpp +++ b/LLPreLoader/src/Utils.cpp @@ -1,5 +1,5 @@ -#include "pch.h" -#include "Utils.h" +#include "../include/pch.h" +#include "../include/Utils.h" #include std::string GetCallerModuleFileName(unsigned long FramesToSkip) { static const int maxFrameCount = 1; diff --git a/PreLoader/dllmain.cpp b/LLPreLoader/src/dllmain.cpp similarity index 92% rename from PreLoader/dllmain.cpp rename to LLPreLoader/src/dllmain.cpp index 3c49bb4..6f3fb07 100644 --- a/PreLoader/dllmain.cpp +++ b/LLPreLoader/src/dllmain.cpp @@ -1,6 +1,6 @@ // dllmain.cpp : 定义 DLL 应用程序的入口点。 -#include "pch.h" -#include "Logger.h" +#include "../include/pch.h" +#include "../include/Logger.h" void fixUpLibDir(); void loadDlls(); #pragma comment(linker, "/export:GetServerSymbol=LLPreLoader.dlsym_real") diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_ArrayView.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_ArrayView.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_ArrayView.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_ArrayView.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Assert.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Assert.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Assert.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Assert.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_BitOperators.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_BitOperators.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_BitOperators.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_BitOperators.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_BitUtil.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_BitUtil.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_BitUtil.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_BitUtil.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_DisableWarningsPop.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_DisableWarningsPop.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_DisableWarningsPop.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_DisableWarningsPop.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_DisableWarningsPush.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_DisableWarningsPush.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_DisableWarningsPush.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_DisableWarningsPush.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Forward.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Forward.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Forward.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Forward.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Log.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Log.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Log.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Log.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Macros.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Macros.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Macros.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Macros.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Memory.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Memory.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Memory.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Memory.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Move.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Move.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Move.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Move.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Platform.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Platform.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Platform.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Platform.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_PointerUtil.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_PointerUtil.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_PointerUtil.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_PointerUtil.h diff --git a/LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Warnings.h b/LLPreLoader/third-party/rawpdb/Foundation/PDB_Warnings.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/Foundation/PDB_Warnings.h rename to LLPreLoader/third-party/rawpdb/Foundation/PDB_Warnings.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB.cpp b/LLPreLoader/third-party/rawpdb/PDB.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB.cpp rename to LLPreLoader/third-party/rawpdb/PDB.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB.h b/LLPreLoader/third-party/rawpdb/PDB.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB.h rename to LLPreLoader/third-party/rawpdb/PDB.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_CoalescedMSFStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_CoalescedMSFStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_CoalescedMSFStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_CoalescedMSFStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_CoalescedMSFStream.h b/LLPreLoader/third-party/rawpdb/PDB_CoalescedMSFStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_CoalescedMSFStream.h rename to LLPreLoader/third-party/rawpdb/PDB_CoalescedMSFStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DBIStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_DBIStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DBIStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_DBIStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DBIStream.h b/LLPreLoader/third-party/rawpdb/PDB_DBIStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DBIStream.h rename to LLPreLoader/third-party/rawpdb/PDB_DBIStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DBITypes.cpp b/LLPreLoader/third-party/rawpdb/PDB_DBITypes.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DBITypes.cpp rename to LLPreLoader/third-party/rawpdb/PDB_DBITypes.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DBITypes.h b/LLPreLoader/third-party/rawpdb/PDB_DBITypes.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DBITypes.h rename to LLPreLoader/third-party/rawpdb/PDB_DBITypes.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DirectMSFStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_DirectMSFStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DirectMSFStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_DirectMSFStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_DirectMSFStream.h b/LLPreLoader/third-party/rawpdb/PDB_DirectMSFStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_DirectMSFStream.h rename to LLPreLoader/third-party/rawpdb/PDB_DirectMSFStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ErrorCodes.h b/LLPreLoader/third-party/rawpdb/PDB_ErrorCodes.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ErrorCodes.h rename to LLPreLoader/third-party/rawpdb/PDB_ErrorCodes.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_GlobalSymbolStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_GlobalSymbolStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_GlobalSymbolStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_GlobalSymbolStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_GlobalSymbolStream.h b/LLPreLoader/third-party/rawpdb/PDB_GlobalSymbolStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_GlobalSymbolStream.h rename to LLPreLoader/third-party/rawpdb/PDB_GlobalSymbolStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_IPIStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_IPIStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_IPIStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_IPIStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_IPIStream.h b/LLPreLoader/third-party/rawpdb/PDB_IPIStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_IPIStream.h rename to LLPreLoader/third-party/rawpdb/PDB_IPIStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_IPITypes.h b/LLPreLoader/third-party/rawpdb/PDB_IPITypes.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_IPITypes.h rename to LLPreLoader/third-party/rawpdb/PDB_IPITypes.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ImageSectionStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_ImageSectionStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ImageSectionStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_ImageSectionStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ImageSectionStream.h b/LLPreLoader/third-party/rawpdb/PDB_ImageSectionStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ImageSectionStream.h rename to LLPreLoader/third-party/rawpdb/PDB_ImageSectionStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_InfoStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_InfoStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_InfoStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_InfoStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_InfoStream.h b/LLPreLoader/third-party/rawpdb/PDB_InfoStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_InfoStream.h rename to LLPreLoader/third-party/rawpdb/PDB_InfoStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ModuleInfoStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_ModuleInfoStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ModuleInfoStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_ModuleInfoStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ModuleInfoStream.h b/LLPreLoader/third-party/rawpdb/PDB_ModuleInfoStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ModuleInfoStream.h rename to LLPreLoader/third-party/rawpdb/PDB_ModuleInfoStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ModuleSymbolStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_ModuleSymbolStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ModuleSymbolStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_ModuleSymbolStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_ModuleSymbolStream.h b/LLPreLoader/third-party/rawpdb/PDB_ModuleSymbolStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_ModuleSymbolStream.h rename to LLPreLoader/third-party/rawpdb/PDB_ModuleSymbolStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_PCH.cpp b/LLPreLoader/third-party/rawpdb/PDB_PCH.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_PCH.cpp rename to LLPreLoader/third-party/rawpdb/PDB_PCH.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_PCH.h b/LLPreLoader/third-party/rawpdb/PDB_PCH.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_PCH.h rename to LLPreLoader/third-party/rawpdb/PDB_PCH.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_PublicSymbolStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_PublicSymbolStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_PublicSymbolStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_PublicSymbolStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_PublicSymbolStream.h b/LLPreLoader/third-party/rawpdb/PDB_PublicSymbolStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_PublicSymbolStream.h rename to LLPreLoader/third-party/rawpdb/PDB_PublicSymbolStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_RawFile.cpp b/LLPreLoader/third-party/rawpdb/PDB_RawFile.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_RawFile.cpp rename to LLPreLoader/third-party/rawpdb/PDB_RawFile.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_RawFile.h b/LLPreLoader/third-party/rawpdb/PDB_RawFile.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_RawFile.h rename to LLPreLoader/third-party/rawpdb/PDB_RawFile.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_SectionContributionStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_SectionContributionStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_SectionContributionStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_SectionContributionStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_SectionContributionStream.h b/LLPreLoader/third-party/rawpdb/PDB_SectionContributionStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_SectionContributionStream.h rename to LLPreLoader/third-party/rawpdb/PDB_SectionContributionStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_SourceFileStream.cpp b/LLPreLoader/third-party/rawpdb/PDB_SourceFileStream.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_SourceFileStream.cpp rename to LLPreLoader/third-party/rawpdb/PDB_SourceFileStream.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_SourceFileStream.h b/LLPreLoader/third-party/rawpdb/PDB_SourceFileStream.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_SourceFileStream.h rename to LLPreLoader/third-party/rawpdb/PDB_SourceFileStream.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_Types.cpp b/LLPreLoader/third-party/rawpdb/PDB_Types.cpp similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_Types.cpp rename to LLPreLoader/third-party/rawpdb/PDB_Types.cpp diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_Types.h b/LLPreLoader/third-party/rawpdb/PDB_Types.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_Types.h rename to LLPreLoader/third-party/rawpdb/PDB_Types.h diff --git a/LiteLoader/Lib/third-party/rawpdb/PDB_Util.h b/LLPreLoader/third-party/rawpdb/PDB_Util.h similarity index 100% rename from LiteLoader/Lib/third-party/rawpdb/PDB_Util.h rename to LLPreLoader/third-party/rawpdb/PDB_Util.h diff --git a/LiteLoader/.gitignore b/LiteLoader/.gitignore index 1127b8d..14ac266 100644 --- a/LiteLoader/.gitignore +++ b/LiteLoader/.gitignore @@ -2,4 +2,4 @@ /cmake-build-release/ /cmake-build-debug/ /.idea/ -Lib/LiteLoader.lib \ No newline at end of file +lib/LiteLoader.lib \ No newline at end of file diff --git a/LiteLoader/CMakeLists.txt b/LiteLoader/CMakeLists.txt index d6ffaff..4de8e0c 100644 --- a/LiteLoader/CMakeLists.txt +++ b/LiteLoader/CMakeLists.txt @@ -4,67 +4,90 @@ project(LiteLoader) set(CMAKE_CXX_STANDARD 20) set(CMAKE_BUILD_TYPE Release) # Always uses Release mode to build BDS plugin for ABI Compatibility -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}/Header/*.cpp - ${PROJECT_SOURCE_DIR}/Header/*.hpp - ${PROJECT_SOURCE_DIR}/Header/*.h - ${PROJECT_SOURCE_DIR}/Kernel/*.cpp - ${PROJECT_SOURCE_DIR}/Kernel/*.hpp - ${PROJECT_SOURCE_DIR}/Kernel/*.h - ${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 +file( + GLOB_RECURSE SRC_FILES + ${PROJECT_SOURCE_DIR}/third-party/include/*.h + ${PROJECT_SOURCE_DIR}/third-party/include/*.hpp + ${PROJECT_SOURCE_DIR}/include/*.h + ${PROJECT_SOURCE_DIR}/include/*.hpp + ${PROJECT_SOURCE_DIR}/src/*.cpp + ${PROJECT_SOURCE_DIR}/src/*.hpp + ${PROJECT_SOURCE_DIR}/src/*.h + ${PROJECT_SOURCE_DIR}/src/*.rc ) -add_definitions( - -DUNICODE -DNDEBUG -DLITELOADER_EXPORTS -DWIN32_LEAN_AND_MEAN - -DCPPHTTPLIB_OPENSSL_SUPPORT -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS - -D_USRDLL -D_AMD64_ -DNOMINMAX +# third-party source files +file(GLOB_RECURSE THIRD_PARTY_SRC_FILES ${PROJECT_SOURCE_DIR}/third-party/src/*) + +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( - /permissive /MP /analyze:external- /GS /GL /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise - /external:W1 /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHa /nologo /Ot /diagnostics:column - /utf-8 +target_compile_definitions( + LiteLoader + PRIVATE -DUNICODE -DNDEBUG -DLITELOADER_EXPORTS -DWIN32_LEAN_AND_MEAN -DCPPHTTPLIB_OPENSSL_SUPPORT -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -D_USRDLL -D_AMD64_ -DNOMINMAX ) -add_link_options( - /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 # use delayload to import BDS APIs manually(bedrock_server.dll does not need to exist) +# use delayload to import BDS APIs manually(bedrock_server.dll does not need to exist) +target_link_options( + LiteLoader + 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}) -include_directories(${PROJECT_SOURCE_DIR}/Header) -include_directories(${PROJECT_SOURCE_DIR}/Header/third-party) -include_directories(${CMAKE_SOURCE_DIR}) - -link_directories(${PROJECT_SOURCE_DIR}) -link_directories(${CMAKE_SOURCE_DIR}/x64/Release) - -add_library(LiteLoader SHARED ${SRC_FILES}) - -target_link_libraries(LiteLoader LLPreLoader - "${PROJECT_SOURCE_DIR}/Lib/third-party/leveldb/leveldb.lib" - "${PROJECT_SOURCE_DIR}/Lib/third-party/openssl/libcrypto.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" +target_link_libraries( + LiteLoader + "${PROJECT_SOURCE_DIR}/third-party/lib/leveldb/leveldb.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/openssl/libcrypto.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/openssl/libssl.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/SQLiteCpp/SQLiteCpp.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/SQLiteCpp/sqlite3.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/mysql/mysqlclient.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/compact_enc_det/ced.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dyncall_s.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dyncallback_s.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/dyncall/dynload_s.lib" + "${PROJECT_SOURCE_DIR}/third-party/lib/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 $ ${CMAKE_BINARY_DIR}/output/ + COMMAND ${CMAKE_COMMAND} -E copy $ ${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 $ ${CMAKE_BINARY_DIR}/sdk/lib/ + COMMENT "Copying LiteLoader Lib to SDK directory" + VERBATIM +) \ No newline at end of file diff --git a/LiteLoader/Header/Impl/ObjectivePacketHelper.h b/LiteLoader/Header/Impl/ObjectivePacketHelper.h deleted file mode 100644 index 5da8ea7..0000000 --- a/LiteLoader/Header/Impl/ObjectivePacketHelper.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "../Global.h" - -LIAPI uint64_t NewScoreId(); \ No newline at end of file diff --git a/LiteLoader/Header/third-party/entt/config/config.h b/LiteLoader/Header/third-party/entt/config/config.h deleted file mode 100644 index c2276c5..0000000 --- a/LiteLoader/Header/third-party/entt/config/config.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef ENTT_CONFIG_CONFIG_H -#define ENTT_CONFIG_CONFIG_H - - -#if defined(__cpp_exceptions) && !defined(ENTT_NOEXCEPTION) -# define ENTT_NOEXCEPT noexcept -# define ENTT_THROW throw -# define ENTT_TRY try -# define ENTT_CATCH catch(...) -#else -# define ENTT_NOEXCEPT -# define ENTT_THROW -# define ENTT_TRY if(true) -# define ENTT_CATCH if(false) -#endif - - -#if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606L -# include -# define ENTT_LAUNDER(expr) std::launder(expr) -#else -# define ENTT_LAUNDER(expr) expr -#endif - - -#ifndef ENTT_USE_ATOMIC -# define ENTT_MAYBE_ATOMIC(Type) Type -#else -# include -# define ENTT_MAYBE_ATOMIC(Type) std::atomic -#endif - - -#ifndef ENTT_ID_TYPE -# include -# define ENTT_ID_TYPE std::uint32_t -#endif - - -#ifdef ENTT_SPARSE_PAGE - static_assert(ENTT_SPARSE_PAGE && ((ENTT_SPARSE_PAGE & (ENTT_SPARSE_PAGE - 1)) == 0), "ENTT_SPARSE_PAGE must be a power of two"); -#else -# define ENTT_SPARSE_PAGE 4096 -#endif - - -#ifdef ENTT_PACKED_PAGE -static_assert(ENTT_PACKED_PAGE && ((ENTT_PACKED_PAGE & (ENTT_PACKED_PAGE - 1)) == 0), "ENTT_PACKED_PAGE must be a power of two"); -#else -# define ENTT_PACKED_PAGE 1024 -#endif - - -#ifdef ENTT_DISABLE_ASSERT -# undef ENTT_ASSERT -# define ENTT_ASSERT(...) (void(0)) -#elif !defined ENTT_ASSERT -# include -# define ENTT_ASSERT(condition, ...) assert(condition) -#endif - - -#ifdef ENTT_NO_ETO -# include -# define ENTT_IGNORE_IF_EMPTY std::false_type -#else -# include -# define ENTT_IGNORE_IF_EMPTY std::true_type -#endif - - -#ifndef ENTT_STANDARD_CPP -# if defined __clang__ || defined __GNUC__ -# define ENTT_PRETTY_FUNCTION __PRETTY_FUNCTION__ -# define ENTT_PRETTY_FUNCTION_PREFIX '=' -# define ENTT_PRETTY_FUNCTION_SUFFIX ']' -# elif defined _MSC_VER -# define ENTT_PRETTY_FUNCTION __FUNCSIG__ -# define ENTT_PRETTY_FUNCTION_PREFIX '<' -# define ENTT_PRETTY_FUNCTION_SUFFIX '>' -# endif -#endif - - -#endif diff --git a/LiteLoader/Header/third-party/entt/config/version.h b/LiteLoader/Header/third-party/entt/config/version.h deleted file mode 100644 index e7b9571..0000000 --- a/LiteLoader/Header/third-party/entt/config/version.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef ENTT_CONFIG_VERSION_H -#define ENTT_CONFIG_VERSION_H - - -#define ENTT_VERSION_MAJOR 3 -#define ENTT_VERSION_MINOR 8 -#define ENTT_VERSION_PATCH 1 - - -#endif diff --git a/LiteLoader/Header/third-party/entt/core/any.hpp b/LiteLoader/Header/third-party/entt/core/any.hpp deleted file mode 100644 index af3b35b..0000000 --- a/LiteLoader/Header/third-party/entt/core/any.hpp +++ /dev/null @@ -1,456 +0,0 @@ -#ifndef ENTT_CORE_ANY_HPP -#define ENTT_CORE_ANY_HPP - - -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/utility.hpp" -#include "fwd.hpp" -#include "type_info.hpp" -#include "type_traits.hpp" - - -namespace entt { - - -/** - * @brief A SBO friendly, type-safe container for single values of any type. - * @tparam Len Size of the storage reserved for the small buffer optimization. - * @tparam Align Optional alignment requirement. - */ -template -class basic_any { - enum class operation: std::uint8_t { COPY, MOVE, DTOR, COMP, ADDR, CADDR, TYPE }; - enum class policy: std::uint8_t { OWNER, REF, CREF }; - - using storage_type = std::aligned_storage_t; - using vtable_type = const void *(const operation, const basic_any &, void *); - - template - static constexpr bool in_situ = Len && alignof(Type) <= alignof(storage_type) && sizeof(Type) <= sizeof(storage_type) && std::is_nothrow_move_constructible_v; - - template - [[nodiscard]] static constexpr policy type_to_policy() { - if constexpr(std::is_lvalue_reference_v) { - if constexpr(std::is_const_v>) { - return policy::CREF; - } else { - return policy::REF; - } - } else { - return policy::OWNER; - } - } - - template - [[nodiscard]] static bool compare(const void *lhs, const void *rhs) { - if constexpr(!std::is_function_v && is_equality_comparable_v) { - return *static_cast(lhs) == *static_cast(rhs); - } else { - return lhs == rhs; - } - } - - template - static const void * basic_vtable([[maybe_unused]] const operation op, [[maybe_unused]] const basic_any &from, [[maybe_unused]] void *to) { - static_assert(std::is_same_v>, Type>, "Invalid type"); - - if constexpr(!std::is_void_v) { - const Type *instance = (in_situ && from.mode == policy::OWNER) - ? ENTT_LAUNDER(reinterpret_cast(&from.storage)) - : static_cast(from.instance); - - switch(op) { - case operation::COPY: - if constexpr(std::is_copy_constructible_v) { - static_cast(to)->emplace(*instance); - } - break; - case operation::MOVE: - if constexpr(in_situ) { - if(from.mode == policy::OWNER) { - return new (&static_cast(to)->storage) Type{std::move(*const_cast(instance))}; - } - } - - return (static_cast(to)->instance = std::exchange(const_cast(from).instance, nullptr)); - case operation::DTOR: - if(from.mode == policy::OWNER) { - if constexpr(in_situ) { - instance->~Type(); - } else if constexpr(std::is_array_v) { - delete[] instance; - } else { - delete instance; - } - } - break; - case operation::COMP: - return compare(instance, (*static_cast(to))->data()) ? to : nullptr; - case operation::ADDR: - if(from.mode == policy::CREF) { - return nullptr; - } - [[fallthrough]]; - case operation::CADDR: - return instance; - case operation::TYPE: - *static_cast(to) = type_id(); - break; - } - } - - return nullptr; - } - - template - void initialize([[maybe_unused]] Args &&... args) { - if constexpr(!std::is_void_v) { - if constexpr(std::is_lvalue_reference_v) { - static_assert(sizeof...(Args) == 1u && (std::is_lvalue_reference_v && ...), "Invalid arguments"); - instance = (std::addressof(args), ...); - } else if constexpr(in_situ) { - if constexpr(sizeof...(Args) != 0u && std::is_aggregate_v) { - new (&storage) Type{std::forward(args)...}; - } else { - new (&storage) Type(std::forward(args)...); - } - } else { - if constexpr(sizeof...(Args) != 0u && std::is_aggregate_v) { - instance = new Type{std::forward(args)...}; - } else { - instance = new Type(std::forward(args)...); - } - } - } - } - - basic_any(const basic_any &other, const policy pol) ENTT_NOEXCEPT - : instance{other.data()}, - vtable{other.vtable}, - mode{pol} - {} - -public: - /*! @brief Size of the internal storage. */ - static constexpr auto length = Len; - /*! @brief Alignment requirement. */ - static constexpr auto alignment = Align; - - /*! @brief Default constructor. */ - basic_any() ENTT_NOEXCEPT - : instance{}, - vtable{&basic_vtable}, - mode{policy::OWNER} - {} - - /** - * @brief Constructs a wrapper by directly initializing the new object. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - */ - template - explicit basic_any(std::in_place_type_t, Args &&... args) - : instance{}, - vtable{&basic_vtable>>}, - mode{type_to_policy()} - { - initialize(std::forward(args)...); - } - - /** - * @brief Constructs a wrapper that holds an unmanaged object. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - */ - template - basic_any(std::reference_wrapper value) ENTT_NOEXCEPT - : basic_any{} - { - // invokes deprecated assignment operator (and avoids issues with vs2017) - *this = value; - } - - /** - * @brief Constructs a wrapper from a given value. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - */ - template, basic_any>>> - basic_any(Type &&value) - : instance{}, - vtable{&basic_vtable>}, - mode{policy::OWNER} - { - initialize>(std::forward(value)); - } - - /** - * @brief Copy constructor. - * @param other The instance to copy from. - */ - basic_any(const basic_any &other) - : instance{}, - vtable{&basic_vtable}, - mode{policy::OWNER} - { - other.vtable(operation::COPY, other, this); - } - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - basic_any(basic_any &&other) ENTT_NOEXCEPT - : instance{}, - vtable{other.vtable}, - mode{other.mode} - { - vtable(operation::MOVE, other, this); - } - - /*! @brief Frees the internal storage, whatever it means. */ - ~basic_any() { - vtable(operation::DTOR, *this, nullptr); - } - - /** - * @brief Copy assignment operator. - * @param other The instance to copy from. - * @return This any object. - */ - basic_any & operator=(const basic_any &other) { - reset(); - other.vtable(operation::COPY, other, this); - return *this; - } - - /** - * @brief Move assignment operator. - * @param other The instance to move from. - * @return This any object. - */ - basic_any & operator=(basic_any &&other) ENTT_NOEXCEPT { - std::exchange(vtable, other.vtable)(operation::DTOR, *this, nullptr); - other.vtable(operation::MOVE, other, this); - mode = other.mode; - return *this; - } - - /** - * @brief Value assignment operator. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - * @return This any object. - */ - template - [[deprecated("Use std::in_place_type, entt::make_any, emplace or forward_as_any instead")]] - basic_any & operator=(std::reference_wrapper value) ENTT_NOEXCEPT { - emplace(value.get()); - return *this; - } - - /** - * @brief Value assignment operator. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - * @return This any object. - */ - template - std::enable_if_t, basic_any>, basic_any &> - operator=(Type &&value) { - emplace>(std::forward(value)); - return *this; - } - - /** - * @brief Returns the type of the contained object. - * @return The type of the contained object, if any. - */ - [[nodiscard]] type_info type() const ENTT_NOEXCEPT { - type_info info{}; - vtable(operation::TYPE, *this, &info); - return info; - } - - /** - * @brief Returns an opaque pointer to the contained instance. - * @return An opaque pointer the contained instance, if any. - */ - [[nodiscard]] const void * data() const ENTT_NOEXCEPT { - return vtable(operation::CADDR, *this, nullptr); - } - - /*! @copydoc data */ - [[nodiscard]] void * data() ENTT_NOEXCEPT { - return const_cast(vtable(operation::ADDR, *this, nullptr)); - } - - /** - * @brief Replaces the contained object by creating a new instance directly. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - */ - template - void emplace(Args &&... args) { - std::exchange(vtable, &basic_vtable>>)(operation::DTOR, *this, nullptr); - mode = type_to_policy(); - initialize(std::forward(args)...); - } - - /*! @brief Destroys contained object */ - void reset() { - std::exchange(vtable, &basic_vtable)(operation::DTOR, *this, nullptr); - mode = policy::OWNER; - } - - /** - * @brief Returns false if a wrapper is empty, true otherwise. - * @return False if the wrapper is empty, true otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(vtable(operation::CADDR, *this, nullptr) == nullptr); - } - - /** - * @brief Checks if two wrappers differ in their content. - * @param other Wrapper with which to compare. - * @return False if the two objects differ in their content, true otherwise. - */ - bool operator==(const basic_any &other) const ENTT_NOEXCEPT { - const basic_any *trampoline = &other; - return type() == other.type() && (vtable(operation::COMP, *this, &trampoline) || !other.data()); - } - - /** - * @brief Aliasing constructor. - * @return A wrapper that shares a reference to an unmanaged object. - */ - [[nodiscard]] basic_any as_ref() ENTT_NOEXCEPT { - return basic_any{*this, (mode == policy::CREF ? policy::CREF : policy::REF)}; - } - - /*! @copydoc as_ref */ - [[nodiscard]] basic_any as_ref() const ENTT_NOEXCEPT { - return basic_any{*this, policy::CREF}; - } - - /** - * @brief Returns true if a wrapper owns its object, false otherwise. - * @return True if the wrapper owns its object, false otherwise. - */ - [[nodiscard]] bool owner() const ENTT_NOEXCEPT { - return (mode == policy::OWNER); - } - -private: - union { const void *instance; storage_type storage; }; - vtable_type *vtable; - policy mode; -}; - - -/** - * @brief Checks if two wrappers differ in their content. - * @tparam Len Size of the storage reserved for the small buffer optimization. - * @tparam Align Alignment requirement. - * @param lhs A wrapper, either empty or not. - * @param rhs A wrapper, either empty or not. - * @return True if the two wrappers differ in their content, false otherwise. - */ -template -[[nodiscard]] inline bool operator!=(const basic_any &lhs, const basic_any &rhs) ENTT_NOEXCEPT { - return !(lhs == rhs); -} - - -/** - * @brief Performs type-safe access to the contained object. - * @tparam Type Type to which conversion is required. - * @tparam Len Size of the storage reserved for the small buffer optimization. - * @tparam Align Alignment requirement. - * @param data Target any object. - * @return The element converted to the requested type. - */ -template -Type any_cast(const basic_any &data) ENTT_NOEXCEPT { - const auto * const instance = any_cast>(&data); - ENTT_ASSERT(instance, "Invalid instance"); - return static_cast(*instance); -} - - -/*! @copydoc any_cast */ -template -Type any_cast(basic_any &data) ENTT_NOEXCEPT { - // forces const on non-reference types to make them work also with wrappers for const references - auto * const instance = any_cast>(&data); - ENTT_ASSERT(instance, "Invalid instance"); - return static_cast(*instance); -} - - -/*! @copydoc any_cast */ -template -Type any_cast(basic_any &&data) ENTT_NOEXCEPT { - // forces const on non-reference types to make them work also with wrappers for const references - auto * const instance = any_cast>(&data); - ENTT_ASSERT(instance, "Invalid instance"); - return static_cast(std::move(*instance)); -} - - -/*! @copydoc any_cast */ -template -const Type * any_cast(const basic_any *data) ENTT_NOEXCEPT { - return (data->type() == type_id() ? static_cast(data->data()) : nullptr); -} - - -/*! @copydoc any_cast */ -template -Type * any_cast(basic_any *data) ENTT_NOEXCEPT { - // last attempt to make wrappers for const references return their values - return (data->type() == type_id() ? static_cast(static_cast, Type> *>(data)->data()) : nullptr); -} - - -/** - * @brief Constructs a wrapper from a given type, passing it all arguments. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Len Size of the storage reserved for the small buffer optimization. - * @tparam Align Optional alignment requirement. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - * @return A properly initialized wrapper for an object of the given type. - */ -template::length, std::size_t Align = basic_any::alignment, typename... Args> -basic_any make_any(Args &&... args) { - return basic_any{std::in_place_type, std::forward(args)...}; -} - - -/** - * @brief Forwards its argument and avoids copies for lvalue references. - * @tparam Len Size of the storage reserved for the small buffer optimization. - * @tparam Align Optional alignment requirement. - * @tparam Type Type of argument to use to construct the new instance. - * @param value Parameter to use to construct the instance. - * @return A properly initialized and not necessarily owning wrapper. - */ -template::length, std::size_t Align = basic_any::alignment, typename Type> -basic_any forward_as_any(Type &&value) { - return basic_any{std::in_place_type, std::decay_t, Type>>, std::forward(value)}; -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/core/attribute.h b/LiteLoader/Header/third-party/entt/core/attribute.h deleted file mode 100644 index 4a7a092..0000000 --- a/LiteLoader/Header/third-party/entt/core/attribute.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef ENTT_CORE_ATTRIBUTE_H -#define ENTT_CORE_ATTRIBUTE_H - - -#ifndef ENTT_EXPORT -# if defined _WIN32 || defined __CYGWIN__ || defined _MSC_VER -# define ENTT_EXPORT __declspec(dllexport) -# define ENTT_IMPORT __declspec(dllimport) -# define ENTT_HIDDEN -# elif defined __GNUC__ && __GNUC__ >= 4 -# define ENTT_EXPORT __attribute__((visibility("default"))) -# define ENTT_IMPORT __attribute__((visibility("default"))) -# define ENTT_HIDDEN __attribute__((visibility("hidden"))) -# else /* Unsupported compiler */ -# define ENTT_EXPORT -# define ENTT_IMPORT -# define ENTT_HIDDEN -# endif -#endif - - -#ifndef ENTT_API -# if defined ENTT_API_EXPORT -# define ENTT_API ENTT_EXPORT -# elif defined ENTT_API_IMPORT -# define ENTT_API ENTT_IMPORT -# else /* No API */ -# define ENTT_API -# endif -#endif - - -#endif diff --git a/LiteLoader/Header/third-party/entt/core/hashed_string.hpp b/LiteLoader/Header/third-party/entt/core/hashed_string.hpp deleted file mode 100644 index 978d2cb..0000000 --- a/LiteLoader/Header/third-party/entt/core/hashed_string.hpp +++ /dev/null @@ -1,269 +0,0 @@ -#ifndef ENTT_CORE_HASHED_STRING_HPP -#define ENTT_CORE_HASHED_STRING_HPP - - -#include -#include -#include "../config/config.h" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -template -struct fnv1a_traits; - - -template<> -struct fnv1a_traits { - using type = std::uint32_t; - static constexpr std::uint32_t offset = 2166136261; - static constexpr std::uint32_t prime = 16777619; -}; - - -template<> -struct fnv1a_traits { - using type = std::uint64_t; - static constexpr std::uint64_t offset = 14695981039346656037ull; - static constexpr std::uint64_t prime = 1099511628211ull; -}; - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -/** - * @brief Zero overhead unique identifier. - * - * A hashed string is a compile-time tool that allows users to use - * human-readable identifers in the codebase while using their numeric - * counterparts at runtime.
- * Because of that, a hashed string can also be used in constant expressions if - * required. - * - * @tparam Char Character type. - */ -template -class basic_hashed_string { - using traits_type = internal::fnv1a_traits; - - struct const_wrapper { - // non-explicit constructor on purpose - constexpr const_wrapper(const Char *curr) ENTT_NOEXCEPT: str{curr} {} - const Char *str; - }; - - // Fowler–Noll–Vo hash function v. 1a - the good - [[nodiscard]] static constexpr id_type helper(const Char *curr) ENTT_NOEXCEPT { - auto value = traits_type::offset; - - while(*curr != 0) { - value = (value ^ static_cast(*(curr++))) * traits_type::prime; - } - - return value; - } - -public: - /*! @brief Character type. */ - using value_type = Char; - /*! @brief Unsigned integer type. */ - using hash_type = id_type; - - /** - * @brief Returns directly the numeric representation of a string view. - * @param str Human-readable identifer. - * @param size Length of the string to hash. - * @return The numeric representation of the string. - */ - [[nodiscard]] static constexpr hash_type value(const value_type *str, std::size_t size) ENTT_NOEXCEPT { - id_type partial{traits_type::offset}; - while(size--) { partial = (partial^(str++)[0])*traits_type::prime; } - return partial; - } - - /** - * @brief Returns directly the numeric representation of a string. - * - * Forcing template resolution avoids implicit conversions. An - * human-readable identifier can be anything but a plain, old bunch of - * characters.
- * Example of use: - * @code{.cpp} - * const auto value = basic_hashed_string::to_value("my.png"); - * @endcode - * - * @tparam N Number of characters of the identifier. - * @param str Human-readable identifer. - * @return The numeric representation of the string. - */ - template - [[nodiscard]] static constexpr hash_type value(const value_type (&str)[N]) ENTT_NOEXCEPT { - return helper(str); - } - - /** - * @brief Returns directly the numeric representation of a string. - * @param wrapper Helps achieving the purpose by relying on overloading. - * @return The numeric representation of the string. - */ - [[nodiscard]] static hash_type value(const_wrapper wrapper) ENTT_NOEXCEPT { - return helper(wrapper.str); - } - - /*! @brief Constructs an empty hashed string. */ - constexpr basic_hashed_string() ENTT_NOEXCEPT - : str{nullptr}, hash{} - {} - - /** - * @brief Constructs a hashed string from an array of const characters. - * - * Forcing template resolution avoids implicit conversions. An - * human-readable identifier can be anything but a plain, old bunch of - * characters.
- * Example of use: - * @code{.cpp} - * basic_hashed_string hs{"my.png"}; - * @endcode - * - * @tparam N Number of characters of the identifier. - * @param curr Human-readable identifer. - */ - template - constexpr basic_hashed_string(const value_type (&curr)[N]) ENTT_NOEXCEPT - : str{curr}, hash{helper(curr)} - {} - - /** - * @brief Explicit constructor on purpose to avoid constructing a hashed - * string directly from a `const value_type *`. - * @param wrapper Helps achieving the purpose by relying on overloading. - */ - explicit constexpr basic_hashed_string(const_wrapper wrapper) ENTT_NOEXCEPT - : str{wrapper.str}, hash{helper(wrapper.str)} - {} - - /** - * @brief Returns the human-readable representation of a hashed string. - * @return The string used to initialize the instance. - */ - [[nodiscard]] constexpr const value_type * data() const ENTT_NOEXCEPT { - return str; - } - - /** - * @brief Returns the numeric representation of a hashed string. - * @return The numeric representation of the instance. - */ - [[nodiscard]] constexpr hash_type value() const ENTT_NOEXCEPT { - return hash; - } - - /*! @copydoc data */ - [[nodiscard]] constexpr operator const value_type *() const ENTT_NOEXCEPT { return data(); } - - /** - * @brief Returns the numeric representation of a hashed string. - * @return The numeric representation of the instance. - */ - [[nodiscard]] constexpr operator hash_type() const ENTT_NOEXCEPT { return value(); } - - /** - * @brief Compares two hashed strings. - * @param other Hashed string with which to compare. - * @return True if the two hashed strings are identical, false otherwise. - */ - [[nodiscard]] constexpr bool operator==(const basic_hashed_string &other) const ENTT_NOEXCEPT { - return hash == other.hash; - } - -private: - const value_type *str; - hash_type hash; -}; - - -/** - * @brief Deduction guide. - * - * It allows to deduce the character type of the hashed string directly from a - * human-readable identifer provided to the constructor. - * - * @tparam Char Character type. - * @tparam N Number of characters of the identifier. - * @param str Human-readable identifer. - */ -template -basic_hashed_string(const Char (&str)[N]) --> basic_hashed_string; - - -/** - * @brief Compares two hashed strings. - * @tparam Char Character type. - * @param lhs A valid hashed string. - * @param rhs A valid hashed string. - * @return True if the two hashed strings are identical, false otherwise. - */ -template -[[nodiscard]] constexpr bool operator!=(const basic_hashed_string &lhs, const basic_hashed_string &rhs) ENTT_NOEXCEPT { - return !(lhs == rhs); -} - - -/*! @brief Aliases for common character types. */ -using hashed_string = basic_hashed_string; - - -/*! @brief Aliases for common character types. */ -using hashed_wstring = basic_hashed_string; - - -inline namespace literals { - - -/** - * @brief User defined literal for hashed strings. - * @param str The literal without its suffix. - * @return A properly initialized hashed string. - */ -[[nodiscard]] constexpr entt::hashed_string operator"" _hs(const char *str, std::size_t) ENTT_NOEXCEPT { - return entt::hashed_string{str}; -} - - -/** - * @brief User defined literal for hashed wstrings. - * @param str The literal without its suffix. - * @return A properly initialized hashed wstring. - */ -[[nodiscard]] constexpr entt::hashed_wstring operator"" _hws(const wchar_t *str, std::size_t) ENTT_NOEXCEPT { - return entt::hashed_wstring{str}; -} - - -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/core/ident.hpp b/LiteLoader/Header/third-party/entt/core/ident.hpp deleted file mode 100644 index 9b89d52..0000000 --- a/LiteLoader/Header/third-party/entt/core/ident.hpp +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef ENTT_CORE_IDENT_HPP -#define ENTT_CORE_IDENT_HPP - - -#include -#include -#include -#include "../config/config.h" -#include "fwd.hpp" -#include "type_traits.hpp" - - -namespace entt { - - -/** - * @brief Types identifiers. - * - * Variable template used to generate identifiers at compile-time for the given - * types. Use the `get` member function to know what's the identifier associated - * to the specific type. - * - * @note - * Identifiers are constant expression and can be used in any context where such - * an expression is required. As an example: - * @code{.cpp} - * using id = entt::identifier; - * - * switch(a_type_identifier) { - * case id::type: - * // ... - * break; - * case id::type: - * // ... - * break; - * default: - * // ... - * } - * @endcode - * - * @tparam Types List of types for which to generate identifiers. - */ -template -class identifier { - template - [[nodiscard]] static constexpr id_type get(std::index_sequence) { - static_assert(std::disjunction_v...>, "Invalid type"); - return (0 + ... + (std::is_same_v...>>> ? id_type{Index} : id_type{})); - } - -public: - /*! @brief Unsigned integer type. */ - using identifier_type = id_type; - - /*! @brief Statically generated unique identifier for the given type. */ - template - static constexpr identifier_type type = get>(std::index_sequence_for{}); -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/core/type_info.hpp b/LiteLoader/Header/third-party/entt/core/type_info.hpp deleted file mode 100644 index ea04869..0000000 --- a/LiteLoader/Header/third-party/entt/core/type_info.hpp +++ /dev/null @@ -1,260 +0,0 @@ -#ifndef ENTT_CORE_TYPE_INFO_HPP -#define ENTT_CORE_TYPE_INFO_HPP - - -#include -#include -#include "../config/config.h" -#include "../core/attribute.h" -#include "hashed_string.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -struct ENTT_API type_seq final { - [[nodiscard]] static id_type next() ENTT_NOEXCEPT { - static ENTT_MAYBE_ATOMIC(id_type) value{}; - return value++; - } -}; - - -template -[[nodiscard]] constexpr auto stripped_type_name() ENTT_NOEXCEPT { -#if defined ENTT_PRETTY_FUNCTION - std::string_view pretty_function{ENTT_PRETTY_FUNCTION}; - auto first = pretty_function.find_first_not_of(' ', pretty_function.find_first_of(ENTT_PRETTY_FUNCTION_PREFIX)+1); - auto value = pretty_function.substr(first, pretty_function.find_last_of(ENTT_PRETTY_FUNCTION_SUFFIX) - first); - return value; -#else - return std::string_view{""}; -#endif -} - - -template().find_first_of('.')> -[[nodiscard]] static constexpr std::string_view type_name(int) ENTT_NOEXCEPT { - constexpr auto value = stripped_type_name(); - return value; -} - - -template -[[nodiscard]] static std::string_view type_name(char) ENTT_NOEXCEPT { - static const auto value = stripped_type_name(); - return value; -} - - -template().find_first_of('.')> -[[nodiscard]] static constexpr id_type type_hash(int) ENTT_NOEXCEPT { - constexpr auto stripped = stripped_type_name(); - constexpr auto value = hashed_string::value(stripped.data(), stripped.size()); - return value; -} - - -template -[[nodiscard]] static id_type type_hash(char) ENTT_NOEXCEPT { - static const auto value = [](const auto stripped) { - return hashed_string::value(stripped.data(), stripped.size()); - }(stripped_type_name()); - return value; -} - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -/** - * @brief Type sequential identifier. - * @tparam Type Type for which to generate a sequential identifier. - */ -template -struct ENTT_API type_seq final { - /** - * @brief Returns the sequential identifier of a given type. - * @return The sequential identifier of a given type. - */ - [[nodiscard]] static id_type value() ENTT_NOEXCEPT { - static const id_type value = internal::type_seq::next(); - return value; - } - - /*! @copydoc value */ - [[nodiscard]] constexpr operator id_type() const ENTT_NOEXCEPT { return value(); } -}; - - -/** - * @brief Type hash. - * @tparam Type Type for which to generate a hash value. - */ -template -struct type_hash final { - /** - * @brief Returns the numeric representation of a given type. - * @return The numeric representation of the given type. - */ -#if defined ENTT_PRETTY_FUNCTION - [[nodiscard]] static constexpr id_type value() ENTT_NOEXCEPT { - return internal::type_hash(0); -#else - [[nodiscard]] static constexpr id_type value() ENTT_NOEXCEPT { - return type_seq::value(); -#endif - } - - /*! @copydoc value */ - [[nodiscard]] constexpr operator id_type() const ENTT_NOEXCEPT { return value(); } -}; - - -/** - * @brief Type name. - * @tparam Type Type for which to generate a name. - */ -template -struct type_name final { - /** - * @brief Returns the name of a given type. - * @return The name of the given type. - */ - [[nodiscard]] static constexpr std::string_view value() ENTT_NOEXCEPT { - return internal::type_name(0); - } - - /*! @copydoc value */ - [[nodiscard]] constexpr operator std::string_view() const ENTT_NOEXCEPT { return value(); } -}; - - -/*! @brief Implementation specific information about a type. */ -class type_info final { - template - friend type_info type_id() ENTT_NOEXCEPT; - - type_info(id_type seq_v, id_type hash_v, std::string_view name_v) ENTT_NOEXCEPT - : seq_value{seq_v}, - hash_value{hash_v}, - name_value{name_v} - {} - -public: - /*! @brief Default constructor. */ - type_info() ENTT_NOEXCEPT - : type_info({}, {}, {}) - {} - - /*! @brief Default copy constructor. */ - type_info(const type_info &) ENTT_NOEXCEPT = default; - /*! @brief Default move constructor. */ - type_info(type_info &&) ENTT_NOEXCEPT = default; - - /** - * @brief Default copy assignment operator. - * @return This type info object. - */ - type_info & operator=(const type_info &) ENTT_NOEXCEPT = default; - - /** - * @brief Default move assignment operator. - * @return This type info object. - */ - type_info & operator=(type_info &&) ENTT_NOEXCEPT = default; - - /** - * @brief Checks if a type info object is properly initialized. - * @return True if the object is properly initialized, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return name_value.data() != nullptr; - } - - /** - * @brief Type sequential identifier. - * @return Type sequential identifier. - */ - [[nodiscard]] id_type seq() const ENTT_NOEXCEPT { - return seq_value; - } - - /** - * @brief Type hash. - * @return Type hash. - */ - [[nodiscard]] id_type hash() const ENTT_NOEXCEPT { - return hash_value; - } - - /** - * @brief Type name. - * @return Type name. - */ - [[nodiscard]] std::string_view name() const ENTT_NOEXCEPT { - return name_value; - } - - /** - * @brief Compares the contents of two type info objects. - * @param other Object with which to compare. - * @return False if the two contents differ, true otherwise. - */ - [[nodiscard]] bool operator==(const type_info &other) const ENTT_NOEXCEPT { - return hash_value == other.hash_value; - } - -private: - id_type seq_value; - id_type hash_value; - std::string_view name_value; -}; - - -/** - * @brief Compares the contents of two type info objects. - * @param lhs A type info object. - * @param rhs A type info object. - * @return True if the two contents differ, false otherwise. - */ -[[nodiscard]] inline bool operator!=(const type_info &lhs, const type_info &rhs) ENTT_NOEXCEPT { - return !(lhs == rhs); -} - - -/** - * @brief Returns the type info object for a given type. - * @tparam Type Type for which to generate a type info object. - * @return The type info object for the given type. - */ -template -[[nodiscard]] type_info type_id() ENTT_NOEXCEPT { - return type_info{ - type_seq>>::value(), - type_hash>>::value(), - type_name>>::value() - }; -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/component.hpp b/LiteLoader/Header/third-party/entt/entity/component.hpp deleted file mode 100644 index 67aa54a..0000000 --- a/LiteLoader/Header/third-party/entt/entity/component.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef ENTT_ENTITY_COMPONENT_HPP -#define ENTT_ENTITY_COMPONENT_HPP - - -#include -#include "../config/config.h" - - -namespace entt { - - -/*! @brief Commonly used default traits for all types. */ -struct basic_component_traits { - /*! @brief Pointer stability, default is `std::false_type`. */ - using in_place_delete = std::false_type; - /*! @brief Empty type optimization, default is `ENTT_IGNORE_IF_EMPTY`. */ - using ignore_if_empty = ENTT_IGNORE_IF_EMPTY; -}; - - -/** - * @brief Common way to access various properties of components. - * @tparam Type Type of component. - */ -template -struct component_traits: basic_component_traits { - static_assert(std::is_same_v, Type>, "Unsupported type"); -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/fwd.hpp b/LiteLoader/Header/third-party/entt/entity/fwd.hpp deleted file mode 100644 index cdc56c1..0000000 --- a/LiteLoader/Header/third-party/entt/entity/fwd.hpp +++ /dev/null @@ -1,147 +0,0 @@ -#ifndef ENTT_ENTITY_FWD_HPP -#define ENTT_ENTITY_FWD_HPP - - -#include -#include "../core/fwd.hpp" - - -namespace entt { - - -template> -class basic_sparse_set; - - -template> -struct basic_storage; - - -template -class basic_registry; - - -template -struct basic_view; - - -template -class basic_runtime_view; - - -template -class basic_group; - - -template -class basic_observer; - - -template -class basic_organizer; - - -template -struct basic_handle; - - -template -class basic_snapshot; - - -template -class basic_snapshot_loader; - - -template -class basic_continuous_loader; - - -/*! @brief Default entity identifier. */ -enum class entity: id_type {}; - - -/*! @brief Alias declaration for the most common use case. */ -using sparse_set = basic_sparse_set; - - -/** - * @brief Alias declaration for the most common use case. - * @tparam Args Other template parameters. - */ -template -using storage = basic_storage; - - -/*! @brief Alias declaration for the most common use case. */ -using registry = basic_registry; - - -/*! @brief Alias declaration for the most common use case. */ -using observer = basic_observer; - - -/*! @brief Alias declaration for the most common use case. */ -using organizer = basic_organizer; - - -/*! @brief Alias declaration for the most common use case. */ -using handle = basic_handle; - - -/*! @brief Alias declaration for the most common use case. */ -using const_handle = basic_handle; - - -/** - * @brief Alias declaration for the most common use case. - * @tparam Args Other template parameters. - */ -template -using handle_view = basic_handle; - - -/** - * @brief Alias declaration for the most common use case. - * @tparam Args Other template parameters. - */ -template -using const_handle_view = basic_handle; - - -/*! @brief Alias declaration for the most common use case. */ -using snapshot = basic_snapshot; - - -/*! @brief Alias declaration for the most common use case. */ -using snapshot_loader = basic_snapshot_loader; - - -/*! @brief Alias declaration for the most common use case. */ -using continuous_loader = basic_continuous_loader; - - -/** - * @brief Alias declaration for the most common use case. - * @tparam Args Other template parameters. - */ -template -using view = basic_view; - - -/*! @brief Alias declaration for the most common use case. */ -using runtime_view = basic_runtime_view; - - -/** - * @brief Alias declaration for the most common use case. - * @tparam Args Other template parameters. - */ -template -using group = basic_group; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/group.hpp b/LiteLoader/Header/third-party/entt/entity/group.hpp deleted file mode 100644 index 4883ccf..0000000 --- a/LiteLoader/Header/third-party/entt/entity/group.hpp +++ /dev/null @@ -1,969 +0,0 @@ -#ifndef ENTT_ENTITY_GROUP_HPP -#define ENTT_ENTITY_GROUP_HPP - - -#include -#include -#include -#include "../config/config.h" -#include "../core/type_traits.hpp" -#include "entity.hpp" -#include "fwd.hpp" -#include "sparse_set.hpp" -#include "storage.hpp" -#include "utility.hpp" - - -namespace entt { - - -/** - * @brief Group. - * - * Primary template isn't defined on purpose. All the specializations give a - * compile-time error, but for a few reasonable cases. - */ -template -class basic_group; - - -/** - * @brief Non-owning group. - * - * A non-owning group returns all entities and only the entities that have at - * least the given components. Moreover, it's guaranteed that the entity list - * is tightly packed in memory for fast iterations. - * - * @b Important - * - * Iterators aren't invalidated if: - * - * * New instances of the given components are created and assigned to entities. - * * The entity currently pointed is modified (as an example, if one of the - * given components is removed from the entity to which the iterator points). - * * The entity currently pointed is destroyed. - * - * In all other cases, modifying the pools iterated by the group in any way - * invalidates all the iterators and using them results in undefined behavior. - * - * @note - * Groups share references to the underlying data structures of the registry - * that generated them. Therefore any change to the entities and to the - * components made by means of the registry are immediately reflected by all the - * groups.
- * Moreover, sorting a non-owning group affects all the instances of the same - * group (it means that users don't have to call `sort` on each instance to sort - * all of them because they _share_ entities and components). - * - * @warning - * Lifetime of a group must not overcome that of the registry that generated it. - * In any other case, attempting to use a group results in undefined behavior. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Exclude Types of components used to filter the group. - * @tparam Get Type of components observed by the group. - */ -template -class basic_group, get_t> final { - /*! @brief A registry is allowed to create groups. */ - friend class basic_registry; - - using basic_common_type = basic_sparse_set; - - template - using storage_type = constness_as_t>::storage_type, Component>; - - class iterable final { - template - struct iterable_iterator final { - using difference_type = std::ptrdiff_t; - using value_type = decltype(std::tuple_cat(std::tuple{}, std::declval().get({}))); - using pointer = void; - using reference = value_type; - using iterator_category = std::input_iterator_tag; - - template - iterable_iterator(It from, const std::tuple *...> &args) ENTT_NOEXCEPT - : it{from}, - pools{args} - {} - - iterable_iterator & operator++() ENTT_NOEXCEPT { - return ++it, *this; - } - - iterable_iterator operator++(int) ENTT_NOEXCEPT { - iterable_iterator orig = *this; - return ++(*this), orig; - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - const auto entt = *it; - return std::tuple_cat(std::make_tuple(entt), get_as_tuple(*std::get *>(pools), entt)...); - } - - [[nodiscard]] bool operator==(const iterable_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const iterable_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - private: - It it; - std::tuple *...> pools; - }; - - public: - using iterator = iterable_iterator; - using reverse_iterator = iterable_iterator; - - iterable(basic_common_type * const ref, const std::tuple *...> &cpools) - : handler{ref}, - pools{cpools} - {} - - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return handler ? iterator{handler->begin(), pools} : iterator{{}, pools}; - } - - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return handler ? iterator{handler->end(), pools} : iterator{{}, pools}; - } - - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return handler ? reverse_iterator{handler->rbegin(), pools} : reverse_iterator{{}, pools}; - } - - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return handler ? reverse_iterator{handler->rend(), pools} : reverse_iterator{{}, pools}; - } - - private: - basic_common_type * const handler; - const std::tuple *...> pools; - }; - - basic_group(basic_common_type &ref, storage_type &... gpool) ENTT_NOEXCEPT - : handler{&ref}, - pools{&gpool...} - {} - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Random access iterator type. */ - using iterator = typename basic_common_type::iterator; - /*! @brief Reversed iterator type. */ - using reverse_iterator = typename basic_common_type::reverse_iterator; - /*! @brief Iterable group type. */ - using iterable_group = iterable; - - /*! @brief Default constructor to use to create empty, invalid groups. */ - basic_group() ENTT_NOEXCEPT - : handler{} - {} - - /** - * @brief Returns the number of entities that have the given components. - * @return Number of entities that have the given components. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return *this ? handler->size() : size_type{}; - } - - /** - * @brief Returns the number of elements that a group has currently - * allocated space for. - * @return Capacity of the group. - */ - [[nodiscard]] size_type capacity() const ENTT_NOEXCEPT { - return *this ? handler->capacity() : size_type{}; - } - - /*! @brief Requests the removal of unused capacity. */ - void shrink_to_fit() { - if(*this) { - handler->shrink_to_fit(); - } - } - - /** - * @brief Checks whether a group is empty. - * @return True if the group is empty, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return !*this || handler->empty(); - } - - /** - * @brief Direct access to the list of entities. - * - * The returned pointer is such that range `[data(), data() + size())` is - * always a valid range, even if the container is empty. - * - * @return A pointer to the array of entities. - */ - [[nodiscard]] auto data() const ENTT_NOEXCEPT { - return *this ? handler->data() : nullptr; - } - - /** - * @brief Returns an iterator to the first entity of the group. - * - * The returned iterator points to the first entity of the group. If the - * group is empty, the returned iterator will be equal to `end()`. - * - * @return An iterator to the first entity of the group. - */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return *this ? handler->begin() : iterator{}; - } - - /** - * @brief Returns an iterator that is past the last entity of the group. - * - * The returned iterator points to the entity following the last entity of - * the group. Attempting to dereference the returned iterator results in - * undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * group. - */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return *this ? handler->end() : iterator{}; - } - - /** - * @brief Returns an iterator to the first entity of the reversed group. - * - * The returned iterator points to the first entity of the reversed group. - * If the group is empty, the returned iterator will be equal to `rend()`. - * - * @return An iterator to the first entity of the reversed group. - */ - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return *this ? handler->rbegin() : reverse_iterator{}; - } - - /** - * @brief Returns an iterator that is past the last entity of the reversed - * group. - * - * The returned iterator points to the entity following the last entity of - * the reversed group. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * reversed group. - */ - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return *this ? handler->rend() : reverse_iterator{}; - } - - /** - * @brief Returns the first entity of the group, if any. - * @return The first entity of the group if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type front() const { - const auto it = begin(); - return it != end() ? *it : null; - } - - /** - * @brief Returns the last entity of the group, if any. - * @return The last entity of the group if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type back() const { - const auto it = rbegin(); - return it != rend() ? *it : null; - } - - /** - * @brief Finds an entity. - * @param entt A valid entity identifier. - * @return An iterator to the given entity if it's found, past the end - * iterator otherwise. - */ - [[nodiscard]] iterator find(const entity_type entt) const { - const auto it = *this ? handler->find(entt) : iterator{}; - return it != end() && *it == entt ? it : end(); - } - - /** - * @brief Returns the identifier that occupies the given position. - * @param pos Position of the element to return. - * @return The identifier that occupies the given position. - */ - [[nodiscard]] entity_type operator[](const size_type pos) const { - return begin()[pos]; - } - - /** - * @brief Checks if a group is properly initialized. - * @return True if the group is properly initialized, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return handler != nullptr; - } - - /** - * @brief Checks if a group contains an entity. - * @param entt A valid entity identifier. - * @return True if the group contains the given entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const { - return *this && handler->contains(entt); - } - - /** - * @brief Returns the components assigned to the given entity. - * - * Prefer this function instead of `registry::get` during iterations. It has - * far better performance than its counterpart. - * - * @warning - * Attempting to use an invalid component type results in a compilation - * error. Attempting to use an entity that doesn't belong to the group - * results in undefined behavior. - * - * @tparam Component Types of components to get. - * @param entt A valid entity identifier. - * @return The components assigned to the entity. - */ - template - [[nodiscard]] decltype(auto) get(const entity_type entt) const { - ENTT_ASSERT(contains(entt), "Group does not contain entity"); - - if constexpr(sizeof...(Component) == 0) { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)...); - } else if constexpr(sizeof...(Component) == 1) { - return (std::get *>(pools)->get(entt), ...); - } else { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)...); - } - } - - /** - * @brief Iterates entities and components and applies the given function - * object to them. - * - * The function object is invoked for each entity. It is provided with the - * entity itself and a set of references to non-empty components. The - * _constness_ of the components is as requested.
- * The signature of the function must be equivalent to one of the following - * forms: - * - * @code{.cpp} - * void(const entity_type, Type &...); - * void(Type &...); - * @endcode - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - for(const auto entt: *this) { - if constexpr(is_applicable_v{}, std::declval().get({})))>) { - std::apply(func, std::tuple_cat(std::make_tuple(entt), get(entt))); - } else { - std::apply(func, get(entt)); - } - } - } - - /** - * @brief Returns an iterable object to use to _visit_ the group. - * - * The iterable object returns tuples that contain the current entity and a - * set of references to its non-empty components. The _constness_ of the - * components is as requested. - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @return An iterable object to use to _visit_ the group. - */ - [[nodiscard]] iterable_group each() const ENTT_NOEXCEPT { - return iterable_group{handler, pools}; - } - - /** - * @brief Sort a group according to the given comparison function. - * - * Sort the group so that iterating it with a couple of iterators returns - * entities and components in the expected order. See `begin` and `end` for - * more details. - * - * The comparison function object must return `true` if the first element - * is _less_ than the second one, `false` otherwise. The signature of the - * comparison function should be equivalent to one of the following: - * - * @code{.cpp} - * bool(std::tuple, std::tuple); - * bool(const Component &..., const Component &...); - * bool(const Entity, const Entity); - * @endcode - * - * Where `Component` are such that they are iterated by the group.
- * Moreover, the comparison function object shall induce a - * _strict weak ordering_ on the values. - * - * The sort function oject must offer a member function template - * `operator()` that accepts three arguments: - * - * * An iterator to the first element of the range to sort. - * * An iterator past the last element of the range to sort. - * * A comparison function to use to compare the elements. - * - * @tparam Component Optional types of components to compare. - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort(Compare compare, Sort algo = Sort{}, Args &&... args) { - if(*this) { - if constexpr(sizeof...(Component) == 0) { - static_assert(std::is_invocable_v, "Invalid comparison function"); - handler->sort(std::move(compare), std::move(algo), std::forward(args)...); - } else if constexpr(sizeof...(Component) == 1) { - handler->sort([this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); - }, std::move(algo), std::forward(args)...); - } else { - handler->sort([this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); - }, std::move(algo), std::forward(args)...); - } - } - } - - /** - * @brief Sort the shared pool of entities according to the given component. - * - * Non-owning groups of the same type share with the registry a pool of - * entities with its own order that doesn't depend on the order of any pool - * of components. Users can order the underlying data structure so that it - * respects the order of the pool of the given component. - * - * @note - * The shared pool of entities and thus its order is affected by the changes - * to each and every pool that it tracks. Therefore changes to those pools - * can quickly ruin the order imposed to the pool of entities shared between - * the non-owning groups. - * - * @tparam Component Type of component to use to impose the order. - */ - template - void sort() const { - if(*this) { - handler->respect(*std::get *>(pools)); - } - } - -private: - basic_common_type * const handler; - const std::tuple *...> pools; -}; - - -/** - * @brief Owning group. - * - * Owning groups return all entities and only the entities that have at least - * the given components. Moreover: - * - * * It's guaranteed that the entity list is tightly packed in memory for fast - * iterations. - * * It's guaranteed that the lists of owned components are tightly packed in - * memory for even faster iterations and to allow direct access. - * * They stay true to the order of the owned components and all instances have - * the same order in memory. - * - * The more types of components are owned by a group, the faster it is to - * iterate them. - * - * @b Important - * - * Iterators aren't invalidated if: - * - * * New instances of the given components are created and assigned to entities. - * * The entity currently pointed is modified (as an example, if one of the - * given components is removed from the entity to which the iterator points). - * * The entity currently pointed is destroyed. - * - * In all other cases, modifying the pools iterated by the group in any way - * invalidates all the iterators and using them results in undefined behavior. - * - * @note - * Groups share references to the underlying data structures of the registry - * that generated them. Therefore any change to the entities and to the - * components made by means of the registry are immediately reflected by all the - * groups. - * Moreover, sorting an owning group affects all the instance of the same group - * (it means that users don't have to call `sort` on each instance to sort all - * of them because they share the underlying data structure). - * - * @warning - * Lifetime of a group must not overcome that of the registry that generated it. - * In any other case, attempting to use a group results in undefined behavior. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Exclude Types of components used to filter the group. - * @tparam Get Types of components observed by the group. - * @tparam Owned Types of components owned by the group. - */ -template -class basic_group, get_t, Owned...> final { - /*! @brief A registry is allowed to create groups. */ - friend class basic_registry; - - using basic_common_type = basic_sparse_set; - - template - using storage_type = constness_as_t>::storage_type, Component>; - - class iterable final { - template - struct iterable_iterator; - - template - struct iterable_iterator> final { - using difference_type = std::ptrdiff_t; - using value_type = decltype(std::tuple_cat(std::tuple{}, std::declval().get({}))); - using pointer = void; - using reference = value_type; - using iterator_category = std::input_iterator_tag; - - template - iterable_iterator(It from, const std::tuple &other, const std::tuple *...> &cpools) ENTT_NOEXCEPT - : it{from}, - owned{std::get(other)...}, - get{cpools} - {} - - iterable_iterator & operator++() ENTT_NOEXCEPT { - return ++it, (++std::get(owned), ...), *this; - } - - iterable_iterator operator++(int) ENTT_NOEXCEPT { - iterable_iterator orig = *this; - return ++(*this), orig; - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - return std::tuple_cat( - std::make_tuple(*it), - std::forward_as_tuple(*std::get(owned)...), - get_as_tuple(*std::get *>(get), *it)... - ); - } - - [[nodiscard]] bool operator==(const iterable_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const iterable_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - private: - It it; - std::tuple owned; - std::tuple *...> get; - }; - - public: - using iterator = iterable_iterator< - typename basic_common_type::iterator, - type_list_cat_t>().get({}))>, type_list<>, type_list>().end())>>...> - >; - using reverse_iterator = iterable_iterator< - typename basic_common_type::reverse_iterator, - type_list_cat_t>().get({}))>, type_list<>, type_list>().rbegin())>>...> - >; - - iterable(std::tuple *..., storage_type *...> cpools, const std::size_t * const extent) - : pools{cpools}, - length{extent} - {} - - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return length ? iterator{ - std::get<0>(pools)->basic_common_type::end() - *length, - std::make_tuple((std::get *>(pools)->end() - *length)...), - std::make_tuple(std::get *>(pools)...) - } : iterator{{}, std::make_tuple(decltype(std::get *>(pools)->end()){}...), std::make_tuple(std::get *>(pools)...)}; - } - - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return length ? iterator{ - std::get<0>(pools)->basic_common_type::end(), - std::make_tuple((std::get *>(pools)->end())...), - std::make_tuple(std::get *>(pools)...) - } : iterator{{}, std::make_tuple(decltype(std::get *>(pools)->end()){}...), std::make_tuple(std::get *>(pools)...)}; - } - - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return length ? reverse_iterator{ - std::get<0>(pools)->basic_common_type::rbegin(), - std::make_tuple((std::get *>(pools)->rbegin())...), - std::make_tuple(std::get *>(pools)...) - } : reverse_iterator{{}, std::make_tuple(decltype(std::get *>(pools)->rbegin()){}...), std::make_tuple(std::get *>(pools)...)}; - } - - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return length ? reverse_iterator{ - std::get<0>(pools)->basic_common_type::rbegin() + *length, - std::make_tuple((std::get *>(pools)->rbegin() + *length)...), - std::make_tuple(std::get *>(pools)...) - } : reverse_iterator{{}, std::make_tuple(decltype(std::get *>(pools)->rbegin()){}...), std::make_tuple(std::get *>(pools)...)}; - } - - private: - const std::tuple *..., storage_type *...> pools; - const std::size_t * const length; - }; - - basic_group(const std::size_t &extent, storage_type &... opool, storage_type &... gpool) ENTT_NOEXCEPT - : pools{&opool..., &gpool...}, - length{&extent} - {} - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Random access iterator type. */ - using iterator = typename basic_common_type::iterator; - /*! @brief Reversed iterator type. */ - using reverse_iterator = typename basic_common_type::reverse_iterator; - /*! @brief Iterable group type. */ - using iterable_group = iterable; - - /*! @brief Default constructor to use to create empty, invalid groups. */ - basic_group() ENTT_NOEXCEPT - : length{} - {} - - /** - * @brief Returns the number of entities that have the given components. - * @return Number of entities that have the given components. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return *this ? *length : size_type{}; - } - - /** - * @brief Checks whether a group is empty. - * @return True if the group is empty, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return !*this || !*length; - } - - /** - * @brief Direct access to the raw representation offered by the storage. - * - * @warning - * This function is only available for owned types. - * - * @tparam Component Type of component in which one is interested. - * @return A pointer to the array of components. - */ - template - [[nodiscard]] auto raw() const ENTT_NOEXCEPT { - static_assert((std::is_same_v || ...), "Non-owned type"); - auto *cpool = std::get *>(pools); - return cpool ? cpool->raw() : decltype(cpool->raw()){}; - } - - /** - * @brief Direct access to the list of entities. - * - * The returned pointer is such that range `[data(), data() + size())` is - * always a valid range, even if the container is empty. - * - * @return A pointer to the array of entities. - */ - [[nodiscard]] auto data() const ENTT_NOEXCEPT { - return *this ? std::get<0>(pools)->data() : nullptr; - } - - /** - * @brief Returns an iterator to the first entity of the group. - * - * The returned iterator points to the first entity of the group. If the - * group is empty, the returned iterator will be equal to `end()`. - * - * @return An iterator to the first entity of the group. - */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return *this ? (std::get<0>(pools)->basic_common_type::end() - *length) : iterator{}; - } - - /** - * @brief Returns an iterator that is past the last entity of the group. - * - * The returned iterator points to the entity following the last entity of - * the group. Attempting to dereference the returned iterator results in - * undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * group. - */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return *this ? std::get<0>(pools)->basic_common_type::end() : iterator{}; - } - - /** - * @brief Returns an iterator to the first entity of the reversed group. - * - * The returned iterator points to the first entity of the reversed group. - * If the group is empty, the returned iterator will be equal to `rend()`. - * - * @return An iterator to the first entity of the reversed group. - */ - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return *this ? std::get<0>(pools)->basic_common_type::rbegin() : reverse_iterator{}; - } - - /** - * @brief Returns an iterator that is past the last entity of the reversed - * group. - * - * The returned iterator points to the entity following the last entity of - * the reversed group. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * reversed group. - */ - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return *this ? (std::get<0>(pools)->basic_common_type::rbegin() + *length) : reverse_iterator{}; - } - - /** - * @brief Returns the first entity of the group, if any. - * @return The first entity of the group if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type front() const { - const auto it = begin(); - return it != end() ? *it : null; - } - - /** - * @brief Returns the last entity of the group, if any. - * @return The last entity of the group if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type back() const { - const auto it = rbegin(); - return it != rend() ? *it : null; - } - - /** - * @brief Finds an entity. - * @param entt A valid entity identifier. - * @return An iterator to the given entity if it's found, past the end - * iterator otherwise. - */ - [[nodiscard]] iterator find(const entity_type entt) const { - const auto it = *this ? std::get<0>(pools)->find(entt) : iterator{}; - return it != end() && it >= begin() && *it == entt ? it : end(); - } - - /** - * @brief Returns the identifier that occupies the given position. - * @param pos Position of the element to return. - * @return The identifier that occupies the given position. - */ - [[nodiscard]] entity_type operator[](const size_type pos) const { - return begin()[pos]; - } - - /** - * @brief Checks if a group is properly initialized. - * @return True if the group is properly initialized, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return length != nullptr; - } - - /** - * @brief Checks if a group contains an entity. - * @param entt A valid entity identifier. - * @return True if the group contains the given entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const { - return *this && std::get<0>(pools)->contains(entt) && (std::get<0>(pools)->index(entt) < (*length)); - } - - /** - * @brief Returns the components assigned to the given entity. - * - * Prefer this function instead of `registry::get` during iterations. It has - * far better performance than its counterpart. - * - * @warning - * Attempting to use an invalid component type results in a compilation - * error. Attempting to use an entity that doesn't belong to the group - * results in undefined behavior. - * - * @tparam Component Types of components to get. - * @param entt A valid entity identifier. - * @return The components assigned to the entity. - */ - template - [[nodiscard]] decltype(auto) get(const entity_type entt) const { - ENTT_ASSERT(contains(entt), "Group does not contain entity"); - - if constexpr(sizeof...(Component) == 0) { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)..., get_as_tuple(*std::get *>(pools), entt)...); - } else if constexpr(sizeof...(Component) == 1) { - return (std::get *>(pools)->get(entt), ...); - } else { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)...); - } - } - - /** - * @brief Iterates entities and components and applies the given function - * object to them. - * - * The function object is invoked for each entity. It is provided with the - * entity itself and a set of references to non-empty components. The - * _constness_ of the components is as requested.
- * The signature of the function must be equivalent to one of the following - * forms: - * - * @code{.cpp} - * void(const entity_type, Type &...); - * void(Type &...); - * @endcode - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - for(auto args: each()) { - if constexpr(is_applicable_v{}, std::declval().get({})))>) { - std::apply(func, args); - } else { - std::apply([&func](auto, auto &&... less) { func(std::forward(less)...); }, args); - } - } - } - - /** - * @brief Returns an iterable object to use to _visit_ the group. - * - * The iterable object returns tuples that contain the current entity and a - * set of references to its non-empty components. The _constness_ of the - * components is as requested. - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @return An iterable object to use to _visit_ the group. - */ - [[nodiscard]] iterable_group each() const ENTT_NOEXCEPT { - return iterable_group{pools, length}; - } - - /** - * @brief Sort a group according to the given comparison function. - * - * Sort the group so that iterating it with a couple of iterators returns - * entities and components in the expected order. See `begin` and `end` for - * more details. - * - * The comparison function object must return `true` if the first element - * is _less_ than the second one, `false` otherwise. The signature of the - * comparison function should be equivalent to one of the following: - * - * @code{.cpp} - * bool(std::tuple, std::tuple); - * bool(const Component &, const Component &); - * bool(const Entity, const Entity); - * @endcode - * - * Where `Component` are either owned types or not but still such that they - * are iterated by the group.
- * Moreover, the comparison function object shall induce a - * _strict weak ordering_ on the values. - * - * The sort function oject must offer a member function template - * `operator()` that accepts three arguments: - * - * * An iterator to the first element of the range to sort. - * * An iterator past the last element of the range to sort. - * * A comparison function to use to compare the elements. - * - * @tparam Component Optional types of components to compare. - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort(Compare compare, Sort algo = Sort{}, Args &&... args) const { - auto *cpool = std::get<0>(pools); - - if constexpr(sizeof...(Component) == 0) { - static_assert(std::is_invocable_v, "Invalid comparison function"); - cpool->sort_n(*length, std::move(compare), std::move(algo), std::forward(args)...); - } else if constexpr(sizeof...(Component) == 1) { - cpool->sort_n(*length, [this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); - }, std::move(algo), std::forward(args)...); - } else { - cpool->sort_n(*length, [this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); - }, std::move(algo), std::forward(args)...); - } - - [this](auto *head, auto *... other) { - for(auto next = *length; next; --next) { - const auto pos = next - 1; - [[maybe_unused]] const auto entt = head->data()[pos]; - (other->swap(other->data()[pos], entt), ...); - } - }(std::get *>(pools)...); - } - -private: - const std::tuple *..., storage_type *...> pools; - const size_type * const length; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/helper.hpp b/LiteLoader/Header/third-party/entt/entity/helper.hpp deleted file mode 100644 index c7e437d..0000000 --- a/LiteLoader/Header/third-party/entt/entity/helper.hpp +++ /dev/null @@ -1,168 +0,0 @@ -#ifndef ENTT_ENTITY_HELPER_HPP -#define ENTT_ENTITY_HELPER_HPP - - -#include -#include "../config/config.h" -#include "../core/fwd.hpp" -#include "../core/type_traits.hpp" -#include "../signal/delegate.hpp" -#include "registry.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @brief Converts a registry to a view. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -struct as_view { - /*! @brief Underlying entity identifier. */ - using entity_type = std::remove_const_t; - /*! @brief Type of registry to convert. */ - using registry_type = constness_as_t, Entity>; - - /** - * @brief Constructs a converter for a given registry. - * @param source A valid reference to a registry. - */ - as_view(registry_type &source) ENTT_NOEXCEPT: reg{source} {} - - /** - * @brief Conversion function from a registry to a view. - * @tparam Exclude Types of components used to filter the view. - * @tparam Component Type of components used to construct the view. - * @return A newly created view. - */ - template - operator basic_view() const { - return reg.template view(Exclude{}); - } - -private: - registry_type ® -}; - - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -as_view(basic_registry &) -> as_view; - - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -as_view(const basic_registry &) -> as_view; - - -/** - * @brief Converts a registry to a group. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -struct as_group { - /*! @brief Underlying entity identifier. */ - using entity_type = std::remove_const_t; - /*! @brief Type of registry to convert. */ - using registry_type = constness_as_t, Entity>; - - /** - * @brief Constructs a converter for a given registry. - * @param source A valid reference to a registry. - */ - as_group(registry_type &source) ENTT_NOEXCEPT: reg{source} {} - - /** - * @brief Conversion function from a registry to a group. - * @tparam Exclude Types of components used to filter the group. - * @tparam Get Types of components observed by the group. - * @tparam Owned Types of components owned by the group. - * @return A newly created group. - */ - template - operator basic_group() const { - if constexpr(std::is_const_v) { - return reg.template group_if_exists(Get{}, Exclude{}); - } else { - return reg.template group(Get{}, Exclude{}); - } - } - -private: - registry_type ® -}; - - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -as_group(basic_registry &) -> as_group; - - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -as_group(const basic_registry &) -> as_group; - - - -/** - * @brief Helper to create a listener that directly invokes a member function. - * @tparam Member Member function to invoke on a component of the given type. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @param reg A registry that contains the given entity and its components. - * @param entt Entity from which to get the component. - */ -template -void invoke(basic_registry ®, const Entity entt) { - static_assert(std::is_member_function_pointer_v, "Invalid pointer to non-static member function"); - delegate &, const Entity)> func; - func.template connect(reg.template get>(entt)); - func(reg, entt); -} - - -/** - * @brief Returns the entity associated with a given component. - * - * @warning - * Currently, this function only works correctly with the default pool as it - * makes assumptions about how the components are laid out. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Component Type of component. - * @param reg A registry that contains the given entity and its components. - * @param instance A valid component instance. - * @return The entity associated with the given component. - */ -template -Entity to_entity(const basic_registry ®, const Component &instance) { - const auto view = reg.template view(); - const auto *addr = std::addressof(instance); - - for(auto it = view.rbegin(), last = view.rend(); it < last; it += ENTT_PACKED_PAGE) { - if(const auto dist = (addr - std::addressof(view.template get(*it))); dist >= 0 && dist < ENTT_PACKED_PAGE) { - return *(it + dist); - } - } - - return entt::null; -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/poly_storage.hpp b/LiteLoader/Header/third-party/entt/entity/poly_storage.hpp deleted file mode 100644 index a3f04fe..0000000 --- a/LiteLoader/Header/third-party/entt/entity/poly_storage.hpp +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef ENTT_ENTITY_POLY_STORAGE_HPP -#define ENTT_ENTITY_POLY_STORAGE_HPP - - -#include -#include -#include "../core/type_info.hpp" -#include "../core/type_traits.hpp" -#include "../poly/poly.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @brief Basic poly storage implementation. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -struct Storage: type_list { - /** - * @brief Concept definition. - * @tparam Base Opaque base class from which to inherit. - */ - template - struct type: Base { - /** - * @brief Returns a type info for the contained objects. - * @return The type info for the contained objects. - */ - type_info value_type() const ENTT_NOEXCEPT { - return poly_call<0>(*this); - } - }; - - /** - * @brief Concept implementation. - * @tparam Type Type for which to generate an implementation. - */ - template - using impl = value_list<&type_id>; -}; - - -/** - * @brief Defines the poly storage type associate with a given entity type. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -struct poly_storage_traits { - /*! @brief Poly storage type for the given entity type. */ - using storage_type = poly>; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/registry.hpp b/LiteLoader/Header/third-party/entt/entity/registry.hpp deleted file mode 100644 index 29deaba..0000000 --- a/LiteLoader/Header/third-party/entt/entity/registry.hpp +++ /dev/null @@ -1,1713 +0,0 @@ -#ifndef ENTT_ENTITY_REGISTRY_HPP -#define ENTT_ENTITY_REGISTRY_HPP - - -#include -#include -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/algorithm.hpp" -#include "../core/any.hpp" -#include "../core/fwd.hpp" -#include "../core/type_info.hpp" -#include "../core/type_traits.hpp" -#include "component.hpp" -#include "entity.hpp" -#include "fwd.hpp" -#include "group.hpp" -#include "poly_storage.hpp" -#include "runtime_view.hpp" -#include "sparse_set.hpp" -#include "storage.hpp" -#include "utility.hpp" -#include "view.hpp" - - -namespace entt { - - -/** - * @brief Fast and reliable entity-component system. - * - * The registry is the core class of the entity-component framework.
- * It stores entities and arranges pools of components on a per request basis. - * By means of a registry, users can manage entities and components, then create - * views or groups to iterate them. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -class basic_registry { - using traits_type = entt_traits; - using poly_storage_type = typename poly_storage_traits::storage_type; - using basic_common_type = basic_sparse_set; - - template - using storage_type = constness_as_t>::storage_type, Component>; - - struct pool_data { - poly_storage_type poly; - std::unique_ptr pool{}; - }; - - template - struct group_handler; - - template - struct group_handler, get_t, Owned...> { - static_assert(!std::disjunction_v::in_place_delete...>, "Groups do not support in-place delete"); - static_assert(std::conjunction_v>..., std::is_same>..., std::is_same>...>, "One or more component types are invalid"); - std::conditional_t current{}; - - template - void maybe_valid_if(basic_registry &owner, const Entity entt) { - [[maybe_unused]] const auto cpools = std::make_tuple(owner.assure()...); - - const auto is_valid = ((std::is_same_v || std::get *>(cpools)->contains(entt)) && ...) - && ((std::is_same_v || owner.assure()->contains(entt)) && ...) - && ((std::is_same_v || !owner.assure()->contains(entt)) && ...); - - if constexpr(sizeof...(Owned) == 0) { - if(is_valid && !current.contains(entt)) { - current.emplace(entt); - } - } else { - if(is_valid && !(std::get<0>(cpools)->index(entt) < current)) { - const auto pos = current++; - (std::get *>(cpools)->swap(std::get *>(cpools)->data()[pos], entt), ...); - } - } - } - - void discard_if([[maybe_unused]] basic_registry &owner, const Entity entt) { - if constexpr(sizeof...(Owned) == 0) { - current.remove(entt); - } else { - if(const auto cpools = std::make_tuple(owner.assure()...); std::get<0>(cpools)->contains(entt) && (std::get<0>(cpools)->index(entt) < current)) { - const auto pos = --current; - (std::get *>(cpools)->swap(std::get *>(cpools)->data()[pos], entt), ...); - } - } - } - }; - - struct group_data { - std::size_t size; - std::unique_ptr group; - bool (* owned)(const id_type) ENTT_NOEXCEPT; - bool (* get)(const id_type) ENTT_NOEXCEPT; - bool (* exclude)(const id_type) ENTT_NOEXCEPT; - }; - - template - [[nodiscard]] storage_type * assure() const { - static_assert(std::is_same_v>, "Non-decayed types not allowed"); - const auto index = type_seq::value(); - - if(!(index < pools.size())) { - pools.resize(size_type(index)+1u); - } - - if(auto &&pdata = pools[index]; !pdata.pool) { - pdata.pool.reset(new storage_type()); - pdata.poly.template emplace &>(*static_cast *>(pdata.pool.get())); - } - - return static_cast *>(pools[index].pool.get()); - } - - template - [[nodiscard]] const storage_type * pool_if_exists() const ENTT_NOEXCEPT { - static_assert(std::is_same_v>, "Non-decayed types not allowed"); - const auto index = type_seq::value(); - return (!(index < pools.size()) || !pools[index].pool) ? nullptr : static_cast *>(pools[index].pool.get()); - } - - auto generate_identifier(const std::size_t pos) ENTT_NOEXCEPT { - ENTT_ASSERT(pos < traits_type::to_integral(null), "No entities available"); - return traits_type::construct(static_cast(pos), {}); - } - - auto recycle_identifier() ENTT_NOEXCEPT { - ENTT_ASSERT(free_list != null, "No entities available"); - const auto curr = traits_type::to_entity(free_list); - free_list = (tombstone | entities[curr]); - return (entities[curr] = traits_type::construct(curr, traits_type::to_version(entities[curr]))); - } - - auto release_entity(const Entity entity, const typename traits_type::version_type version) { - const typename traits_type::version_type vers = version + (version == traits_type::to_version(tombstone)); - entities[traits_type::to_entity(entity)] = traits_type::construct(traits_type::to_entity(free_list), vers); - free_list = (tombstone | entity); - return vers; - } - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Underlying version type. */ - using version_type = typename traits_type::version_type; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Poly storage type. */ - using poly_storage = typename poly_storage_traits::storage_type; - - /** - * @brief Returns the entity identifier without the version. - * @param entity An entity identifier, either valid or not. - * @return The entity identifier without the version. - */ - [[nodiscard]] static entity_type entity(const entity_type entity) ENTT_NOEXCEPT { - return traits_type::construct(traits_type::to_entity(entity), {}); - } - - /** - * @brief Returns the version stored along with an entity identifier. - * @param entity An entity identifier, either valid or not. - * @return The version stored along with the given entity identifier. - */ - [[nodiscard]] static version_type version(const entity_type entity) ENTT_NOEXCEPT { - return traits_type::to_version(entity); - } - - /*! @brief Default constructor. */ - basic_registry() = default; - - /*! @brief Default move constructor. */ - basic_registry(basic_registry &&) = default; - - /*! @brief Default move assignment operator. @return This registry. */ - basic_registry & operator=(basic_registry &&) = default; - - /** - * @brief Prepares a pool for the given type if required. - * @tparam Component Type of component for which to prepare a pool. - */ - template - void prepare() { - // suppress the warning due to the [[nodiscard]] attribute - static_cast(assure()); - } - - /** - * @brief Returns a poly storage for a given type. - * @param info The type for which to return a poly storage. - * @return A valid poly storage if a pool for the given type exists, an - * empty and thus invalid element otherwise. - */ - poly_storage & storage(const type_info info) { - ENTT_ASSERT(info.seq() < pools.size() && pools[info.seq()].poly, "Storage not available"); - return pools[info.seq()].poly; - } - - /*! @copydoc storage */ - const poly_storage & storage(const type_info info) const { - ENTT_ASSERT(info.seq() < pools.size() && pools[info.seq()].poly, "Storage not available"); - return pools[info.seq()].poly; - } - - /** - * @brief Returns the number of existing components of the given type. - * @tparam Component Type of component of which to return the size. - * @return Number of existing components of the given type. - */ - template - [[nodiscard]] size_type size() const { - const auto *cpool = pool_if_exists(); - return cpool ? cpool->size() : size_type{}; - } - - /** - * @brief Returns the number of entities created so far. - * @return Number of entities created so far. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return entities.size(); - } - - /** - * @brief Returns the number of entities still in use. - * @return Number of entities still in use. - */ - [[nodiscard]] size_type alive() const { - auto sz = entities.size(); - - for(auto curr = free_list; curr != null; --sz) { - curr = entities[traits_type::to_entity(curr)]; - } - - return sz; - } - - /** - * @brief Increases the capacity of the registry or of the pools for the - * given components. - * - * If no components are specified, the capacity of the registry is - * increased, that is the number of entities it contains. Otherwise the - * capacity of the pools for the given components is increased.
- * In both cases, if the new capacity is greater than the current capacity, - * new storage is allocated, otherwise the method does nothing. - * - * @tparam Component Types of components for which to reserve storage. - * @param cap Desired capacity. - */ - template - void reserve(const size_type cap) { - if constexpr(sizeof...(Component) == 0) { - entities.reserve(cap); - } else { - (assure()->reserve(cap), ...); - } - } - - /** - * @brief Reserves enough space to store `count` pools. - * @param count Number of pools to reserve space for. - */ - [[deprecated("No longer supported")]] - void reserve_pools(const size_t count) { - pools.reserve(count); - } - - /** - * @brief Returns the capacity of the pool for the given component. - * @tparam Component Type of component in which one is interested. - * @return Capacity of the pool of the given component. - */ - template - [[nodiscard]] size_type capacity() const { - const auto *cpool = pool_if_exists(); - return cpool ? cpool->capacity() : size_type{}; - } - - /** - * @brief Returns the number of entities that a registry has currently - * allocated space for. - * @return Capacity of the registry. - */ - [[nodiscard]] size_type capacity() const ENTT_NOEXCEPT { - return entities.capacity(); - } - - /** - * @brief Requests the removal of unused capacity for the given components. - * @tparam Component Types of components for which to reclaim unused - * capacity. - */ - template - void shrink_to_fit() { - (assure()->shrink_to_fit(), ...); - } - - /** - * @brief Checks whether the registry or the pools of the given components - * are empty. - * - * A registry is considered empty when it doesn't contain entities that are - * still in use. - * - * @tparam Component Types of components in which one is interested. - * @return True if the registry or the pools of the given components are - * empty, false otherwise. - */ - template - [[nodiscard]] bool empty() const { - if constexpr(sizeof...(Component) == 0) { - return !alive(); - } else { - return [](const auto *... cpool) { return ((!cpool || cpool->empty()) && ...); }(pool_if_exists()...); - } - } - - /** - * @brief Direct access to the list of entities of a registry. - * - * The returned pointer is such that range `[data(), data() + size())` is - * always a valid range, even if the container is empty. - * - * @warning - * This list contains both valid and destroyed entities and isn't suitable - * for direct use. - * - * @return A pointer to the array of entities. - */ - [[nodiscard]] const entity_type * data() const ENTT_NOEXCEPT { - return entities.data(); - } - - /** - * @brief Returns the head of the list of released entities. - * - * This function is intended for use in conjunction with `assign`.
- * The returned entity has an invalid identifier in all cases. - * - * @return The head of the list of released entities. - */ - [[nodiscard]] entity_type released() const ENTT_NOEXCEPT { - return free_list; - } - - /*! @copydoc released */ - [[deprecated("Use ::released instead")]] - [[nodiscard]] entity_type destroyed() const ENTT_NOEXCEPT { - return released(); - } - - /** - * @brief Checks if an entity identifier refers to a valid entity. - * @param entity An entity identifier, either valid or not. - * @return True if the identifier is valid, false otherwise. - */ - [[nodiscard]] bool valid(const entity_type entity) const { - const auto pos = size_type(traits_type::to_entity(entity)); - return (pos < entities.size() && entities[pos] == entity); - } - - /** - * @brief Returns the actual version for an entity identifier. - * - * @warning - * Attempting to use an entity that doesn't belong to the registry results - * in undefined behavior. An entity belongs to the registry even if it has - * been previously destroyed and/or recycled. - * - * @param entity A valid entity identifier. - * @return Actual version for the given entity identifier. - */ - [[nodiscard]] version_type current(const entity_type entity) const { - const auto pos = size_type(traits_type::to_entity(entity)); - ENTT_ASSERT(pos < entities.size(), "Entity does not exist"); - return version(entities[pos]); - } - - /** - * @brief Creates a new entity and returns it. - * - * There are two kinds of possible entity identifiers: - * - * * Newly created ones in case no entities have been previously destroyed. - * * Recycled ones with updated versions. - * - * @return A valid entity identifier. - */ - [[nodiscard]] entity_type create() { - return (free_list == null) ? entities.emplace_back(generate_identifier(entities.size())) : recycle_identifier(); - } - - /** - * @brief Creates a new entity and returns it. - * - * @sa create - * - * If the requested entity isn't in use, the suggested identifier is created - * and returned. Otherwise, a new identifier is generated. - * - * @param hint Required entity identifier. - * @return A valid entity identifier. - */ - [[nodiscard]] entity_type create(const entity_type hint) { - const auto length = entities.size(); - - if(hint == null || hint == tombstone) { - return create(); - } else if(const auto req = traits_type::to_entity(hint); !(req < length)) { - entities.resize(size_type(req) + 1u, null); - - for(auto pos = length; pos < req; ++pos) { - release_entity(generate_identifier(pos), {}); - } - - return (entities[req] = hint); - } else if(const auto curr = traits_type::to_entity(entities[req]); req == curr) { - return create(); - } else { - auto *it = &free_list; - for(; traits_type::to_entity(*it) != req; it = &entities[traits_type::to_entity(*it)]); - *it = traits_type::construct(curr, traits_type::to_version(*it)); - return (entities[req] = hint); - } - } - - /** - * @brief Assigns each element in a range an entity. - * - * @sa create - * - * @tparam It Type of forward iterator. - * @param first An iterator to the first element of the range to generate. - * @param last An iterator past the last element of the range to generate. - */ - template - void create(It first, It last) { - for(; free_list != null && first != last; ++first) { - *first = recycle_identifier(); - } - - const auto length = entities.size(); - entities.resize(length + std::distance(first, last), null); - - for(auto pos = length; first != last; ++first, ++pos) { - *first = entities[pos] = generate_identifier(pos); - } - } - - /** - * @brief Assigns entities to an empty registry. - * - * This function is intended for use in conjunction with `data`, `size` and - * `destroyed`.
- * Don't try to inject ranges of randomly generated entities nor the _wrong_ - * head for the list of destroyed entities. There is no guarantee that a - * registry will continue to work properly in this case. - * - * @warning - * There must be no entities still alive for this to work properly. - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param destroyed The head of the list of destroyed entities. - */ - template - void assign(It first, It last, const entity_type destroyed) { - ENTT_ASSERT(!alive(), "Entities still alive"); - entities.assign(first, last); - free_list = destroyed; - } - - /** - * @brief Releases an entity identifier. - * - * The version is updated and the identifier can be recycled at any time. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @param entity A valid entity identifier. - * @return The version of the recycled entity. - */ - version_type release(const entity_type entity) { - return release(entity, version(entity) + 1u); - } - - /** - * @brief Releases an entity identifier. - * - * The suggested version or the valid version closest to the suggested one - * is used instead of the implicitly generated version. - * - * @sa release - * - * @param entity A valid entity identifier. - * @param version A desired version upon destruction. - * @return The version actually assigned to the entity. - */ - version_type release(const entity_type entity, const version_type version) { - ENTT_ASSERT(orphan(entity), "Non-orphan entity"); - return release_entity(entity, version); - } - - /** - * @brief Releases all entity identifiers in a range. - * - * @sa release - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - */ - template - void release(It first, It last) { - for(; first != last; ++first) { - release(*first, version(*first) + 1u); - } - } - - /** - * @brief Destroys an entity and releases its identifier. - * - * The version is updated and the identifier can be recycled at any time. - * - * @warning - * Adding or removing components to an entity that is being destroyed can - * result in undefined behavior. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @param entity A valid entity identifier. - * @return The version of the recycled entity. - */ - version_type destroy(const entity_type entity) { - return destroy(entity, version(entity) + 1u); - } - - /** - * @brief Destroys an entity and releases its identifier. - * - * The suggested version or the valid version closest to the suggested one - * is used instead of the implicitly generated version. - * - * @sa destroy - * - * @param entity A valid entity identifier. - * @param version A desired version upon destruction. - * @return The version actually assigned to the entity. - */ - version_type destroy(const entity_type entity, const version_type version) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - for(auto &&pdata: pools) { - pdata.pool && pdata.pool->remove(entity, this); - } - - return release_entity(entity, version); - } - - /** - * @brief Destroys all entities in a range and releases their identifiers. - * - * @sa destroy - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - */ - template - void destroy(It first, It last) { - if constexpr(is_iterator_type_v) { - for(; first != last; ++first) { - destroy(*first, version(*first) + 1u); - } - } else { - for(auto &&pdata: pools) { - pdata.pool && pdata.pool->remove(first, last, this); - } - - release(first, last); - } - } - - /** - * @brief Assigns the given component to an entity. - * - * A new instance of the given component is created and initialized with the - * arguments provided (the component must have a proper constructor or be of - * aggregate type). Then the component is assigned to the given entity. - * - * @warning - * Attempting to use an invalid entity or to assign a component to an entity - * that already owns it results in undefined behavior. - * - * @tparam Component Type of component to create. - * @tparam Args Types of arguments to use to construct the component. - * @param entity A valid entity identifier. - * @param args Parameters to use to initialize the component. - * @return A reference to the newly created component. - */ - template - decltype(auto) emplace(const entity_type entity, Args &&... args) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - return assure()->emplace(*this, entity, std::forward(args)...); - } - - /** - * @brief Assigns each entity in a range the given component. - * - * @sa emplace - * - * @tparam Component Type of component to create. - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param value An instance of the component to assign. - */ - template - void insert(It first, It last, const Component &value = {}) { - ENTT_ASSERT(std::all_of(first, last, [this](const auto entity) { return valid(entity); }), "Invalid entity"); - assure()->insert(*this, first, last, value); - } - - /** - * @brief Assigns each entity in a range the given components. - * - * @sa emplace - * - * @tparam Component Type of component to create. - * @tparam EIt Type of input iterator. - * @tparam CIt Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param from An iterator to the first element of the range of components. - */ - template::value_type>, Component>>> - void insert(EIt first, EIt last, CIt from) { - static_assert(std::is_constructible_v::value_type>, "Invalid value type"); - ENTT_ASSERT(std::all_of(first, last, [this](const auto entity) { return valid(entity); }), "Invalid entity"); - assure()->insert(*this, first, last, from); - } - - /** - * @brief Assigns or replaces the given component for an entity. - * - * Equivalent to the following snippet (pseudocode): - * - * @code{.cpp} - * auto &component = registry.all_of(entity) ? registry.replace(entity, args...) : registry.emplace(entity, args...); - * @endcode - * - * Prefer this function anyway because it has slightly better performance. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @tparam Component Type of component to assign or replace. - * @tparam Args Types of arguments to use to construct the component. - * @param entity A valid entity identifier. - * @param args Parameters to use to initialize the component. - * @return A reference to the newly created component. - */ - template - decltype(auto) emplace_or_replace(const entity_type entity, Args &&... args) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - auto *cpool = assure(); - - return cpool->contains(entity) - ? cpool->patch(*this, entity, [&args...](auto &... curr) { ((curr = Component{std::forward(args)...}), ...); }) - : cpool->emplace(*this, entity, std::forward(args)...); - } - - /** - * @brief Patches the given component for an entity. - * - * The signature of the functions should be equivalent to the following: - * - * @code{.cpp} - * void(Component &); - * @endcode - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned. However, this function can be used to trigger an update signal - * for them. - * - * @warning - * Attempting to use an invalid entity or to patch a component of an entity - * that doesn't own it results in undefined behavior. - * - * @tparam Component Type of component to patch. - * @tparam Func Types of the function objects to invoke. - * @param entity A valid entity identifier. - * @param func Valid function objects. - * @return A reference to the patched component. - */ - template - decltype(auto) patch(const entity_type entity, Func &&... func) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - return assure()->patch(*this, entity, std::forward(func)...); - } - - /** - * @brief Replaces the given component for an entity. - * - * A new instance of the given component is created and initialized with the - * arguments provided (the component must have a proper constructor or be of - * aggregate type). Then the component is assigned to the given entity. - * - * @warning - * Attempting to use an invalid entity or to replace a component of an - * entity that doesn't own it results in undefined behavior. - * - * @tparam Component Type of component to replace. - * @tparam Args Types of arguments to use to construct the component. - * @param entity A valid entity identifier. - * @param args Parameters to use to initialize the component. - * @return A reference to the component being replaced. - */ - template - decltype(auto) replace(const entity_type entity, Args &&... args) { - return assure()->patch(*this, entity, [&args...](auto &... curr) { ((curr = Component{std::forward(args)...}), ...); }); - } - - /** - * @brief Removes the given components from an entity. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @tparam Component Types of components to remove. - * @param entity A valid entity identifier. - * @return The number of components actually removed. - */ - template - size_type remove(const entity_type entity) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - static_assert(sizeof...(Component) > 0, "Provide one or more component types"); - return (assure()->remove(entity, this) + ... + size_type{}); - } - - /** - * @brief Removes the given components from all the entities in a range. - * - * @sa remove - * - * @tparam Component Types of components to remove. - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @return The number of components actually removed. - */ - template - size_type remove(It first, It last) { - static_assert(sizeof...(Component) > 0, "Provide one or more component types"); - const auto cpools = std::make_tuple(assure()...); - size_type count{}; - - for(; first != last; ++first) { - const auto entity = *first; - ENTT_ASSERT(valid(entity), "Invalid entity"); - count += (std::get *>(cpools)->remove(entity, this) + ...); - } - - return count; - } - - /** - * @brief Erases the given components from an entity. - * - * @warning - * Attempting to use an invalid entity or to erase a component from an - * entity that doesn't own it results in undefined behavior. - * - * @tparam Component Types of components to erase. - * @param entity A valid entity identifier. - */ - template - void erase(const entity_type entity) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - static_assert(sizeof...(Component) > 0, "Provide one or more component types"); - (assure()->erase(entity, this), ...); - } - - /** - * @brief Erases the given components from all the entities in a range. - * - * @sa erase - * - * @tparam Component Types of components to erase. - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - */ - template - void erase(It first, It last) { - static_assert(sizeof...(Component) > 0, "Provide one or more component types"); - const auto cpools = std::make_tuple(assure()...); - - for(; first != last; ++first) { - const auto entity = *first; - ENTT_ASSERT(valid(entity), "Invalid entity"); - (std::get *>(cpools)->erase(entity, this), ...); - } - } - - /** - * @brief Removes all tombstones from a registry or only the pools for the - * given components. - * @tparam Component Types of components for which to clear all tombstones. - */ - template - void compact() { - if constexpr(sizeof...(Component) == 0) { - for(auto &&pdata: pools) { - pdata.pool && (pdata.pool->compact(), true); - } - } else { - (assure()->compact(), ...); - } - } - - /*! @copydoc remove */ - template - [[deprecated("Use ::remove instead")]] - size_type remove_if_exists(const entity_type entity) { - return remove(entity); - } - - /** - * @brief Removes all the components from an entity and makes it orphaned. - * - * @warning - * In case there are listeners that observe the destruction of components - * and assign other components to the entity in their bodies, the result of - * invoking this function may not be as expected. In the worst case, it - * could lead to undefined behavior. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @param entity A valid entity identifier. - */ - [[deprecated("Use ::destroy(entity)/::create(entity) instead")]] - void remove_all(const entity_type entity) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - for(auto &&pdata: pools) { - pdata.pool && pdata.pool->remove(entity, this); - } - } - - /** - * @brief Checks if an entity has all the given components. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @tparam Component Components for which to perform the check. - * @param entity A valid entity identifier. - * @return True if the entity has all the components, false otherwise. - */ - template - [[nodiscard]] bool all_of(const entity_type entity) const { - ENTT_ASSERT(valid(entity), "Invalid entity"); - return [entity](const auto *... cpool) { return ((cpool && cpool->contains(entity)) && ...); }(pool_if_exists()...); - } - - /** - * @brief Checks if an entity has at least one of the given components. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @tparam Component Components for which to perform the check. - * @param entity A valid entity identifier. - * @return True if the entity has at least one of the given components, - * false otherwise. - */ - template - [[nodiscard]] bool any_of(const entity_type entity) const { - ENTT_ASSERT(valid(entity), "Invalid entity"); - return [entity](const auto *... cpool) { return !((!cpool || !cpool->contains(entity)) && ...); }(pool_if_exists()...); - } - - /** - * @brief Returns references to the given components for an entity. - * - * @warning - * Attempting to use an invalid entity or to get a component from an entity - * that doesn't own it results in undefined behavior. - * - * @tparam Component Types of components to get. - * @param entity A valid entity identifier. - * @return References to the components owned by the entity. - */ - template - [[nodiscard]] decltype(auto) get([[maybe_unused]] const entity_type entity) const { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - if constexpr(sizeof...(Component) == 1) { - const auto *cpool = pool_if_exists...>(); - ENTT_ASSERT(cpool, "Storage not available"); - return cpool->get(entity); - } else { - return std::forward_as_tuple(get(entity)...); - } - } - - /*! @copydoc get */ - template - [[nodiscard]] decltype(auto) get([[maybe_unused]] const entity_type entity) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - if constexpr(sizeof...(Component) == 1) { - return (const_cast(assure>()->get(entity)), ...); - } else { - return std::forward_as_tuple(get(entity)...); - } - } - - /** - * @brief Returns a reference to the given component for an entity. - * - * In case the entity doesn't own the component, the parameters provided are - * used to construct it.
- * Equivalent to the following snippet (pseudocode): - * - * @code{.cpp} - * auto &component = registry.all_of(entity) ? registry.get(entity) : registry.emplace(entity, args...); - * @endcode - * - * Prefer this function anyway because it has slightly better performance. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @tparam Component Type of component to get. - * @tparam Args Types of arguments to use to construct the component. - * @param entity A valid entity identifier. - * @param args Parameters to use to initialize the component. - * @return Reference to the component owned by the entity. - */ - template - [[nodiscard]] decltype(auto) get_or_emplace(const entity_type entity, Args &&... args) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - auto *cpool = assure(); - return cpool->contains(entity) ? cpool->get(entity) : cpool->emplace(*this, entity, std::forward(args)...); - } - - /** - * @brief Returns pointers to the given components for an entity. - * - * @warning - * Attempting to use an invalid entity results in undefined behavior. - * - * @note - * The registry retains ownership of the pointed-to components. - * - * @tparam Component Types of components to get. - * @param entity A valid entity identifier. - * @return Pointers to the components owned by the entity. - */ - template - [[nodiscard]] auto try_get([[maybe_unused]] const entity_type entity) const { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - if constexpr(sizeof...(Component) == 1) { - const auto *cpool = pool_if_exists...>(); - return (cpool && cpool->contains(entity)) ? &cpool->get(entity) : nullptr; - } else { - return std::make_tuple(try_get(entity)...); - } - } - - /*! @copydoc try_get */ - template - [[nodiscard]] auto try_get([[maybe_unused]] const entity_type entity) { - ENTT_ASSERT(valid(entity), "Invalid entity"); - - if constexpr(sizeof...(Component) == 1) { - return (const_cast(std::as_const(*this).template try_get(entity)), ...); - } else { - return std::make_tuple(try_get(entity)...); - } - } - - /** - * @brief Clears a whole registry or the pools for the given components. - * @tparam Component Types of components to remove from their entities. - */ - template - void clear() { - if constexpr(sizeof...(Component) == 0) { - for(auto &&pdata: pools) { - pdata.pool && (pdata.pool->clear(this), true); - } - - each([this](const auto entity) { release_entity(entity, version(entity) + 1u); }); - } else { - (assure()->clear(this), ...); - } - } - - /** - * @brief Iterates all the entities that are still in use. - * - * The function object is invoked for each entity that is still in use.
- * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const Entity); - * @endcode - * - * This function is fairly slow and should not be used frequently. However, - * it's useful for iterating all the entities still in use, regardless of - * their components. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - if(free_list == null) { - for(auto pos = entities.size(); pos; --pos) { - func(entities[pos-1]); - } - } else { - for(auto pos = entities.size(); pos; --pos) { - if(const auto entity = entities[pos - 1]; traits_type::to_entity(entity) == (pos - 1)) { - func(entity); - } - } - } - } - - /** - * @brief Checks if an entity has components assigned. - * @param entity A valid entity identifier. - * @return True if the entity has no components assigned, false otherwise. - */ - [[nodiscard]] bool orphan(const entity_type entity) const { - ENTT_ASSERT(valid(entity), "Invalid entity"); - return std::none_of(pools.cbegin(), pools.cend(), [entity](auto &&pdata) { return pdata.pool && pdata.pool->contains(entity); }); - } - - /** - * @brief Iterates orphans and applies them the given function object. - * - * The function object is invoked for each entity that is still in use and - * has no components assigned.
- * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const Entity); - * @endcode - * - * This function can be very slow and should not be used frequently. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void orphans(Func func) const { - each([this, &func](const auto entity) { - if(orphan(entity)) { - func(entity); - } - }); - } - - /** - * @brief Returns a sink object for the given component. - * - * The sink returned by this function can be used to receive notifications - * whenever a new instance of the given component is created and assigned to - * an entity.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, Entity); - * @endcode - * - * Listeners are invoked **after** the component has been assigned to the - * entity. - * - * @sa sink - * - * @tparam Component Type of component of which to get the sink. - * @return A temporary sink object. - */ - template - [[nodiscard]] auto on_construct() { - return assure()->on_construct(); - } - - /** - * @brief Returns a sink object for the given component. - * - * The sink returned by this function can be used to receive notifications - * whenever an instance of the given component is explicitly updated.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, Entity); - * @endcode - * - * Listeners are invoked **after** the component has been updated. - * - * @sa sink - * - * @tparam Component Type of component of which to get the sink. - * @return A temporary sink object. - */ - template - [[nodiscard]] auto on_update() { - return assure()->on_update(); - } - - /** - * @brief Returns a sink object for the given component. - * - * The sink returned by this function can be used to receive notifications - * whenever an instance of the given component is removed from an entity and - * thus destroyed.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, Entity); - * @endcode - * - * Listeners are invoked **before** the component has been removed from the - * entity. - * - * @sa sink - * - * @tparam Component Type of component of which to get the sink. - * @return A temporary sink object. - */ - template - [[nodiscard]] auto on_destroy() { - return assure()->on_destroy(); - } - - /** - * @brief Returns a view for the given components. - * - * This kind of objects are created on the fly and share with the registry - * its internal data structures.
- * Feel free to discard a view after the use. Creating and destroying a view - * is an incredibly cheap operation because they do not require any type of - * initialization.
- * As a rule of thumb, storing a view should never be an option. - * - * Views do their best to iterate the smallest set of candidate entities. - * In particular: - * - * * Single component views are incredibly fast and iterate a packed array - * of entities, all of which has the given component. - * * Multi component views look at the number of entities available for each - * component and pick up a reference to the smallest set of candidates to - * test for the given components. - * - * Views in no way affect the functionalities of the registry nor those of - * the underlying pools. - * - * @note - * Multi component views are pretty fast. However their performance tend to - * degenerate when the number of components to iterate grows up and the most - * of the entities have all the given components.
- * To get a performance boost, consider using a group instead. - * - * @tparam Component Type of components used to construct the view. - * @tparam Exclude Types of components used to filter the view. - * @return A newly created view. - */ - template - [[nodiscard]] basic_view, std::add_const_t...> view(exclude_t = {}) const { - static_assert(sizeof...(Component) > 0, "Exclusion-only views are not supported"); - return { *assure>()..., *assure()... }; - } - - /*! @copydoc view */ - template - [[nodiscard]] basic_view, Component...> view(exclude_t = {}) { - static_assert(sizeof...(Component) > 0, "Exclusion-only views are not supported"); - return { *assure>()..., *assure()... }; - } - - /** - * @brief Returns a runtime view for the given components. - * - * This kind of objects are created on the fly and share with the registry - * its internal data structures.
- * Users should throw away the view after use. Fortunately, creating and - * destroying a runtime view is an incredibly cheap operation because they - * do not require any type of initialization.
- * As a rule of thumb, storing a view should never be an option. - * - * Runtime views are to be used when users want to construct a view from - * some external inputs and don't know at compile-time what are the required - * components. - * - * @tparam ItComp Type of input iterator for the components to use to - * construct the view. - * @tparam ItExcl Type of input iterator for the components to use to filter - * the view. - * @param first An iterator to the first element of the range of components - * to use to construct the view. - * @param last An iterator past the last element of the range of components - * to use to construct the view. - * @param from An iterator to the first element of the range of components - * to use to filter the view. - * @param to An iterator past the last element of the range of components to - * use to filter the view. - * @return A newly created runtime view. - */ - template - [[nodiscard]] basic_runtime_view runtime_view(ItComp first, ItComp last, ItExcl from = {}, ItExcl to = {}) const { - std::vector component(std::distance(first, last)); - std::vector filter(std::distance(from, to)); - - std::transform(first, last, component.begin(), [this](const auto ctype) { - const auto it = std::find_if(pools.cbegin(), pools.cend(), [ctype](auto &&pdata) { return pdata.poly && pdata.poly->value_type().hash() == ctype; }); - return it == pools.cend() ? nullptr : it->pool.get(); - }); - - std::transform(from, to, filter.begin(), [this](const auto ctype) { - const auto it = std::find_if(pools.cbegin(), pools.cend(), [ctype](auto &&pdata) { return pdata.poly && pdata.poly->value_type().hash() == ctype; }); - return it == pools.cend() ? nullptr : it->pool.get(); - }); - - return { std::move(component), std::move(filter) }; - } - - /** - * @brief Returns a group for the given components. - * - * This kind of objects are created on the fly and share with the registry - * its internal data structures.
- * Feel free to discard a group after the use. Creating and destroying a - * group is an incredibly cheap operation because they do not require any - * type of initialization, but for the first time they are requested.
- * As a rule of thumb, storing a group should never be an option. - * - * Groups support exclusion lists and can own types of components. The more - * types are owned by a group, the faster it is to iterate entities and - * components.
- * However, groups also affect some features of the registry such as the - * creation and destruction of components, which will consequently be - * slightly slower (nothing that can be noticed in most cases). - * - * @note - * Pools of components that are owned by a group cannot be sorted anymore. - * The group takes the ownership of the pools and arrange components so as - * to iterate them as fast as possible. - * - * @tparam Owned Types of components owned by the group. - * @tparam Get Types of components observed by the group. - * @tparam Exclude Types of components used to filter the group. - * @return A newly created group. - */ - template - [[nodiscard]] basic_group, get_t, Owned...> group(get_t, exclude_t = {}) { - static_assert(sizeof...(Owned) + sizeof...(Get) > 0, "Exclusion-only groups are not supported"); - static_assert(sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude) > 1, "Single component groups are not allowed"); - - using handler_type = group_handler, get_t...>, std::remove_const_t...>; - - const auto cpools = std::make_tuple(assure>()..., assure>()...); - constexpr auto size = sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude); - handler_type *handler = nullptr; - - if(auto it = std::find_if(groups.cbegin(), groups.cend(), [size](const auto &gdata) { - return gdata.size == size - && (gdata.owned(type_hash>::value()) && ...) - && (gdata.get(type_hash>::value()) && ...) - && (gdata.exclude(type_hash::value()) && ...); - }); it != groups.cend()) - { - handler = static_cast(it->group.get()); - } - - if(!handler) { - group_data candidate = { - size, - { new handler_type{}, [](void *instance) { delete static_cast(instance); } }, - []([[maybe_unused]] const id_type ctype) ENTT_NOEXCEPT { return ((ctype == type_hash>::value()) || ...); }, - []([[maybe_unused]] const id_type ctype) ENTT_NOEXCEPT { return ((ctype == type_hash>::value()) || ...); }, - []([[maybe_unused]] const id_type ctype) ENTT_NOEXCEPT { return ((ctype == type_hash::value()) || ...); }, - }; - - handler = static_cast(candidate.group.get()); - - const void *maybe_valid_if = nullptr; - const void *discard_if = nullptr; - - if constexpr(sizeof...(Owned) == 0) { - groups.push_back(std::move(candidate)); - } else { - ENTT_ASSERT(std::all_of(groups.cbegin(), groups.cend(), [size](const auto &gdata) { - const auto overlapping = (0u + ... + gdata.owned(type_hash>::value())); - const auto sz = overlapping + (0u + ... + gdata.get(type_hash>::value())) + (0u + ... + gdata.exclude(type_hash::value())); - return !overlapping || ((sz == size) || (sz == gdata.size)); - }), "Conflicting groups"); - - const auto next = std::find_if_not(groups.cbegin(), groups.cend(), [size](const auto &gdata) { - return !(0u + ... + gdata.owned(type_hash>::value())) || (size > gdata.size); - }); - - const auto prev = std::find_if(std::make_reverse_iterator(next), groups.crend(), [](const auto &gdata) { - return (0u + ... + gdata.owned(type_hash>::value())); - }); - - maybe_valid_if = (next == groups.cend() ? maybe_valid_if : next->group.get()); - discard_if = (prev == groups.crend() ? discard_if : prev->group.get()); - groups.insert(next, std::move(candidate)); - } - - (on_construct>().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>>(*handler), ...); - (on_construct>().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>>(*handler), ...); - (on_destroy().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>(*handler), ...); - - (on_destroy>().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); - (on_destroy>().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); - (on_construct().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); - - if constexpr(sizeof...(Owned) == 0) { - for(const auto entity: view(exclude)) { - handler->current.emplace(entity); - } - } else { - // we cannot iterate backwards because we want to leave behind valid entities in case of owned types - for(auto *first = std::get<0>(cpools)->data(), *last = first + std::get<0>(cpools)->size(); first != last; ++first) { - handler->template maybe_valid_if...>>>(*this, *first); - } - } - } - - return { handler->current, *std::get> *>(cpools)..., *std::get> *>(cpools)... }; - } - - /** - * @brief Returns a group for the given components. - * - * @sa group - * - * @tparam Owned Types of components owned by the group. - * @tparam Get Types of components observed by the group. - * @tparam Exclude Types of components used to filter the group. - * @return A newly created group. - */ - template - [[nodiscard]] basic_group, get_t...>, std::add_const_t...> group_if_exists(get_t, exclude_t = {}) const { - if(auto it = std::find_if(groups.cbegin(), groups.cend(), [](const auto &gdata) { - return gdata.size == (sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude)) - && (gdata.owned(type_hash>::value()) && ...) - && (gdata.get(type_hash>::value()) && ...) - && (gdata.exclude(type_hash::value()) && ...); - }); it == groups.cend()) - { - return {}; - } else { - using handler_type = group_handler, get_t...>, std::remove_const_t...>; - return { static_cast(it->group.get())->current, *pool_if_exists>()... , *pool_if_exists>()... }; - } - } - - /** - * @brief Returns a group for the given components. - * - * @sa group - * - * @tparam Owned Types of components owned by the group. - * @tparam Exclude Types of components used to filter the group. - * @return A newly created group. - */ - template - [[nodiscard]] basic_group, get_t<>, Owned...> group(exclude_t = {}) { - return group(get_t<>{}, exclude); - } - - /** - * @brief Returns a group for the given components. - * - * @sa group_if_exists - * - * @tparam Owned Types of components owned by the group. - * @tparam Exclude Types of components used to filter the group. - * @return A newly created group. - */ - template - [[nodiscard]] basic_group, get_t<>, std::add_const_t...> group_if_exists(exclude_t = {}) const { - return group_if_exists...>(get_t<>{}, exclude); - } - - /** - * @brief Checks whether the given components belong to any group. - * @tparam Component Types of components in which one is interested. - * @return True if the pools of the given components are sortable, false - * otherwise. - */ - template - [[nodiscard]] bool sortable() const { - return std::none_of(groups.cbegin(), groups.cend(), [](auto &&gdata) { return (gdata.owned(type_hash>::value()) || ...); }); - } - - /** - * @brief Checks whether a group can be sorted. - * @tparam Owned Types of components owned by the group. - * @tparam Get Types of components observed by the group. - * @tparam Exclude Types of components used to filter the group. - * @return True if the group can be sorted, false otherwise. - */ - template - [[nodiscard]] bool sortable(const basic_group, get_t, Owned...> &) ENTT_NOEXCEPT { - constexpr auto size = sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude); - return std::find_if(groups.cbegin(), groups.cend(), [size](const auto &gdata) { - return (0u + ... + gdata.owned(type_hash>::value())) && (size < gdata.size); - }) == groups.cend(); - } - - /** - * @brief Sorts the pool of entities for the given component. - * - * The order of the elements in a pool is highly affected by assignments - * of components to entities and deletions. Components are arranged to - * maximize the performance during iterations and users should not make any - * assumption on the order.
- * This function can be used to impose an order to the elements in the pool - * of the given component. The order is kept valid until a component of the - * given type is assigned or removed from an entity. - * - * The comparison function object must return `true` if the first element - * is _less_ than the second one, `false` otherwise. The signature of the - * comparison function should be equivalent to one of the following: - * - * @code{.cpp} - * bool(const Entity, const Entity); - * bool(const Component &, const Component &); - * @endcode - * - * Moreover, the comparison function object shall induce a - * _strict weak ordering_ on the values. - * - * The sort function oject must offer a member function template - * `operator()` that accepts three arguments: - * - * * An iterator to the first element of the range to sort. - * * An iterator past the last element of the range to sort. - * * A comparison function to use to compare the elements. - * - * The comparison funtion object received by the sort function object hasn't - * necessarily the type of the one passed along with the other parameters to - * this member function. - * - * @warning - * Pools of components owned by a group cannot be sorted. - * - * @tparam Component Type of components to sort. - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort(Compare compare, Sort algo = Sort{}, Args &&... args) { - ENTT_ASSERT(sortable(), "Cannot sort owned storage"); - assure()->sort(std::move(compare), std::move(algo), std::forward(args)...); - } - - /** - * @brief Sorts two pools of components in the same way. - * - * The order of the elements in a pool is highly affected by assignments - * of components to entities and deletions. Components are arranged to - * maximize the performance during iterations and users should not make any - * assumption on the order. - * - * It happens that different pools of components must be sorted the same way - * because of runtime and/or performance constraints. This function can be - * used to order a pool of components according to the order between the - * entities in another pool of components. - * - * @b How @b it @b works - * - * Being `A` and `B` the two sets where `B` is the master (the one the order - * of which rules) and `A` is the slave (the one to sort), after a call to - * this function an iterator for `A` will return the entities according to - * the following rules: - * - * * All the entities in `A` that are also in `B` are returned first - * according to the order they have in `B`. - * * All the entities in `A` that are not in `B` are returned in no - * particular order after all the other entities. - * - * Any subsequent change to `B` won't affect the order in `A`. - * - * @warning - * Pools of components owned by a group cannot be sorted. - * - * @tparam To Type of components to sort. - * @tparam From Type of components to use to sort. - */ - template - void sort() { - ENTT_ASSERT(sortable(), "Cannot sort owned storage"); - assure()->respect(*assure()); - } - - /** - * @brief Visits an entity and returns the type info for its components. - * - * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const type_info); - * @endcode - * - * Returned identifiers are those of the components owned by the entity. - * - * @sa type_info - * - * @warning - * It's not specified whether a component attached to or removed from the - * given entity during the visit is returned or not to the caller. - * - * @tparam Func Type of the function object to invoke. - * @param entity A valid entity identifier. - * @param func A valid function object. - */ - template - void visit(entity_type entity, Func func) const { - for(auto pos = pools.size(); pos; --pos) { - if(const auto &pdata = pools[pos-1]; pdata.pool && pdata.pool->contains(entity)) { - func(pdata.poly->value_type()); - } - } - } - - /** - * @brief Visits a registry and returns the type info for its components. - * - * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const type_info); - * @endcode - * - * Returned identifiers are those of the components managed by the registry. - * - * @sa type_info - * - * @warning - * It's not specified whether a component for which a pool is created during - * the visit is returned or not to the caller. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void visit(Func func) const { - for(auto pos = pools.size(); pos; --pos) { - if(const auto &pdata = pools[pos-1]; pdata.pool) { - func(pdata.poly->value_type()); - } - } - } - - /** - * @brief Binds an object to the context of the registry. - * - * If the value already exists it is overwritten, otherwise a new instance - * of the given type is created and initialized with the arguments provided. - * - * @tparam Type Type of object to set. - * @tparam Args Types of arguments to use to construct the object. - * @param args Parameters to use to initialize the value. - * @return A reference to the newly created object. - */ - template - Type & set(Args &&... args) { - unset(); - vars.emplace_back(std::in_place_type, std::forward(args)...); - return any_cast(vars.back()); - } - - /** - * @brief Unsets a context variable if it exists. - * @tparam Type Type of object to set. - */ - template - void unset() { - vars.erase(std::remove_if(vars.begin(), vars.end(), [type = type_id()](auto &&var) { return var.type() == type; }), vars.end()); - } - - /** - * @brief Binds an object to the context of the registry. - * - * In case the context doesn't contain the given object, the parameters - * provided are used to construct it. - * - * @tparam Type Type of object to set. - * @tparam Args Types of arguments to use to construct the object. - * @param args Parameters to use to initialize the object. - * @return A reference to the object in the context of the registry. - */ - template - [[nodiscard]] Type & ctx_or_set(Args &&... args) { - auto *value = try_ctx(); - return value ? *value : set(std::forward(args)...); - } - - /** - * @brief Returns a pointer to an object in the context of the registry. - * @tparam Type Type of object to get. - * @return A pointer to the object if it exists in the context of the - * registry, a null pointer otherwise. - */ - template - [[nodiscard]] std::add_const_t * try_ctx() const { - auto it = std::find_if(vars.cbegin(), vars.cend(), [type = type_id()](auto &&var) { return var.type() == type; }); - return it == vars.cend() ? nullptr : any_cast>(&*it); - } - - /*! @copydoc try_ctx */ - template - [[nodiscard]] Type * try_ctx() { - auto it = std::find_if(vars.begin(), vars.end(), [type = type_id()](auto &&var) { return var.type() == type; }); - return it == vars.end() ? nullptr : any_cast(&*it); - } - - /** - * @brief Returns a reference to an object in the context of the registry. - * - * @warning - * Attempting to get a context variable that doesn't exist results in - * undefined behavior. - * - * @tparam Type Type of object to get. - * @return A valid reference to the object in the context of the registry. - */ - template - [[nodiscard]] std::add_const_t & ctx() const { - auto it = std::find_if(vars.cbegin(), vars.cend(), [type = type_id()](auto &&var) { return var.type() == type; }); - ENTT_ASSERT(it != vars.cend(), "Invalid instance"); - return any_cast &>(*it); - } - - /*! @copydoc ctx */ - template - [[nodiscard]] Type & ctx() { - auto it = std::find_if(vars.begin(), vars.end(), [type = type_id()](auto &&var) { return var.type() == type; }); - ENTT_ASSERT(it != vars.end(), "Invalid instance"); - return any_cast(*it); - } - - /** - * @brief Visits a registry and returns the type info for its context - * variables. - * - * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const type_info); - * @endcode - * - * Returned identifiers are those of the context variables currently set. - * - * @sa type_info - * - * @warning - * It's not specified whether a context variable created during the visit is - * returned or not to the caller. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void ctx(Func func) const { - for(auto pos = vars.size(); pos; --pos) { - func(vars[pos-1].type()); - } - } - -private: - std::vector> vars{}; - mutable std::vector pools{}; - std::vector groups{}; - std::vector entities{}; - entity_type free_list{tombstone}; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/runtime_view.hpp b/LiteLoader/Header/third-party/entt/entity/runtime_view.hpp deleted file mode 100644 index e653a9f..0000000 --- a/LiteLoader/Header/third-party/entt/entity/runtime_view.hpp +++ /dev/null @@ -1,245 +0,0 @@ -#ifndef ENTT_ENTITY_RUNTIME_VIEW_HPP -#define ENTT_ENTITY_RUNTIME_VIEW_HPP - - -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "entity.hpp" -#include "sparse_set.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @brief Runtime view. - * - * Runtime views iterate over those entities that have at least all the given - * components in their bags. During initialization, a runtime view looks at the - * number of entities available for each component and picks up a reference to - * the smallest set of candidate entities in order to get a performance boost - * when iterate.
- * Order of elements during iterations are highly dependent on the order of the - * underlying data structures. See sparse_set and its specializations for more - * details. - * - * @b Important - * - * Iterators aren't invalidated if: - * - * * New instances of the given components are created and assigned to entities. - * * The entity currently pointed is modified (as an example, if one of the - * given components is removed from the entity to which the iterator points). - * * The entity currently pointed is destroyed. - * - * In all the other cases, modifying the pools of the given components in any - * way invalidates all the iterators and using them results in undefined - * behavior. - * - * @note - * Views share references to the underlying data structures of the registry that - * generated them. Therefore any change to the entities and to the components - * made by means of the registry are immediately reflected by the views, unless - * a pool was missing when the view was built (in this case, the view won't - * have a valid reference and won't be updated accordingly). - * - * @warning - * Lifetime of a view must not overcome that of the registry that generated it. - * In any other case, attempting to use a view results in undefined behavior. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -class basic_runtime_view final { - using basic_common_type = basic_sparse_set; - using underlying_iterator = typename basic_common_type::iterator; - - class view_iterator final { - [[nodiscard]] bool valid() const { - const auto entt = *it; - - return (!stable_storage || (entt != tombstone)) - && std::all_of(pools->begin()++, pools->end(), [entt](const auto *curr) { return curr->contains(entt); }) - && std::none_of(filter->cbegin(), filter->cend(), [entt](const auto *curr) { return curr && curr->contains(entt); }); - } - - public: - using difference_type = typename underlying_iterator::difference_type; - using value_type = typename underlying_iterator::value_type; - using pointer = typename underlying_iterator::pointer; - using reference = typename underlying_iterator::reference; - using iterator_category = std::bidirectional_iterator_tag; - - view_iterator() ENTT_NOEXCEPT = default; - - view_iterator(const std::vector &cpools, const std::vector &ignore, underlying_iterator curr) ENTT_NOEXCEPT - : pools{&cpools}, - filter{&ignore}, - it{curr}, - stable_storage{std::any_of(pools->cbegin(), pools->cend(), [](const basic_common_type *cpool) { return (cpool->policy() == deletion_policy::in_place); })} - { - if(it != (*pools)[0]->end() && !valid()) { - ++(*this); - } - } - - view_iterator & operator++() { - while(++it != (*pools)[0]->end() && !valid()); - return *this; - } - - view_iterator operator++(int) { - view_iterator orig = *this; - return ++(*this), orig; - } - - view_iterator & operator--() ENTT_NOEXCEPT { - while(--it != (*pools)[0]->begin() && !valid()); - return *this; - } - - view_iterator operator--(int) ENTT_NOEXCEPT { - view_iterator orig = *this; - return operator--(), orig; - } - - [[nodiscard]] bool operator==(const view_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const view_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - [[nodiscard]] pointer operator->() const { - return it.operator->(); - } - - [[nodiscard]] reference operator*() const { - return *operator->(); - } - - private: - const std::vector *pools; - const std::vector *filter; - underlying_iterator it; - bool stable_storage; - }; - - [[nodiscard]] bool valid() const { - return !pools.empty() && pools.front(); - } - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Bidirectional iterator type. */ - using iterator = view_iterator; - - /*! @brief Default constructor to use to create empty, invalid views. */ - basic_runtime_view() ENTT_NOEXCEPT - : pools{}, - filter{} - {} - - /** - * @brief Constructs a runtime view from a set of storage classes. - * @param cpools The storage for the types to iterate. - * @param epools The storage for the types used to filter the view. - */ - basic_runtime_view(std::vector cpools, std::vector epools) ENTT_NOEXCEPT - : pools{std::move(cpools)}, - filter{std::move(epools)} - { - // brings the best candidate (if any) on front of the vector - std::rotate(pools.begin(), std::min_element(pools.begin(), pools.end(), [](const auto *lhs, const auto *rhs) { - return (!lhs && rhs) || (lhs && rhs && lhs->size() < rhs->size()); - }), pools.end()); - } - - /** - * @brief Estimates the number of entities iterated by the view. - * @return Estimated number of entities iterated by the view. - */ - [[nodiscard]] size_type size_hint() const { - return valid() ? pools.front()->size() : size_type{}; - } - - /** - * @brief Returns an iterator to the first entity that has the given - * components. - * - * The returned iterator points to the first entity that has the given - * components. If the view is empty, the returned iterator will be equal to - * `end()`. - * - * @return An iterator to the first entity that has the given components. - */ - [[nodiscard]] iterator begin() const { - return valid() ? iterator{pools, filter, pools[0]->begin()} : iterator{}; - } - - /** - * @brief Returns an iterator that is past the last entity that has the - * given components. - * - * The returned iterator points to the entity following the last entity that - * has the given components. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the entity following the last entity that has the - * given components. - */ - [[nodiscard]] iterator end() const { - return valid() ? iterator{pools, filter, pools[0]->end()} : iterator{}; - } - - /** - * @brief Checks if a view contains an entity. - * @param entt A valid entity identifier. - * @return True if the view contains the given entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const { - return valid() && std::all_of(pools.cbegin(), pools.cend(), [entt](const auto *curr) { return curr->contains(entt); }) - && std::none_of(filter.cbegin(), filter.cend(), [entt](const auto *curr) { return curr && curr->contains(entt); }); - } - - /** - * @brief Iterates entities and applies the given function object to them. - * - * The function object is invoked for each entity. It is provided only with - * the entity itself. To get the components, users can use the registry with - * which the view was built.
- * The signature of the function should be equivalent to the following: - * - * @code{.cpp} - * void(const entity_type); - * @endcode - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - for(const auto entity: *this) { - func(entity); - } - } - -private: - std::vector pools; - std::vector filter; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/sparse_set.hpp b/LiteLoader/Header/third-party/entt/entity/sparse_set.hpp deleted file mode 100644 index 1350dfa..0000000 --- a/LiteLoader/Header/third-party/entt/entity/sparse_set.hpp +++ /dev/null @@ -1,870 +0,0 @@ -#ifndef ENTT_ENTITY_SPARSE_SET_HPP -#define ENTT_ENTITY_SPARSE_SET_HPP - - -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/algorithm.hpp" -#include "../core/fwd.hpp" -#include "entity.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/*! @brief Sparse set deletion policy. */ -enum class deletion_policy: std::uint8_t { - /*! @brief Swap-and-pop deletion policy. */ - swap_and_pop = 0u, - /*! @brief In-place deletion policy. */ - in_place = 1u -}; - - -/** - * @brief Basic sparse set implementation. - * - * Sparse set or packed array or whatever is the name users give it.
- * Two arrays: an _external_ one and an _internal_ one; a _sparse_ one and a - * _packed_ one; one used for direct access through contiguous memory, the other - * one used to get the data through an extra level of indirection.
- * This is largely used by the registry to offer users the fastest access ever - * to the components. Views and groups in general are almost entirely designed - * around sparse sets. - * - * This type of data structure is widely documented in the literature and on the - * web. This is nothing more than a customized implementation suitable for the - * purpose of the framework. - * - * @note - * Internal data structures arrange elements to maximize performance. There are - * no guarantees that entities are returned in the insertion order when iterate - * a sparse set. Do not make assumption on the order in any case. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Allocator Type of allocator used to manage memory and elements. - */ -template -class basic_sparse_set { - static constexpr auto growth_factor = 1.5; - static constexpr auto sparse_page = ENTT_SPARSE_PAGE; - - using traits_type = entt_traits; - - using alloc_traits = typename std::allocator_traits::template rebind_traits; - using alloc_pointer = typename alloc_traits::pointer; - using alloc_const_pointer = typename alloc_traits::const_pointer; - - using bucket_alloc_traits = typename std::allocator_traits::template rebind_traits; - using bucket_alloc_pointer = typename bucket_alloc_traits::pointer; - - static_assert(alloc_traits::propagate_on_container_move_assignment::value); - static_assert(bucket_alloc_traits::propagate_on_container_move_assignment::value); - - struct sparse_set_iterator final { - using difference_type = typename traits_type::difference_type; - using value_type = Entity; - using pointer = const value_type *; - using reference = const value_type &; - using iterator_category = std::random_access_iterator_tag; - - sparse_set_iterator() ENTT_NOEXCEPT = default; - - sparse_set_iterator(const alloc_const_pointer *ref, const difference_type idx) ENTT_NOEXCEPT - : packed{ref}, - index{idx} - {} - - sparse_set_iterator & operator++() ENTT_NOEXCEPT { - return --index, *this; - } - - sparse_set_iterator operator++(int) ENTT_NOEXCEPT { - iterator orig = *this; - return ++(*this), orig; - } - - sparse_set_iterator & operator--() ENTT_NOEXCEPT { - return ++index, *this; - } - - sparse_set_iterator operator--(int) ENTT_NOEXCEPT { - sparse_set_iterator orig = *this; - return operator--(), orig; - } - - sparse_set_iterator & operator+=(const difference_type value) ENTT_NOEXCEPT { - index -= value; - return *this; - } - - sparse_set_iterator operator+(const difference_type value) const ENTT_NOEXCEPT { - sparse_set_iterator copy = *this; - return (copy += value); - } - - sparse_set_iterator & operator-=(const difference_type value) ENTT_NOEXCEPT { - return (*this += -value); - } - - sparse_set_iterator operator-(const difference_type value) const ENTT_NOEXCEPT { - return (*this + -value); - } - - difference_type operator-(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return other.index - index; - } - - [[nodiscard]] reference operator[](const difference_type value) const { - const auto pos = size_type(index-value-1u); - return (*packed)[pos]; - } - - [[nodiscard]] bool operator==(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return other.index == index; - } - - [[nodiscard]] bool operator!=(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - [[nodiscard]] bool operator<(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return index > other.index; - } - - [[nodiscard]] bool operator>(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return index < other.index; - } - - [[nodiscard]] bool operator<=(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return !(*this > other); - } - - [[nodiscard]] bool operator>=(const sparse_set_iterator &other) const ENTT_NOEXCEPT { - return !(*this < other); - } - - [[nodiscard]] pointer operator->() const { - const auto pos = size_type(index-1u); - return std::addressof((*packed)[pos]); - } - - [[nodiscard]] reference operator*() const { - return *operator->(); - } - - private: - const alloc_const_pointer *packed; - difference_type index; - }; - - [[nodiscard]] static auto page(const Entity entt) ENTT_NOEXCEPT { - return static_cast(traits_type::to_entity(entt) / sparse_page); - } - - [[nodiscard]] static auto offset(const Entity entt) ENTT_NOEXCEPT { - return static_cast(traits_type::to_entity(entt) & (sparse_page - 1)); - } - - [[nodiscard]] auto assure_page(const std::size_t idx) { - if(!(idx < bucket)) { - const size_type sz = idx + 1u; - const auto mem = bucket_alloc_traits::allocate(bucket_allocator, sz); - - std::uninitialized_value_construct(mem + bucket, mem + sz); - std::uninitialized_copy(sparse, sparse + bucket, mem); - - std::destroy(sparse, sparse + bucket); - bucket_alloc_traits::deallocate(bucket_allocator, sparse, bucket); - - sparse = mem; - bucket = sz; - } - - if(!sparse[idx]) { - sparse[idx] = alloc_traits::allocate(allocator, sparse_page); - std::uninitialized_fill(sparse[idx], sparse[idx] + sparse_page, null); - } - - return sparse[idx]; - } - - void resize_packed(const std::size_t req) { - ENTT_ASSERT((req != reserved) && !(req < count), "Invalid request"); - const auto mem = alloc_traits::allocate(allocator, req); - - std::uninitialized_copy(packed, packed + count, mem); - std::uninitialized_fill(mem + count, mem + req, tombstone); - - std::destroy(packed, packed + reserved); - alloc_traits::deallocate(allocator, packed, reserved); - - packed = mem; - reserved = req; - } - - void release_memory() { - if(packed) { - for(size_type pos{}; pos < bucket; ++pos) { - if(sparse[pos]) { - std::destroy(sparse[pos], sparse[pos] + sparse_page); - alloc_traits::deallocate(allocator, sparse[pos], sparse_page); - } - } - - std::destroy(packed, packed + reserved); - std::destroy(sparse, sparse + bucket); - alloc_traits::deallocate(allocator, packed, reserved); - bucket_alloc_traits::deallocate(bucket_allocator, sparse, bucket); - } - } - -protected: - /** - * @brief Swaps two entities in the internal packed array. - * @param lhs A valid position of an entity within storage. - * @param rhs A valid position of an entity within storage. - */ - virtual void swap_at([[maybe_unused]] const std::size_t lhs, [[maybe_unused]] const std::size_t rhs) {} - - /** - * @brief Moves an entity in the internal packed array. - * @param from A valid position of an entity within storage. - * @param to A valid position of an entity within storage. - */ - virtual void move_and_pop([[maybe_unused]] const std::size_t from, [[maybe_unused]] const std::size_t to) {} - - /** - * @brief Attempts to erase an entity from the internal packed array. - * @param entt A valid entity identifier. - * @param ud Optional user data that are forwarded as-is to derived classes. - */ - virtual void swap_and_pop(const Entity entt, [[maybe_unused]] void *ud) { - auto &ref = sparse[page(entt)][offset(entt)]; - const auto pos = static_cast(traits_type::to_entity(ref)); - ENTT_ASSERT(packed[pos] == entt, "Invalid entity identifier"); - auto &last = packed[--count]; - - packed[pos] = last; - sparse[page(last)][offset(last)] = ref; - // lazy self-assignment guard - ref = null; - // unnecessary but it helps to detect nasty bugs - ENTT_ASSERT((last = tombstone, true), ""); - } - - /** - * @brief Attempts to erase an entity from the internal packed array. - * @param entt A valid entity identifier. - * @param ud Optional user data that are forwarded as-is to derived classes. - */ - virtual void in_place_pop(const Entity entt, [[maybe_unused]] void *ud) { - auto &ref = sparse[page(entt)][offset(entt)]; - const auto pos = static_cast(traits_type::to_entity(ref)); - ENTT_ASSERT(packed[pos] == entt, "Invalid entity identifier"); - - packed[pos] = std::exchange(free_list, traits_type::construct(static_cast(pos))); - // lazy self-assignment guard - ref = null; - } - -public: - /*! @brief Allocator type. */ - using allocator_type = typename alloc_traits::allocator_type; - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Pointer type to contained entities. */ - using pointer = alloc_const_pointer; - /*! @brief Random access iterator type. */ - using iterator = sparse_set_iterator; - /*! @brief Reverse iterator type. */ - using reverse_iterator = std::reverse_iterator; - - /** - * @brief Constructs an empty container with the given policy and allocator. - * @param pol Type of deletion policy. - * @param alloc Allocator to use (possibly default-constructed). - */ - explicit basic_sparse_set(deletion_policy pol, const allocator_type &alloc = {}) - : allocator{alloc}, - bucket_allocator{alloc}, - sparse{bucket_alloc_traits::allocate(bucket_allocator, 0u)}, - packed{alloc_traits::allocate(allocator, 0u)}, - bucket{0u}, - count{0u}, - reserved{0u}, - free_list{tombstone}, - mode{pol} - {} - - /** - * @brief Constructs an empty container with the given allocator. - * @param alloc Allocator to use (possibly default-constructed). - */ - explicit basic_sparse_set(const allocator_type &alloc = {}) - : basic_sparse_set{deletion_policy::swap_and_pop, alloc} - {} - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - basic_sparse_set(basic_sparse_set &&other) ENTT_NOEXCEPT - : allocator{std::move(other.allocator)}, - bucket_allocator{std::move(other.bucket_allocator)}, - sparse{std::exchange(other.sparse, bucket_alloc_pointer{})}, - packed{std::exchange(other.packed, alloc_pointer{})}, - bucket{std::exchange(other.bucket, 0u)}, - count{std::exchange(other.count, 0u)}, - reserved{std::exchange(other.reserved, 0u)}, - free_list{std::exchange(other.free_list, tombstone)}, - mode{other.mode} - {} - - /*! @brief Default destructor. */ - virtual ~basic_sparse_set() { - release_memory(); - } - - /** - * @brief Move assignment operator. - * @param other The instance to move from. - * @return This sparse set. - */ - basic_sparse_set & operator=(basic_sparse_set &&other) ENTT_NOEXCEPT { - release_memory(); - - allocator = std::move(other.allocator); - bucket_allocator = std::move(other.bucket_allocator); - sparse = std::exchange(other.sparse, bucket_alloc_pointer{}); - packed = std::exchange(other.packed, alloc_pointer{}); - bucket = std::exchange(other.bucket, 0u); - count = std::exchange(other.count, 0u); - reserved = std::exchange(other.reserved, 0u); - free_list = std::exchange(other.free_list, tombstone); - mode = other.mode; - - return *this; - } - - /** - * @brief Returns the deletion policy of a sparse set. - * @return The deletion policy of the sparse set. - */ - [[nodiscard]] deletion_policy policy() const ENTT_NOEXCEPT { - return mode; - } - - /** - * @brief Returns the next slot available for insertion. - * @return The next slot available for insertion. - */ - [[nodiscard]] size_type slot() const ENTT_NOEXCEPT { - return free_list == null ? count : static_cast(traits_type::to_entity(free_list)); - } - - /** - * @brief Increases the capacity of a sparse set. - * - * If the new capacity is greater than the current capacity, new storage is - * allocated, otherwise the method does nothing. - * - * @param cap Desired capacity. - */ - void reserve(const size_type cap) { - if(cap > reserved) { - resize_packed(cap); - } - } - - /** - * @brief Returns the number of elements that a sparse set has currently - * allocated space for. - * @return Capacity of the sparse set. - */ - [[nodiscard]] size_type capacity() const ENTT_NOEXCEPT { - return reserved; - } - - /*! @brief Requests the removal of unused capacity. */ - void shrink_to_fit() { - if(count < reserved) { - resize_packed(count); - } - } - - /** - * @brief Returns the extent of a sparse set. - * - * The extent of a sparse set is also the size of the internal sparse array. - * There is no guarantee that the internal packed array has the same size. - * Usually the size of the internal sparse array is equal or greater than - * the one of the internal packed array. - * - * @return Extent of the sparse set. - */ - [[nodiscard]] size_type extent() const ENTT_NOEXCEPT { - return bucket * sparse_page; - } - - /** - * @brief Returns the number of elements in a sparse set. - * - * The number of elements is also the size of the internal packed array. - * There is no guarantee that the internal sparse array has the same size. - * Usually the size of the internal sparse array is equal or greater than - * the one of the internal packed array. - * - * @return Number of elements. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return count; - } - - /** - * @brief Checks whether a sparse set is empty. - * @return True if the sparse set is empty, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return (count == size_type{}); - } - - /** - * @brief Direct access to the internal packed array. - * @return A pointer to the internal packed array. - */ - [[nodiscard]] pointer data() const ENTT_NOEXCEPT { - return packed; - } - - /** - * @brief Returns an iterator to the beginning. - * - * The returned iterator points to the first entity of the internal packed - * array. If the sparse set is empty, the returned iterator will be equal to - * `end()`. - * - * @return An iterator to the first entity of the internal packed array. - */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return iterator{std::addressof(packed), static_cast(count)}; - } - - /** - * @brief Returns an iterator to the end. - * - * The returned iterator points to the element following the last entity in - * the internal packed array. Attempting to dereference the returned - * iterator results in undefined behavior. - * - * @return An iterator to the element following the last entity of the - * internal packed array. - */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return iterator{std::addressof(packed), {}}; - } - - /** - * @brief Returns a reverse iterator to the beginning. - * - * The returned iterator points to the first entity of the reversed internal - * packed array. If the sparse set is empty, the returned iterator will be - * equal to `rend()`. - * - * @return An iterator to the first entity of the reversed internal packed - * array. - */ - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return std::make_reverse_iterator(end()); - } - - /** - * @brief Returns a reverse iterator to the end. - * - * The returned iterator points to the element following the last entity in - * the reversed internal packed array. Attempting to dereference the - * returned iterator results in undefined behavior. - * - * @return An iterator to the element following the last entity of the - * reversed internal packed array. - */ - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return std::make_reverse_iterator(begin()); - } - - /** - * @brief Finds an entity. - * @param entt A valid entity identifier. - * @return An iterator to the given entity if it's found, past the end - * iterator otherwise. - */ - [[nodiscard]] iterator find(const entity_type entt) const ENTT_NOEXCEPT { - return contains(entt) ? --(end() - index(entt)) : end(); - } - - /** - * @brief Checks if a sparse set contains an entity. - * @param entt A valid entity identifier. - * @return True if the sparse set contains the entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const ENTT_NOEXCEPT { - ENTT_ASSERT(entt != tombstone && entt != null, "Invalid entity"); - const auto curr = page(entt); - // testing versions permits to avoid accessing the packed array - return (curr < bucket && sparse[curr] && sparse[curr][offset(entt)] != null); - } - - /** - * @brief Returns the position of an entity in a sparse set. - * - * @warning - * Attempting to get the position of an entity that doesn't belong to the - * sparse set results in undefined behavior. - * - * @param entt A valid entity identifier. - * @return The position of the entity in the sparse set. - */ - [[nodiscard]] size_type index(const entity_type entt) const ENTT_NOEXCEPT { - ENTT_ASSERT(contains(entt), "Set does not contain entity"); - return static_cast(traits_type::to_entity(sparse[page(entt)][offset(entt)])); - } - - /** - * @brief Returns the entity at specified location, with bounds checking. - * @param pos The position for which to return the entity. - * @return The entity at specified location if any, a null entity otherwise. - */ - [[nodiscard]] entity_type at(const size_type pos) const ENTT_NOEXCEPT { - return pos < count ? packed[pos] : null; - } - - /** - * @brief Returns the entity at specified location, without bounds checking. - * @param pos The position for which to return the entity. - * @return The entity at specified location. - */ - [[nodiscard]] entity_type operator[](const size_type pos) const ENTT_NOEXCEPT { - ENTT_ASSERT(pos < count, "Position is out of bounds"); - return packed[pos]; - } - - /** - * @brief Appends an entity to a sparse set. - * - * @warning - * Attempting to assign an entity that already belongs to the sparse set - * results in undefined behavior. - * - * @param entt A valid entity identifier. - * @return The slot used for insertion. - */ - size_type emplace_back(const entity_type entt) { - ENTT_ASSERT(!contains(entt), "Set already contains entity"); - - if(count == reserved) { - const size_type sz = static_cast(reserved * growth_factor); - resize_packed(sz + !(sz > reserved)); - } - - assure_page(page(entt))[offset(entt)] = traits_type::construct(static_cast(count)); - packed[count] = entt; - return count++; - } - - /** - * @brief Assigns an entity to a sparse set. - * - * @warning - * Attempting to assign an entity that already belongs to the sparse set - * results in undefined behavior. - * - * @param entt A valid entity identifier. - * @return The slot used for insertion. - */ - size_type emplace(const entity_type entt) { - if(free_list == null) { - return emplace_back(entt); - } else { - ENTT_ASSERT(!contains(entt), "Set already contains entity"); - const auto pos = static_cast(traits_type::to_entity(free_list)); - assure_page(page(entt))[offset(entt)] = traits_type::construct(static_cast(pos)); - free_list = std::exchange(packed[pos], entt); - return pos; - } - } - - /** - * @brief Assigns one or more entities to a sparse set. - * - * @warning - * Attempting to assign an entity that already belongs to the sparse set - * results in undefined behavior. - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - */ - template - void insert(It first, It last) { - reserve(count + std::distance(first, last)); - - for(; first != last; ++first) { - const auto entt = *first; - ENTT_ASSERT(!contains(entt), "Set already contains entity"); - assure_page(page(entt))[offset(entt)] = traits_type::construct(static_cast(count)); - packed[count++] = entt; - } - } - - /** - * @brief Erases an entity from a sparse set. - * - * @warning - * Attempting to erase an entity that doesn't belong to the sparse set - * results in undefined behavior. - * - * @param entt A valid entity identifier. - * @param ud Optional user data that are forwarded as-is to derived classes. - */ - void erase(const entity_type entt, void *ud = nullptr) { - ENTT_ASSERT(contains(entt), "Set does not contain entity"); - (mode == deletion_policy::in_place) ? in_place_pop(entt, ud) : swap_and_pop(entt, ud); - } - - /** - * @brief Erases entities from a set. - * - * @sa erase - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param ud Optional user data that are forwarded as-is to derived classes. - */ - template - void erase(It first, It last, void *ud = nullptr) { - for(; first != last; ++first) { - erase(*first, ud); - } - } - - /** - * @brief Removes an entity from a sparse set if it exists. - * @param entt A valid entity identifier. - * @param ud Optional user data that are forwarded as-is to derived classes. - * @return True if the entity is actually removed, false otherwise. - */ - bool remove(const entity_type entt, void *ud = nullptr) { - return contains(entt) && (erase(entt, ud), true); - } - - /** - * @brief Removes entities from a sparse set if they exist. - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param ud Optional user data that are forwarded as-is to derived classes. - * @return The number of entities actually removed. - */ - template - size_type remove(It first, It last, void *ud = nullptr) { - size_type found{}; - - for(; first != last; ++first) { - found += remove(*first, ud); - } - - return found; - } - - /*! @brief Removes all tombstones from the packed array of a sparse set. */ - void compact() { - size_type next = count; - for(; next && packed[next - 1u] == tombstone; --next); - - for(auto *it = &free_list; *it != null && next; it = std::addressof(packed[traits_type::to_entity(*it)])) { - if(const size_type pos = traits_type::to_entity(*it); pos < next) { - --next; - move_and_pop(next, pos); - std::swap(packed[next], packed[pos]); - sparse[page(packed[pos])][offset(packed[pos])] = traits_type::construct(static_cast(pos)); - *it = traits_type::construct(static_cast(next)); - for(; next && packed[next - 1u] == tombstone; --next); - } - } - - free_list = tombstone; - count = next; - } - - /** - * @copybrief swap_at - * - * For what it's worth, this function affects both the internal sparse array - * and the internal packed array. Users should not care of that anyway. - * - * @warning - * Attempting to swap entities that don't belong to the sparse set results - * in undefined behavior. - * - * @param lhs A valid entity identifier. - * @param rhs A valid entity identifier. - */ - void swap(const entity_type lhs, const entity_type rhs) { - ENTT_ASSERT(contains(lhs), "Set does not contain entity"); - ENTT_ASSERT(contains(rhs), "Set does not contain entity"); - - auto &entt = sparse[page(lhs)][offset(lhs)]; - auto &other = sparse[page(rhs)][offset(rhs)]; - - const auto from = static_cast(traits_type::to_entity(entt)); - const auto to = static_cast(traits_type::to_entity(other)); - - // basic no-leak guarantee (with invalid state) if swapping throws - swap_at(from, to); - std::swap(entt, other); - std::swap(packed[from], packed[to]); - } - - /** - * @brief Sort the first count elements according to the given comparison - * function. - * - * The comparison function object must return `true` if the first element - * is _less_ than the second one, `false` otherwise. The signature of the - * comparison function should be equivalent to the following: - * - * @code{.cpp} - * bool(const Entity, const Entity); - * @endcode - * - * Moreover, the comparison function object shall induce a - * _strict weak ordering_ on the values. - * - * The sort function object must offer a member function template - * `operator()` that accepts three arguments: - * - * * An iterator to the first element of the range to sort. - * * An iterator past the last element of the range to sort. - * * A comparison function to use to compare the elements. - * - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param length Number of elements to sort. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort_n(const size_type length, Compare compare, Sort algo = Sort{}, Args &&... args) { - // basic no-leak guarantee (with invalid state) if sorting throws - ENTT_ASSERT(!(length > count), "Length exceeds the number of elements"); - compact(); - - algo(std::make_reverse_iterator(packed + length), std::make_reverse_iterator(packed), std::move(compare), std::forward(args)...); - - for(size_type pos{}; pos < length; ++pos) { - auto curr = pos; - auto next = index(packed[curr]); - - while(curr != next) { - const auto idx = index(packed[next]); - const auto entt = packed[curr]; - - swap_at(next, idx); - sparse[page(entt)][offset(entt)] = traits_type::construct(static_cast(curr)); - curr = std::exchange(next, idx); - } - } - } - - /** - * @brief Sort all elements according to the given comparison function. - * - * @sa sort_n - * - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort(Compare compare, Sort algo = Sort{}, Args &&... args) { - sort_n(count, std::move(compare), std::move(algo), std::forward(args)...); - } - - /** - * @brief Sort entities according to their order in another sparse set. - * - * Entities that are part of both the sparse sets are ordered internally - * according to the order they have in `other`. All the other entities goes - * to the end of the list and there are no guarantees on their order.
- * In other terms, this function can be used to impose the same order on two - * sets by using one of them as a master and the other one as a slave. - * - * Iterating the sparse set with a couple of iterators returns elements in - * the expected order after a call to `respect`. See `begin` and `end` for - * more details. - * - * @param other The sparse sets that imposes the order of the entities. - */ - void respect(const basic_sparse_set &other) { - compact(); - - const auto to = other.end(); - auto from = other.begin(); - - for(size_type pos = count - 1; pos && from != to; ++from) { - if(contains(*from)) { - if(*from != packed[pos]) { - // basic no-leak guarantee (with invalid state) if swapping throws - swap(packed[pos], *from); - } - - --pos; - } - } - } - - /** - * @brief Clears a sparse set. - * @param ud Optional user data that are forwarded as-is to derived classes. - */ - void clear(void *ud = nullptr) { - for(auto &&entity: *this) { - if(entity != tombstone) { - in_place_pop(entity, ud); - } - } - - free_list = tombstone; - count = 0u; - } - -private: - typename alloc_traits::allocator_type allocator; - typename bucket_alloc_traits::allocator_type bucket_allocator; - bucket_alloc_pointer sparse; - alloc_pointer packed; - std::size_t bucket; - std::size_t count; - std::size_t reserved; - entity_type free_list; - deletion_policy mode; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/storage.hpp b/LiteLoader/Header/third-party/entt/entity/storage.hpp deleted file mode 100644 index e100989..0000000 --- a/LiteLoader/Header/third-party/entt/entity/storage.hpp +++ /dev/null @@ -1,1045 +0,0 @@ -#ifndef ENTT_ENTITY_STORAGE_HPP -#define ENTT_ENTITY_STORAGE_HPP - - -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/algorithm.hpp" -#include "../core/fwd.hpp" -#include "../core/type_traits.hpp" -#include "../signal/sigh.hpp" -#include "component.hpp" -#include "entity.hpp" -#include "fwd.hpp" -#include "sparse_set.hpp" - - -namespace entt { - - -/** - * @brief Basic storage implementation. - * - * This class is a refinement of a sparse set that associates an object to an - * entity. The main purpose of this class is to extend sparse sets to store - * components in a registry. It guarantees fast access both to the elements and - * to the entities. - * - * @note - * Entities and objects have the same order. - * - * @note - * Internal data structures arrange elements to maximize performance. There are - * no guarantees that objects are returned in the insertion order when iterate - * a storage. Do not make assumption on the order in any case. - * - * @warning - * Empty types aren't explicitly instantiated. Therefore, many of the functions - * normally available for non-empty types will not be available for empty ones. - * - * @sa sparse_set - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Type Type of objects assigned to the entities. - * @tparam Allocator Type of allocator used to manage memory and elements. - */ -template -class basic_storage_impl: public basic_sparse_set::template rebind_alloc> { - static constexpr auto packed_page = ENTT_PACKED_PAGE; - - using comp_traits = component_traits; - - using underlying_type = basic_sparse_set::template rebind_alloc>; - using difference_type = typename entt_traits::difference_type; - - using alloc_traits = typename std::allocator_traits::template rebind_traits; - using alloc_pointer = typename alloc_traits::pointer; - using alloc_const_pointer = typename alloc_traits::const_pointer; - - using bucket_alloc_traits = typename std::allocator_traits::template rebind_traits; - using bucket_alloc_pointer = typename bucket_alloc_traits::pointer; - - using bucket_alloc_const_type = typename std::allocator_traits::template rebind_alloc; - using bucket_alloc_const_pointer = typename std::allocator_traits::const_pointer; - - static_assert(alloc_traits::propagate_on_container_move_assignment::value); - static_assert(bucket_alloc_traits::propagate_on_container_move_assignment::value); - - template - struct storage_iterator final { - using difference_type = typename basic_storage_impl::difference_type; - using value_type = Value; - using pointer = value_type *; - using reference = value_type &; - using iterator_category = std::random_access_iterator_tag; - - storage_iterator() ENTT_NOEXCEPT = default; - - storage_iterator(bucket_alloc_pointer const *ref, const typename basic_storage_impl::difference_type idx) ENTT_NOEXCEPT - : packed{ref}, - index{idx} - {} - - storage_iterator & operator++() ENTT_NOEXCEPT { - return --index, *this; - } - - storage_iterator operator++(int) ENTT_NOEXCEPT { - storage_iterator orig = *this; - return ++(*this), orig; - } - - storage_iterator & operator--() ENTT_NOEXCEPT { - return ++index, *this; - } - - storage_iterator operator--(int) ENTT_NOEXCEPT { - storage_iterator orig = *this; - return operator--(), orig; - } - - storage_iterator & operator+=(const difference_type value) ENTT_NOEXCEPT { - index -= value; - return *this; - } - - storage_iterator operator+(const difference_type value) const ENTT_NOEXCEPT { - storage_iterator copy = *this; - return (copy += value); - } - - storage_iterator & operator-=(const difference_type value) ENTT_NOEXCEPT { - return (*this += -value); - } - - storage_iterator operator-(const difference_type value) const ENTT_NOEXCEPT { - return (*this + -value); - } - - difference_type operator-(const storage_iterator &other) const ENTT_NOEXCEPT { - return other.index - index; - } - - [[nodiscard]] reference operator[](const difference_type value) const ENTT_NOEXCEPT { - const auto pos = size_type(index-value-1); - return (*packed)[page(pos)][offset(pos)]; - } - - [[nodiscard]] bool operator==(const storage_iterator &other) const ENTT_NOEXCEPT { - return other.index == index; - } - - [[nodiscard]] bool operator!=(const storage_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - [[nodiscard]] bool operator<(const storage_iterator &other) const ENTT_NOEXCEPT { - return index > other.index; - } - - [[nodiscard]] bool operator>(const storage_iterator &other) const ENTT_NOEXCEPT { - return index < other.index; - } - - [[nodiscard]] bool operator<=(const storage_iterator &other) const ENTT_NOEXCEPT { - return !(*this > other); - } - - [[nodiscard]] bool operator>=(const storage_iterator &other) const ENTT_NOEXCEPT { - return !(*this < other); - } - - [[nodiscard]] pointer operator->() const ENTT_NOEXCEPT { - const auto pos = size_type(index-1u); - return std::addressof((*packed)[page(pos)][offset(pos)]); - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - return *operator->(); - } - - private: - bucket_alloc_pointer const *packed; - difference_type index; - }; - - [[nodiscard]] static auto page(const std::size_t pos) ENTT_NOEXCEPT { - return pos / packed_page; - } - - [[nodiscard]] static auto offset(const std::size_t pos) ENTT_NOEXCEPT { - return pos & (packed_page - 1); - } - - void release_memory() { - if(packed) { - // no-throw stable erase iteration - underlying_type::clear(); - - for(size_type pos{}; pos < bucket; ++pos) { - alloc_traits::deallocate(allocator, packed[pos], packed_page); - bucket_alloc_traits::destroy(bucket_allocator, std::addressof(packed[pos])); - } - - bucket_alloc_traits::deallocate(bucket_allocator, packed, bucket); - } - } - - void assure_at_least(const std::size_t last) { - if(const auto idx = page(last - 1u); !(idx < bucket)) { - const size_type sz = idx + 1u; - const auto mem = bucket_alloc_traits::allocate(bucket_allocator, sz); - std::uninitialized_copy(packed, packed + bucket, mem); - size_type pos{}; - - ENTT_TRY { - for(pos = bucket; pos < sz; ++pos) { - auto pg = alloc_traits::allocate(allocator, packed_page); - bucket_alloc_traits::construct(bucket_allocator, std::addressof(mem[pos]), pg); - } - } ENTT_CATCH { - for(auto next = bucket; next < pos; ++next) { - alloc_traits::deallocate(allocator, mem[next], packed_page); - } - - std::destroy(mem, mem + pos); - bucket_alloc_traits::deallocate(bucket_allocator, mem, sz); - ENTT_THROW; - } - - std::destroy(packed, packed + bucket); - bucket_alloc_traits::deallocate(bucket_allocator, packed, bucket); - - packed = mem; - bucket = sz; - } - } - - void release_unused_pages() { - if(const auto length = underlying_type::size() / packed_page; length < bucket) { - const auto mem = bucket_alloc_traits::allocate(bucket_allocator, length); - std::uninitialized_copy(packed, packed + length, mem); - - for(auto pos = length; pos < bucket; ++pos) { - alloc_traits::deallocate(allocator, packed[pos], packed_page); - bucket_alloc_traits::destroy(bucket_allocator, std::addressof(packed[pos])); - } - - bucket_alloc_traits::deallocate(bucket_allocator, packed, bucket); - - packed = mem; - bucket = length; - } - } - - template - auto & push_at(const std::size_t pos, Args &&... args) { - ENTT_ASSERT(pos < (bucket * packed_page), "Out of bounds index"); - auto *instance = std::addressof(packed[page(pos)][offset(pos)]); - - if constexpr(std::is_aggregate_v) { - alloc_traits::construct(allocator, instance, Type{std::forward(args)...}); - } else { - alloc_traits::construct(allocator, instance, std::forward(args)...); - } - - return *instance; - } - - void pop_at(const std::size_t pos) { - alloc_traits::destroy(allocator, std::addressof(packed[page(pos)][offset(pos)])); - } - -protected: - /*! @copydoc basic_sparse_set::swap_at */ - void swap_at(const std::size_t lhs, const std::size_t rhs) final { - std::swap(packed[page(lhs)][offset(lhs)], packed[page(rhs)][offset(rhs)]); - } - - /*! @copydoc basic_sparse_set::move_and_pop */ - void move_and_pop(const std::size_t from, const std::size_t to) final { - push_at(to, std::move(packed[page(from)][offset(from)])); - pop_at(from); - } - - /*! @copydoc basic_sparse_set::swap_and_pop */ - void swap_and_pop(const Entity entt, void *ud) override { - const auto pos = underlying_type::index(entt); - const auto last = underlying_type::size() - 1u; - auto &&elem = packed[page(pos)][offset(pos)]; - - // support for nosy destructors - [[maybe_unused]] auto unused = std::move(elem); - elem = std::move(packed[page(last)][offset(last)]); - pop_at(last); - - underlying_type::swap_and_pop(entt, ud); - } - - /*! @copydoc basic_sparse_set::in_place_pop */ - void in_place_pop(const Entity entt, void *ud) override { - const auto pos = underlying_type::index(entt); - underlying_type::in_place_pop(entt, ud); - // support for nosy destructors - pop_at(pos); - } - -public: - /*! @brief Allocator type. */ - using allocator_type = typename alloc_traits::allocator_type; - /*! @brief Type of the objects assigned to entities. */ - using value_type = Type; - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Pointer type to contained elements. */ - using pointer = bucket_alloc_pointer; - /*! @brief Constant pointer type to contained elements. */ - using const_pointer = bucket_alloc_const_pointer; - /*! @brief Random access iterator type. */ - using iterator = storage_iterator; - /*! @brief Constant random access iterator type. */ - using const_iterator = storage_iterator; - /*! @brief Reverse iterator type. */ - using reverse_iterator = std::reverse_iterator; - /*! @brief Constant reverse iterator type. */ - using const_reverse_iterator = std::reverse_iterator; - - /** - * @brief Default constructor. - * @param alloc Allocator to use (possibly default-constructed). - */ - explicit basic_storage_impl(const allocator_type &alloc = {}) - : underlying_type{deletion_policy{comp_traits::in_place_delete::value}, alloc}, - allocator{alloc}, - bucket_allocator{alloc}, - packed{bucket_alloc_traits::allocate(bucket_allocator, 0u)}, - bucket{} - {} - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - basic_storage_impl(basic_storage_impl &&other) ENTT_NOEXCEPT - : underlying_type{std::move(other)}, - allocator{std::move(other.allocator)}, - bucket_allocator{std::move(other.bucket_allocator)}, - packed{std::exchange(other.packed, bucket_alloc_pointer{})}, - bucket{std::exchange(other.bucket, 0u)} - {} - - /*! @brief Default destructor. */ - ~basic_storage_impl() override { - release_memory(); - } - - /** - * @brief Move assignment operator. - * @param other The instance to move from. - * @return This sparse set. - */ - basic_storage_impl & operator=(basic_storage_impl &&other) ENTT_NOEXCEPT { - release_memory(); - - underlying_type::operator=(std::move(other)); - - allocator = std::move(other.allocator); - bucket_allocator = std::move(other.bucket_allocator); - packed = std::exchange(other.packed, bucket_alloc_pointer{}); - bucket = std::exchange(other.bucket, 0u); - - return *this; - } - - /** - * @brief Increases the capacity of a storage. - * - * If the new capacity is greater than the current capacity, new storage is - * allocated, otherwise the method does nothing. - * - * @param cap Desired capacity. - */ - void reserve(const size_type cap) { - underlying_type::reserve(cap); - - if(cap > underlying_type::size()) { - assure_at_least(cap); - } - } - - /** - * @brief Returns the number of elements that a storage has currently - * allocated space for. - * @return Capacity of the storage. - */ - [[nodiscard]] size_type capacity() const ENTT_NOEXCEPT { - return bucket * packed_page; - } - - /*! @brief Requests the removal of unused capacity. */ - void shrink_to_fit() { - underlying_type::shrink_to_fit(); - release_unused_pages(); - } - - /** - * @brief Direct access to the array of objects. - * @return A pointer to the array of objects. - */ - [[nodiscard]] const_pointer raw() const ENTT_NOEXCEPT { - return packed; - } - - /*! @copydoc raw */ - [[nodiscard]] pointer raw() ENTT_NOEXCEPT { - return packed; - } - - /** - * @brief Returns an iterator to the beginning. - * - * The returned iterator points to the first instance of the internal array. - * If the storage is empty, the returned iterator will be equal to `end()`. - * - * @return An iterator to the first instance of the internal array. - */ - [[nodiscard]] const_iterator cbegin() const ENTT_NOEXCEPT { - const difference_type pos = underlying_type::size(); - return const_iterator{std::addressof(packed), pos}; - } - - /*! @copydoc cbegin */ - [[nodiscard]] const_iterator begin() const ENTT_NOEXCEPT { - return cbegin(); - } - - /*! @copydoc begin */ - [[nodiscard]] iterator begin() ENTT_NOEXCEPT { - const difference_type pos = underlying_type::size(); - return iterator{std::addressof(packed), pos}; - } - - /** - * @brief Returns an iterator to the end. - * - * The returned iterator points to the element following the last instance - * of the internal array. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the element following the last instance of the - * internal array. - */ - [[nodiscard]] const_iterator cend() const ENTT_NOEXCEPT { - return const_iterator{std::addressof(packed), {}}; - } - - /*! @copydoc cend */ - [[nodiscard]] const_iterator end() const ENTT_NOEXCEPT { - return cend(); - } - - /*! @copydoc end */ - [[nodiscard]] iterator end() ENTT_NOEXCEPT { - return iterator{std::addressof(packed), {}}; - } - - /** - * @brief Returns a reverse iterator to the beginning. - * - * The returned iterator points to the first instance of the reversed - * internal array. If the storage is empty, the returned iterator will be - * equal to `rend()`. - * - * @return An iterator to the first instance of the reversed internal array. - */ - [[nodiscard]] const_reverse_iterator crbegin() const ENTT_NOEXCEPT { - return std::make_reverse_iterator(cend()); - } - - /*! @copydoc crbegin */ - [[nodiscard]] const_reverse_iterator rbegin() const ENTT_NOEXCEPT { - return crbegin(); - } - - /*! @copydoc rbegin */ - [[nodiscard]] reverse_iterator rbegin() ENTT_NOEXCEPT { - return std::make_reverse_iterator(end()); - } - - /** - * @brief Returns a reverse iterator to the end. - * - * The returned iterator points to the element following the last instance - * of the reversed internal array. Attempting to dereference the returned - * iterator results in undefined behavior. - * - * @return An iterator to the element following the last instance of the - * reversed internal array. - */ - [[nodiscard]] const_reverse_iterator crend() const ENTT_NOEXCEPT { - return std::make_reverse_iterator(cbegin()); - } - - /*! @copydoc crend */ - [[nodiscard]] const_reverse_iterator rend() const ENTT_NOEXCEPT { - return crend(); - } - - /*! @copydoc rend */ - [[nodiscard]] reverse_iterator rend() ENTT_NOEXCEPT { - return std::make_reverse_iterator(begin()); - } - - /** - * @brief Returns the object assigned to an entity. - * - * @warning - * Attempting to use an entity that doesn't belong to the storage results in - * undefined behavior. - * - * @param entt A valid entity identifier. - * @return The object assigned to the entity. - */ - [[nodiscard]] const value_type & get(const entity_type entt) const ENTT_NOEXCEPT { - const auto idx = underlying_type::index(entt); - return packed[page(idx)][offset(idx)]; - } - - /*! @copydoc get */ - [[nodiscard]] value_type & get(const entity_type entt) ENTT_NOEXCEPT { - return const_cast(std::as_const(*this).get(entt)); - } - - /** - * @brief Assigns an entity to a storage and constructs its object. - * - * This version accept both types that can be constructed in place directly - * and types like aggregates that do not work well with a placement new as - * performed usually under the hood during an _emplace back_. - * - * @warning - * Attempting to use an entity that already belongs to the storage results - * in undefined behavior. - * - * @tparam Args Types of arguments to use to construct the object. - * @param entt A valid entity identifier. - * @param args Parameters to use to construct an object for the entity. - * @return A reference to the newly created object. - */ - template - value_type & emplace(const entity_type entt, Args &&... args) { - const auto pos = underlying_type::slot(); - assure_at_least(pos + 1u); - - auto &value = push_at(pos, std::forward(args)...); - - ENTT_TRY { - [[maybe_unused]] const auto curr = underlying_type::emplace(entt); - ENTT_ASSERT(pos == curr, "Misplaced component"); - } ENTT_CATCH { - pop_at(pos); - ENTT_THROW; - } - - return value; - } - - /** - * @brief Updates the instance assigned to a given entity in-place. - * @tparam Func Types of the function objects to invoke. - * @param entt A valid entity identifier. - * @param func Valid function objects. - * @return A reference to the updated instance. - */ - template - decltype(auto) patch(const entity_type entt, Func &&... func) { - const auto idx = underlying_type::index(entt); - auto &&elem = packed[page(idx)][offset(idx)]; - (std::forward(func)(elem), ...); - return elem; - } - - /** - * @brief Assigns one or more entities to a storage and constructs their - * objects from a given instance. - * - * @warning - * Attempting to assign an entity that already belongs to the storage - * results in undefined behavior. - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param value An instance of the object to construct. - */ - template - void insert(It first, It last, const value_type &value = {}) { - const auto cap = underlying_type::size() + std::distance(first, last); - underlying_type::reserve(cap); - assure_at_least(cap); - - for(; first != last; ++first) { - push_at(underlying_type::size(), value); - - ENTT_TRY { - underlying_type::emplace_back(*first); - } ENTT_CATCH { - pop_at(underlying_type::size()); - ENTT_THROW; - } - } - } - - /** - * @brief Assigns one or more entities to a storage and constructs their - * objects from a given range. - * - * @sa construct - * - * @tparam EIt Type of input iterator. - * @tparam CIt Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param from An iterator to the first element of the range of objects. - */ - template::value_type>, value_type>>> - void insert(EIt first, EIt last, CIt from) { - const auto cap = underlying_type::size() + std::distance(first, last); - underlying_type::reserve(cap); - assure_at_least(cap); - - for(; first != last; ++first, ++from) { - push_at(underlying_type::size(), *from); - - ENTT_TRY { - underlying_type::emplace_back(*first); - } ENTT_CATCH { - pop_at(underlying_type::size()); - ENTT_THROW; - } - } - } - - /** - * @brief Sort elements according to the given comparison function. - * - * The comparison function object must return `true` if the first element - * is _less_ than the second one, `false` otherwise. The signature of the - * comparison function should be equivalent to one of the following: - * - * @code{.cpp} - * bool(const Entity, const Entity); - * bool(const Type &, const Type &); - * @endcode - * - * Moreover, the comparison function object shall induce a - * _strict weak ordering_ on the values. - * - * The sort function oject must offer a member function template - * `operator()` that accepts three arguments: - * - * * An iterator to the first element of the range to sort. - * * An iterator past the last element of the range to sort. - * * A comparison function to use to compare the elements. - * - * @warning - * Empty types are never instantiated. Therefore, only comparison function - * objects that require to return entities rather than components are - * accepted. - * - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param length Number of elements to sort. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort_n(const size_type length, Compare compare, Sort algo = Sort{}, Args &&... args) { - if constexpr(std::is_invocable_v) { - underlying_type::sort_n(length, [this, compare = std::move(compare)](const auto lhs, const auto rhs) { - const auto ilhs = underlying_type::index(lhs), irhs = underlying_type::index(rhs); - return compare(std::as_const(packed[page(ilhs)][offset(ilhs)]), std::as_const(packed[page(irhs)][offset(irhs)])); - }, std::move(algo), std::forward(args)...); - } else { - underlying_type::sort_n(length, std::move(compare), std::move(algo), std::forward(args)...); - } - } - - /** - * @brief Sort all elements according to the given comparison function. - * - * @sa sort_n - * - * @tparam Compare Type of comparison function object. - * @tparam Sort Type of sort function object. - * @tparam Args Types of arguments to forward to the sort function object. - * @param compare A valid comparison function object. - * @param algo A valid sort function object. - * @param args Arguments to forward to the sort function object, if any. - */ - template - void sort(Compare compare, Sort algo = Sort{}, Args &&... args) { - sort_n(underlying_type::size(), std::move(compare), std::move(algo), std::forward(args)...); - } - -private: - typename alloc_traits::allocator_type allocator; - typename bucket_alloc_traits::allocator_type bucket_allocator; - bucket_alloc_pointer packed; - size_type bucket; -}; - - -/*! @copydoc basic_storage_impl */ -template -class basic_storage_impl::ignore_if_empty::value && std::is_empty_v>> - : public basic_sparse_set::template rebind_alloc> -{ - using comp_traits = component_traits; - using underlying_type = basic_sparse_set::template rebind_alloc>; - using alloc_traits = typename std::allocator_traits::template rebind_traits; - -public: - /*! @brief Allocator type. */ - using allocator_type = typename alloc_traits::allocator_type; - /*! @brief Type of the objects assigned to entities. */ - using value_type = Type; - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - - /** - * @brief Default constructor. - * @param alloc Allocator to use (possibly default-constructed). - */ - explicit basic_storage_impl(const allocator_type &alloc = {}) - : underlying_type{deletion_policy{comp_traits::in_place_delete::value}, alloc} - {} - - /** - * @brief Fake get function. - * - * @warning - * Attempting to use an entity that doesn't belong to the storage results in - * undefined behavior. - * - * @param entt A valid entity identifier. - */ - void get([[maybe_unused]] const entity_type entt) const ENTT_NOEXCEPT { - ENTT_ASSERT(underlying_type::contains(entt), "Storage does not contain entity"); - } - - /** - * @brief Assigns an entity to a storage and constructs its object. - * - * @warning - * Attempting to use an entity that already belongs to the storage results - * in undefined behavior. - * - * @tparam Args Types of arguments to use to construct the object. - * @param entt A valid entity identifier. - * @param args Parameters to use to construct an object for the entity. - */ - template - void emplace(const entity_type entt, Args &&... args) { - [[maybe_unused]] value_type instance{std::forward(args)...}; - underlying_type::emplace(entt); - } - - /** - * @brief Updates the instance assigned to a given entity in-place. - * @tparam Func Types of the function objects to invoke. - * @param entt A valid entity identifier. - * @param func Valid function objects. - */ - template - void patch([[maybe_unused]] const entity_type entt, Func &&... func) { - ENTT_ASSERT(underlying_type::contains(entt), "Storage does not contain entity"); - (std::forward(func)(), ...); - } - - /** - * @brief Assigns one or more entities to a storage. - * - * @warning - * Attempting to assign an entity that already belongs to the storage - * results in undefined behavior. - * - * @tparam It Type of input iterator. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - */ - template - void insert(It first, It last, const value_type & = {}) { - underlying_type::insert(first, last); - } -}; - - -/** - * @brief Mixin type to use to wrap basic storage classes. - * @tparam Type The type of the underlying storage. - */ -template -struct storage_adapter_mixin: Type { - static_assert(std::is_same_v>, "Invalid object type"); - - /*! @brief Type of the objects assigned to entities. */ - using value_type = typename Type::value_type; - /*! @brief Underlying entity identifier. */ - using entity_type = typename Type::entity_type; - - /*! @brief Inherited constructors. */ - using Type::Type; - - /** - * @brief Assigns entities to a storage. - * @tparam Args Types of arguments to use to construct the object. - * @param entt A valid entity identifier. - * @param args Parameters to use to initialize the object. - * @return A reference to the newly created object. - */ - template - decltype(auto) emplace(basic_registry &, const entity_type entt, Args &&... args) { - return Type::emplace(entt, std::forward(args)...); - } - - /** - * @brief Assigns entities to a storage. - * @tparam It Type of input iterator. - * @tparam Args Types of arguments to use to construct the objects assigned - * to the entities. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param args Parameters to use to initialize the objects assigned to the - * entities. - */ - template - void insert(basic_registry &, It first, It last, Args &&... args) { - Type::insert(first, last, std::forward(args)...); - } - - /** - * @brief Patches the given instance for an entity. - * @tparam Func Types of the function objects to invoke. - * @param entt A valid entity identifier. - * @param func Valid function objects. - * @return A reference to the patched instance. - */ - template - decltype(auto) patch(basic_registry &, const entity_type entt, Func &&... func) { - return Type::patch(entt, std::forward(func)...); - } -}; - - -/** - * @brief Mixin type to use to add signal support to storage types. - * @tparam Type The type of the underlying storage. - */ -template -class sigh_storage_mixin final: public Type { - /*! @copydoc basic_sparse_set::swap_and_pop */ - void swap_and_pop(const typename Type::entity_type entt, void *ud) final { - ENTT_ASSERT(ud != nullptr, "Invalid pointer to registry"); - destruction.publish(*static_cast *>(ud), entt); - Type::swap_and_pop(entt, ud); - } - - /*! @copydoc basic_sparse_set::in_place_pop */ - void in_place_pop(const typename Type::entity_type entt, void *ud) final { - ENTT_ASSERT(ud != nullptr, "Invalid pointer to registry"); - destruction.publish(*static_cast *>(ud), entt); - Type::in_place_pop(entt, ud); - } - -public: - /*! @brief Underlying value type. */ - using value_type = typename Type::value_type; - /*! @brief Underlying entity identifier. */ - using entity_type = typename Type::entity_type; - - /*! @brief Inherited constructors. */ - using Type::Type; - - /** - * @brief Returns a sink object. - * - * The sink returned by this function can be used to receive notifications - * whenever a new instance is created and assigned to an entity.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, entity_type); - * @endcode - * - * Listeners are invoked **after** the object has been assigned to the - * entity. - * - * @sa sink - * - * @return A temporary sink object. - */ - [[nodiscard]] auto on_construct() ENTT_NOEXCEPT { - return sink{construction}; - } - - /** - * @brief Returns a sink object. - * - * The sink returned by this function can be used to receive notifications - * whenever an instance is explicitly updated.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, entity_type); - * @endcode - * - * Listeners are invoked **after** the object has been updated. - * - * @sa sink - * - * @return A temporary sink object. - */ - [[nodiscard]] auto on_update() ENTT_NOEXCEPT { - return sink{update}; - } - - /** - * @brief Returns a sink object. - * - * The sink returned by this function can be used to receive notifications - * whenever an instance is removed from an entity and thus destroyed.
- * The function type for a listener is equivalent to: - * - * @code{.cpp} - * void(basic_registry &, entity_type); - * @endcode - * - * Listeners are invoked **before** the object has been removed from the - * entity. - * - * @sa sink - * - * @return A temporary sink object. - */ - [[nodiscard]] auto on_destroy() ENTT_NOEXCEPT { - return sink{destruction}; - } - - /** - * @brief Assigns entities to a storage. - * @tparam Args Types of arguments to use to construct the object. - * @param owner The registry that issued the request. - * @param entt A valid entity identifier. - * @param args Parameters to use to initialize the object. - * @return A reference to the newly created object. - */ - template - decltype(auto) emplace(basic_registry &owner, const entity_type entt, Args &&... args) { - Type::emplace(entt, std::forward(args)...); - construction.publish(owner, entt); - return this->get(entt); - } - - /** - * @brief Assigns entities to a storage. - * @tparam It Type of input iterator. - * @tparam Args Types of arguments to use to construct the objects assigned - * to the entities. - * @param owner The registry that issued the request. - * @param first An iterator to the first element of the range of entities. - * @param last An iterator past the last element of the range of entities. - * @param args Parameters to use to initialize the objects assigned to the - * entities. - */ - template - void insert(basic_registry &owner, It first, It last, Args &&... args) { - Type::insert(first, last, std::forward(args)...); - - if(!construction.empty()) { - for(; first != last; ++first) { - construction.publish(owner, *first); - } - } - } - - /** - * @brief Patches the given instance for an entity. - * @tparam Func Types of the function objects to invoke. - * @param owner The registry that issued the request. - * @param entt A valid entity identifier. - * @param func Valid function objects. - * @return A reference to the patched instance. - */ - template - decltype(auto) patch(basic_registry &owner, const entity_type entt, Func &&... func) { - Type::patch(entt, std::forward(func)...); - update.publish(owner, entt); - return this->get(entt); - } - -private: - sigh &, const entity_type)> construction{}; - sigh &, const entity_type)> destruction{}; - sigh &, const entity_type)> update{}; -}; - - -/** - * @brief Storage implementation dispatcher. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Type Type of objects assigned to the entities. - * @tparam Allocator Type of allocator used to manage memory and elements. - */ -template -struct basic_storage: basic_storage_impl { - using basic_storage_impl::basic_storage_impl; -}; - - -/** - * @brief Provides a common way to access certain properties of storage types. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Type Type of objects managed by the storage class. - */ -template -struct storage_traits { - /*! @brief Resulting type after component-to-storage conversion. */ - using storage_type = sigh_storage_mixin>; -}; - - -/** - * @brief Gets the element assigned to an entity from a storage, if any. - * @tparam Type Storage type. - * @param container A valid instance of a storage class. - * @param entt A valid entity identifier. - * @return A possibly empty tuple containing the requested element. - */ -template -[[nodiscard]] auto get_as_tuple([[maybe_unused]] Type &container, [[maybe_unused]] const typename Type::entity_type entt) { - static_assert(std::is_same_v, typename storage_traits::storage_type>, "Invalid storage"); - - if constexpr(std::is_void_v) { - return std::make_tuple(); - } else { - return std::forward_as_tuple(container.get(entt)); - } -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/utility.hpp b/LiteLoader/Header/third-party/entt/entity/utility.hpp deleted file mode 100644 index 84c2b3c..0000000 --- a/LiteLoader/Header/third-party/entt/entity/utility.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef ENTT_ENTITY_UTILITY_HPP -#define ENTT_ENTITY_UTILITY_HPP - - -#include "../core/type_traits.hpp" - - -namespace entt { - - -/** - * @brief Alias for exclusion lists. - * @tparam Type List of types. - */ -template -struct exclude_t: type_list {}; - - -/** - * @brief Variable template for exclusion lists. - * @tparam Type List of types. - */ -template -inline constexpr exclude_t exclude{}; - - -/** - * @brief Alias for lists of observed components. - * @tparam Type List of types. - */ -template -struct get_t: type_list{}; - - -/** - * @brief Variable template for lists of observed components. - * @tparam Type List of types. - */ -template -inline constexpr get_t get{}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/entity/view.hpp b/LiteLoader/Header/third-party/entt/entity/view.hpp deleted file mode 100644 index cdb13e1..0000000 --- a/LiteLoader/Header/third-party/entt/entity/view.hpp +++ /dev/null @@ -1,1056 +0,0 @@ -#ifndef ENTT_ENTITY_VIEW_HPP -#define ENTT_ENTITY_VIEW_HPP - - -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/type_traits.hpp" -#include "component.hpp" -#include "entity.hpp" -#include "fwd.hpp" -#include "sparse_set.hpp" -#include "storage.hpp" -#include "utility.hpp" - - -namespace entt { - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -template -class view_iterator final { - using basic_common_type = basic_sparse_set::value_type>; - - [[nodiscard]] bool valid() const { - const auto entt = *it; - return Policy::accept(entt) - && std::apply([entt](const auto *... curr) { return (curr->contains(entt) && ...); }, pools) - && std::apply([entt](const auto *... curr) { return (!curr->contains(entt) && ...); }, filter); - } - -public: - using iterator_type = It; - using difference_type = typename std::iterator_traits::difference_type; - using value_type = typename std::iterator_traits::value_type; - using pointer = typename std::iterator_traits::pointer; - using reference = typename std::iterator_traits::reference; - using iterator_category = std::bidirectional_iterator_tag; - - view_iterator() ENTT_NOEXCEPT - : first{}, - last{}, - it{}, - pools{}, - filter{} - {} - - view_iterator(It from, It to, It curr, std::array all_of, std::array none_of) ENTT_NOEXCEPT - : first{from}, - last{to}, - it{curr}, - pools{all_of}, - filter{none_of} - { - if(it != last && !valid()) { - ++(*this); - } - } - - view_iterator & operator++() ENTT_NOEXCEPT { - while(++it != last && !valid()); - return *this; - } - - view_iterator operator++(int) ENTT_NOEXCEPT { - view_iterator orig = *this; - return ++(*this), orig; - } - - view_iterator & operator--() ENTT_NOEXCEPT { - while(--it != first && !valid()); - return *this; - } - - view_iterator operator--(int) ENTT_NOEXCEPT { - view_iterator orig = *this; - return operator--(), orig; - } - - [[nodiscard]] bool operator==(const view_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const view_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - [[nodiscard]] pointer operator->() const { - return &*it; - } - - [[nodiscard]] reference operator*() const { - return *operator->(); - } - -private: - It first; - It last; - It it; - std::array pools; - std::array filter; -}; - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -/*! @brief Stable storage policy, aimed at pointer stability. */ -struct stable_storage_policy { - /** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - template - [[nodiscard]] static constexpr bool accept(const Entity entity) ENTT_NOEXCEPT { - return entity != tombstone; - } - /** - * Internal details not to be documented. - * @endcond - */ -}; - - -/*! @brief Packed storage policy, aimed at faster linear iteration. */ -struct packed_storage_policy { - /** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - template - [[nodiscard]] static constexpr bool accept(const Entity) ENTT_NOEXCEPT { - return true; - } - /** - * Internal details not to be documented. - * @endcond - */ -}; - - -/** - * @brief View implementation. - * - * Primary template isn't defined on purpose. All the specializations give a - * compile-time error, but for a few reasonable cases. - */ -template -class basic_view_impl; - - -/*! @brief View implementation dispatcher. */ -template -struct basic_view; - - -/** - * @brief Multi component view. - * - * Multi component views iterate over those entities that have at least all the - * given components in their bags. During initialization, a multi component view - * looks at the number of entities available for each component and uses the - * smallest set in order to get a performance boost when iterate. - * - * @b Important - * - * Iterators aren't invalidated if: - * - * * New instances of the given components are created and assigned to entities. - * * The entity currently pointed is modified (as an example, if one of the - * given components is removed from the entity to which the iterator points). - * * The entity currently pointed is destroyed. - * - * In all other cases, modifying the pools iterated by the view in any way - * invalidates all the iterators and using them results in undefined behavior. - * - * @note - * Views share references to the underlying data structures of the registry that - * generated them. Therefore any change to the entities and to the components - * made by means of the registry are immediately reflected by views. - * - * @warning - * Lifetime of a view must not overcome that of the registry that generated it. - * In any other case, attempting to use a view results in undefined behavior. - * - * @tparam Policy Common (stricter) storage policy. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Exclude Types of components used to filter the view. - * @tparam Component Types of components iterated by the view. - */ -template -class basic_view_impl, Component...> { - using basic_common_type = basic_sparse_set; - - template - using storage_type = constness_as_t>::storage_type, Comp>; - - class iterable final { - template - struct iterable_iterator final { - using difference_type = std::ptrdiff_t; - using value_type = decltype(std::tuple_cat(std::tuple{}, std::declval().get({}))); - using pointer = void; - using reference = value_type; - using iterator_category = std::input_iterator_tag; - - iterable_iterator(It from, const basic_view_impl *parent) ENTT_NOEXCEPT - : it{from}, - view{parent} - {} - - iterable_iterator & operator++() ENTT_NOEXCEPT { - return ++it, *this; - } - - iterable_iterator operator++(int) ENTT_NOEXCEPT { - iterable_iterator orig = *this; - return ++(*this), orig; - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - return std::tuple_cat(std::make_tuple(*it), view->get(*it)); - } - - [[nodiscard]] bool operator==(const iterable_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const iterable_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - private: - It it; - const basic_view_impl *view; - }; - - public: - using iterator = iterable_iterator>; - using reverse_iterator = iterable_iterator>; - - iterable(const basic_view_impl &parent) - : view{parent} - {} - - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return { view.begin(), &view }; - } - - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return { view.end(), &view }; - } - - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return { view.rbegin(), &view }; - } - - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return { view.rend(), &view }; - } - - private: - const basic_view_impl view; - }; - - [[nodiscard]] const auto * candidate() const ENTT_NOEXCEPT { - return (std::min)({ static_cast(std::get *>(pools))... }, [](const auto *lhs, const auto *rhs) { - return lhs->size() < rhs->size(); - }); - } - - [[nodiscard]] auto pools_to_unchecked_array() const ENTT_NOEXCEPT { - std::size_t pos{}; - std::array other{}; - (static_cast(std::get *>(pools) == view ? void() : void(other[pos++] = std::get *>(pools))), ...); - return other; - } - - [[nodiscard]] auto filter_to_array() const ENTT_NOEXCEPT { - return std::array{std::get *>(filter)...}; - } - - template - [[nodiscard]] auto dispatch_get([[maybe_unused]] It &it, [[maybe_unused]] const Entity entt) const { - if constexpr(std::is_same_v::value_type, typename storage_type::value_type>) { - return std::forward_as_tuple(*it); - } else { - return get_as_tuple(*std::get *>(pools), entt); - } - } - - template - void traverse(Func func) const { - if constexpr(std::is_void_v *>(pools)->get({}))>) { - for(const auto entt: static_cast(*std::get *>(pools))) { - if(Policy::accept(entt) && ((std::is_same_v || std::get *>(pools)->contains(entt)) && ...) - && (!std::get *>(filter)->contains(entt) && ...)) - { - if constexpr(is_applicable_v{}, std::declval().get({})))>) { - std::apply(func, std::tuple_cat(std::make_tuple(entt), get(entt))); - } else { - std::apply(func, get(entt)); - } - } - } - } else { - auto it = std::get *>(pools)->begin(); - - for(const auto entt: static_cast(*std::get *>(pools))) { - if(Policy::accept(entt) && ((std::is_same_v || std::get *>(pools)->contains(entt)) && ...) - && (!std::get *>(filter)->contains(entt) && ...)) - { - if constexpr(is_applicable_v{}, std::declval().get({})))>) { - std::apply(func, std::tuple_cat(std::make_tuple(entt), dispatch_get(it, entt)...)); - } else { - std::apply(func, std::tuple_cat(dispatch_get(it, entt)...)); - } - } - - ++it; - } - } - } - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Bidirectional iterator type. */ - using iterator = internal::view_iterator; - /*! @brief Reverse iterator type. */ - using reverse_iterator = internal::view_iterator; - /*! @brief Iterable view type. */ - using iterable_view = iterable; - - /*! @brief Default constructor to use to create empty, invalid views. */ - basic_view_impl() ENTT_NOEXCEPT - : view{} - {} - - /** - * @brief Constructs a multi-type view from a set of storage classes. - * @param component The storage for the types to iterate. - * @param epool The storage for the types used to filter the view. - */ - basic_view_impl(storage_type &... component, const storage_type &... epool) ENTT_NOEXCEPT - : pools{&component...}, - filter{&epool...}, - view{candidate()} - {} - - /** - * @brief Forces the type to use to drive iterations. - * @tparam Comp Type of component to use to drive the iteration. - */ - template - void use() const ENTT_NOEXCEPT { - view = std::get *>(pools); - } - - /** - * @brief Estimates the number of entities iterated by the view. - * @return Estimated number of entities iterated by the view. - */ - [[nodiscard]] size_type size_hint() const ENTT_NOEXCEPT { - return view->size(); - } - - /** - * @brief Returns an iterator to the first entity of the view. - * - * The returned iterator points to the first entity of the view. If the view - * is empty, the returned iterator will be equal to `end()`. - * - * @return An iterator to the first entity of the view. - */ - [[nodiscard]] iterator begin() const { - return iterator{view->begin(), view->end(), view->begin(), pools_to_unchecked_array(), filter_to_array()}; - } - - /** - * @brief Returns an iterator that is past the last entity of the view. - * - * The returned iterator points to the entity following the last entity of - * the view. Attempting to dereference the returned iterator results in - * undefined behavior. - * - * @return An iterator to the entity following the last entity of the view. - */ - [[nodiscard]] iterator end() const { - return iterator{view->begin(), view->end(), view->end(), pools_to_unchecked_array(), filter_to_array()}; - } - - /** - * @brief Returns an iterator to the first entity of the reversed view. - * - * The returned iterator points to the first entity of the reversed view. If - * the view is empty, the returned iterator will be equal to `rend()`. - * - * @return An iterator to the first entity of the reversed view. - */ - [[nodiscard]] reverse_iterator rbegin() const { - return reverse_iterator{view->rbegin(), view->rend(), view->rbegin(), pools_to_unchecked_array(), filter_to_array()}; - } - - /** - * @brief Returns an iterator that is past the last entity of the reversed - * view. - * - * The returned iterator points to the entity following the last entity of - * the reversed view. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * reversed view. - */ - [[nodiscard]] reverse_iterator rend() const { - return reverse_iterator{view->rbegin(), view->rend(), view->rend(), pools_to_unchecked_array(), filter_to_array()}; - } - - /** - * @brief Returns the first entity of the view, if any. - * @return The first entity of the view if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type front() const { - const auto it = begin(); - return it != end() ? *it : null; - } - - /** - * @brief Returns the last entity of the view, if any. - * @return The last entity of the view if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type back() const { - const auto it = rbegin(); - return it != rend() ? *it : null; - } - - /** - * @brief Finds an entity. - * @param entt A valid entity identifier. - * @return An iterator to the given entity if it's found, past the end - * iterator otherwise. - */ - [[nodiscard]] iterator find(const entity_type entt) const { - const auto it = iterator{view->begin(), view->end(), view->find(entt), pools_to_unchecked_array(), filter_to_array()}; - return (it != end() && *it == entt) ? it : end(); - } - - /** - * @brief Checks if a view is properly initialized. - * @return True if the view is properly initialized, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return view != nullptr; - } - - /** - * @brief Checks if a view contains an entity. - * @param entt A valid entity identifier. - * @return True if the view contains the given entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const { - return (std::get *>(pools)->contains(entt) && ...) && (!std::get *>(filter)->contains(entt) && ...); - } - - /** - * @brief Returns the components assigned to the given entity. - * - * Prefer this function instead of `registry::get` during iterations. It has - * far better performance than its counterpart. - * - * @warning - * Attempting to use an invalid component type results in a compilation - * error. Attempting to use an entity that doesn't belong to the view - * results in undefined behavior. - * - * @tparam Comp Types of components to get. - * @param entt A valid entity identifier. - * @return The components assigned to the entity. - */ - template - [[nodiscard]] decltype(auto) get([[maybe_unused]] const entity_type entt) const { - ENTT_ASSERT(contains(entt), "View does not contain entity"); - - if constexpr(sizeof...(Comp) == 0) { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)...); - } else if constexpr(sizeof...(Comp) == 1) { - return (std::get *>(pools)->get(entt), ...); - } else { - return std::tuple_cat(get_as_tuple(*std::get *>(pools), entt)...); - } - } - - /** - * @brief Iterates entities and components and applies the given function - * object to them. - * - * The function object is invoked for each entity. It is provided with the - * entity itself and a set of references to non-empty components. The - * _constness_ of the components is as requested.
- * The signature of the function must be equivalent to one of the following - * forms: - * - * @code{.cpp} - * void(const entity_type, Type &...); - * void(Type &...); - * @endcode - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - ((std::get *>(pools) == view ? traverse(std::move(func)) : void()), ...); - } - - /** - * @brief Iterates entities and components and applies the given function - * object to them. - * - * The pool of the suggested component is used to lead the iterations. The - * returned entities will therefore respect the order of the pool associated - * with that type. - * - * @sa each - * - * @tparam Comp Type of component to use to drive the iteration. - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - use(); - traverse(std::move(func)); - } - - /** - * @brief Returns an iterable object to use to _visit_ the view. - * - * The iterable object returns tuples that contain the current entity and a - * set of references to its non-empty components. The _constness_ of the - * components is as requested. - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @return An iterable object to use to _visit_ the view. - */ - [[nodiscard]] iterable_view each() const ENTT_NOEXCEPT { - return iterable_view{*this}; - } - - /** - * @brief Returns an iterable object to use to _visit_ the view. - * - * The pool of the suggested component is used to lead the iterations. The - * returned elements will therefore respect the order of the pool associated - * with that type. - * - * @sa each - * - * @tparam Comp Type of component to use to drive the iteration. - * @return An iterable object to use to _visit_ the view. - */ - template - [[nodiscard]] iterable_view each() const ENTT_NOEXCEPT { - use(); - return iterable_view{*this}; - } - - /** - * @brief Combines two views in a _more specific_ one (friend function). - * @tparam Id A valid entity type (see entt_traits for more details). - * @tparam ELhs Filter list of the first view. - * @tparam CLhs Component list of the first view. - * @tparam ERhs Filter list of the second view. - * @tparam CRhs Component list of the second view. - * @return A more specific view. - */ - template - friend auto operator|(const basic_view, CLhs...> &, const basic_view, CRhs...> &); - -private: - const std::tuple *...> pools; - const std::tuple *...> filter; - mutable const basic_common_type *view; -}; - - -/** - * @brief Single component view specialization. - * - * Single component views are specialized in order to get a boost in terms of - * performance. This kind of views can access the underlying data structure - * directly and avoid superfluous checks. - * - * @b Important - * - * Iterators aren't invalidated if: - * - * * New instances of the given component are created and assigned to entities. - * * The entity currently pointed is modified (as an example, the given - * component is removed from the entity to which the iterator points). - * * The entity currently pointed is destroyed. - * - * In all other cases, modifying the pool iterated by the view in any way - * invalidates all the iterators and using them results in undefined behavior. - * - * @note - * Views share a reference to the underlying data structure of the registry that - * generated them. Therefore any change to the entities and to the components - * made by means of the registry are immediately reflected by views. - * - * @warning - * Lifetime of a view must not overcome that of the registry that generated it. - * In any other case, attempting to use a view results in undefined behavior. - * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Component Type of component iterated by the view. - */ -template -class basic_view_impl, Component> { - using basic_common_type = basic_sparse_set; - using storage_type = constness_as_t>::storage_type, Component>; - - class iterable final { - template - struct iterable_iterator final { - using difference_type = std::ptrdiff_t; - using value_type = decltype(std::tuple_cat(std::tuple{}, std::declval().get({}))); - using pointer = void; - using reference = value_type; - using iterator_category = std::input_iterator_tag; - - template - iterable_iterator(It... from, Discard...) ENTT_NOEXCEPT - : it{from...} - {} - - iterable_iterator & operator++() ENTT_NOEXCEPT { - return (++std::get(it), ...), *this; - } - - iterable_iterator operator++(int) ENTT_NOEXCEPT { - iterable_iterator orig = *this; - return ++(*this), orig; - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - return { *std::get(it)... }; - } - - [[nodiscard]] bool operator==(const iterable_iterator &other) const ENTT_NOEXCEPT { - return std::get<0>(other.it) == std::get<0>(it); - } - - [[nodiscard]] bool operator!=(const iterable_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - private: - std::tuple it; - }; - - public: - using iterator = std::conditional_t< - std::is_void_v().get({}))>, - iterable_iterator, - iterable_iterator().begin())> - >; - using reverse_iterator = std::conditional_t< - std::is_void_v().get({}))>, - iterable_iterator, - iterable_iterator().rbegin())> - >; - - iterable(storage_type &ref) - : pool{&ref} - {} - - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return iterator{pool->basic_common_type::begin(), pool->begin()}; - } - - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return iterator{pool->basic_common_type::end(), pool->end()}; - } - - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return reverse_iterator{pool->basic_common_type::rbegin(), pool->rbegin()}; - } - - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return reverse_iterator{pool->basic_common_type::rend(), pool->rend()}; - } - - private: - storage_type * const pool; - }; - -public: - /*! @brief Underlying entity identifier. */ - using entity_type = Entity; - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Random access iterator type. */ - using iterator = typename basic_common_type::iterator; - /*! @brief Reversed iterator type. */ - using reverse_iterator = typename basic_common_type::reverse_iterator; - /*! @brief Iterable view type. */ - using iterable_view = iterable; - - /*! @brief Default constructor to use to create empty, invalid views. */ - basic_view_impl() ENTT_NOEXCEPT - : pools{}, - filter{} - {} - - /** - * @brief Constructs a single-type view from a storage class. - * @param ref The storage for the type to iterate. - */ - basic_view_impl(storage_type &ref) ENTT_NOEXCEPT - : pools{&ref}, - filter{} - {} - - /** - * @brief Returns the number of entities that have the given component. - * @return Number of entities that have the given component. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return std::get<0>(pools)->size(); - } - - /** - * @brief Checks whether a view is empty. - * @return True if the view is empty, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return std::get<0>(pools)->empty(); - } - - /** - * @brief Direct access to the raw representation offered by the storage. - * @return A pointer to the array of components. - */ - [[nodiscard]] auto raw() const ENTT_NOEXCEPT { - return std::get<0>(pools)->raw(); - } - - /** - * @brief Direct access to the list of entities. - * - * The returned pointer is such that range `[data(), data() + size())` is - * always a valid range, even if the container is empty. - * - * @return A pointer to the array of entities. - */ - [[nodiscard]] auto data() const ENTT_NOEXCEPT { - return std::get<0>(pools)->data(); - } - - /** - * @brief Returns an iterator to the first entity of the view. - * - * The returned iterator points to the first entity of the view. If the view - * is empty, the returned iterator will be equal to `end()`. - * - * @return An iterator to the first entity of the view. - */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return std::get<0>(pools)->basic_common_type::begin(); - } - - /** - * @brief Returns an iterator that is past the last entity of the view. - * - * The returned iterator points to the entity following the last entity of - * the view. Attempting to dereference the returned iterator results in - * undefined behavior. - * - * @return An iterator to the entity following the last entity of the view. - */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return std::get<0>(pools)->basic_common_type::end(); - } - - /** - * @brief Returns an iterator to the first entity of the reversed view. - * - * The returned iterator points to the first entity of the reversed view. If - * the view is empty, the returned iterator will be equal to `rend()`. - * - * @return An iterator to the first entity of the reversed view. - */ - [[nodiscard]] reverse_iterator rbegin() const ENTT_NOEXCEPT { - return std::get<0>(pools)->basic_common_type::rbegin(); - } - - /** - * @brief Returns an iterator that is past the last entity of the reversed - * view. - * - * The returned iterator points to the entity following the last entity of - * the reversed view. Attempting to dereference the returned iterator - * results in undefined behavior. - * - * @return An iterator to the entity following the last entity of the - * reversed view. - */ - [[nodiscard]] reverse_iterator rend() const ENTT_NOEXCEPT { - return std::get<0>(pools)->basic_common_type::rend(); - } - - /** - * @brief Returns the first entity of the view, if any. - * @return The first entity of the view if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type front() const { - const auto it = begin(); - return it != end() ? *it : null; - } - - /** - * @brief Returns the last entity of the view, if any. - * @return The last entity of the view if one exists, the null entity - * otherwise. - */ - [[nodiscard]] entity_type back() const { - const auto it = rbegin(); - return it != rend() ? *it : null; - } - - /** - * @brief Finds an entity. - * @param entt A valid entity identifier. - * @return An iterator to the given entity if it's found, past the end - * iterator otherwise. - */ - [[nodiscard]] iterator find(const entity_type entt) const { - const auto it = std::get<0>(pools)->find(entt); - return it != end() && *it == entt ? it : end(); - } - - /** - * @brief Returns the identifier that occupies the given position. - * @param pos Position of the element to return. - * @return The identifier that occupies the given position. - */ - [[nodiscard]] entity_type operator[](const size_type pos) const { - return begin()[pos]; - } - - /** - * @brief Checks if a view is properly initialized. - * @return True if the view is properly initialized, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return std::get<0>(pools) != nullptr; - } - - /** - * @brief Checks if a view contains an entity. - * @param entt A valid entity identifier. - * @return True if the view contains the given entity, false otherwise. - */ - [[nodiscard]] bool contains(const entity_type entt) const { - return std::get<0>(pools)->contains(entt); - } - - /** - * @brief Returns the component assigned to the given entity. - * - * Prefer this function instead of `registry::get` during iterations. It has - * far better performance than its counterpart. - * - * @warning - * Attempting to use an invalid component type results in a compilation - * error. Attempting to use an entity that doesn't belong to the view - * results in undefined behavior. - * - * @tparam Comp Types of components to get. - * @param entt A valid entity identifier. - * @return The component assigned to the entity. - */ - template - [[nodiscard]] decltype(auto) get(const entity_type entt) const { - ENTT_ASSERT(contains(entt), "View does not contain entity"); - - if constexpr(sizeof...(Comp) == 0) { - return get_as_tuple(*std::get<0>(pools), entt); - } else { - static_assert(std::is_same_v, "Invalid component type"); - return std::get<0>(pools)->get(entt); - } - } - - /** - * @brief Iterates entities and components and applies the given function - * object to them. - * - * The function object is invoked for each entity. It is provided with the - * entity itself and a reference to the component if it's a non-empty one. - * The _constness_ of the component is as requested.
- * The signature of the function must be equivalent to one of the following - * forms: - * - * @code{.cpp} - * void(const entity_type, Component &); - * void(Component &); - * @endcode - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - if constexpr(std::is_void_v(pools)->get({}))>) { - if constexpr(std::is_invocable_v) { - for(auto pos = size(); pos; --pos) { - func(); - } - } else { - for(auto entity: *this) { - func(entity); - } - } - } else { - if constexpr(is_applicable_v) { - for(const auto pack: each()) { - std::apply(func, pack); - } - } else { - for(auto &&component: *std::get<0>(pools)) { - func(component); - } - } - } - } - - /** - * @brief Returns an iterable object to use to _visit_ the view. - * - * The iterable object returns tuples that contain the current entity and a - * reference to its component if it's a non-empty one. The _constness_ of - * the component is as requested. - * - * @note - * Empty types aren't explicitly instantiated and therefore they are never - * returned during iterations. - * - * @return An iterable object to use to _visit_ the view. - */ - [[nodiscard]] iterable_view each() const ENTT_NOEXCEPT { - return iterable_view{*std::get<0>(pools)}; - } - - /** - * @brief Combines two views in a _more specific_ one (friend function). - * @tparam Id A valid entity type (see entt_traits for more details). - * @tparam ELhs Filter list of the first view. - * @tparam CLhs Component list of the first view. - * @tparam ERhs Filter list of the second view. - * @tparam CRhs Component list of the second view. - * @return A more specific view. - */ - template - friend auto operator|(const basic_view, CLhs...> &, const basic_view, CRhs...> &); - -private: - const std::tuple pools; - const std::tuple<> filter; -}; - - -/** - * @brief View implementation dispatcher. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Exclude Types of components used to filter the view. - * @tparam Component Types of components iterated by the view. - */ -template -struct basic_view, Component...> - : basic_view_impl>::in_place_delete...>, stable_storage_policy, packed_storage_policy>, Entity, exclude_t, Component...> -{ - /*! @brief Most restrictive storage policy of all component types. */ - using storage_policy = std::conditional_t>::in_place_delete...>, stable_storage_policy, packed_storage_policy>; - using basic_view_impl, Component...>::basic_view_impl; -}; - - -/** - * @brief Deduction guide. - * @tparam Storage Type of storage classes used to create the view. - * @param storage The storage for the types to iterate. - */ -template -basic_view(Storage &... storage) --> basic_view, entt::exclude_t<>, constness_as_t...>; - - -/** - * @brief Combines two views in a _more specific_ one. - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam ELhs Filter list of the first view. - * @tparam CLhs Component list of the first view. - * @tparam ERhs Filter list of the second view. - * @tparam CRhs Component list of the second view. - * @param lhs A valid reference to the first view. - * @param rhs A valid reference to the second view. - * @return A more specific view. - */ -template -[[nodiscard]] auto operator|(const basic_view, CLhs...> &lhs, const basic_view, CRhs...> &rhs) { - using view_type = basic_view, CLhs..., CRhs...>; - return std::apply([](auto *... storage) { return view_type{*storage...}; }, std::tuple_cat(lhs.pools, rhs.pools, lhs.filter, rhs.filter)); -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/fwd.hpp b/LiteLoader/Header/third-party/entt/fwd.hpp deleted file mode 100644 index 46dfe0d..0000000 --- a/LiteLoader/Header/third-party/entt/fwd.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "core/fwd.hpp" -#include "entity/fwd.hpp" -#include "poly/fwd.hpp" -#include "resource/fwd.hpp" -#include "signal/fwd.hpp" diff --git a/LiteLoader/Header/third-party/entt/locator/locator.hpp b/LiteLoader/Header/third-party/entt/locator/locator.hpp deleted file mode 100644 index becceb1..0000000 --- a/LiteLoader/Header/third-party/entt/locator/locator.hpp +++ /dev/null @@ -1,111 +0,0 @@ -#ifndef ENTT_LOCATOR_LOCATOR_HPP -#define ENTT_LOCATOR_LOCATOR_HPP - - -#include -#include -#include "../config/config.h" - - -namespace entt { - - -/** - * @brief Service locator, nothing more. - * - * A service locator can be used to do what it promises: locate services.
- * Usually service locators are tightly bound to the services they expose and - * thus it's hard to define a general purpose class to do that. This template - * based implementation tries to fill the gap and to get rid of the burden of - * defining a different specific locator for each application. - * - * @tparam Service Type of service managed by the locator. - */ -template -struct service_locator { - /*! @brief Type of service offered. */ - using service_type = Service; - - /*! @brief Default constructor, deleted on purpose. */ - service_locator() = delete; - /*! @brief Default destructor, deleted on purpose. */ - ~service_locator() = delete; - - /** - * @brief Tests if a valid service implementation is set. - * @return True if the service is set, false otherwise. - */ - [[nodiscard]] static bool empty() ENTT_NOEXCEPT { - return !static_cast(service); - } - - /** - * @brief Returns a weak pointer to a service implementation, if any. - * - * Clients of a service shouldn't retain references to it. The recommended - * way is to retrieve the service implementation currently set each and - * every time the need of using it arises. Otherwise users can incur in - * unexpected behaviors. - * - * @return A reference to the service implementation currently set, if any. - */ - [[nodiscard]] static std::weak_ptr get() ENTT_NOEXCEPT { - return service; - } - - /** - * @brief Returns a weak reference to a service implementation, if any. - * - * Clients of a service shouldn't retain references to it. The recommended - * way is to retrieve the service implementation currently set each and - * every time the need of using it arises. Otherwise users can incur in - * unexpected behaviors. - * - * @warning - * In case no service implementation has been set, a call to this function - * results in undefined behavior. - * - * @return A reference to the service implementation currently set, if any. - */ - [[nodiscard]] static Service & ref() ENTT_NOEXCEPT { - return *service; - } - - /** - * @brief Sets or replaces a service. - * @tparam Impl Type of the new service to use. - * @tparam Args Types of arguments to use to construct the service. - * @param args Parameters to use to construct the service. - */ - template - static void set(Args &&... args) { - service = std::make_shared(std::forward(args)...); - } - - /** - * @brief Sets or replaces a service. - * @param ptr Service to use to replace the current one. - */ - static void set(std::shared_ptr ptr) { - ENTT_ASSERT(static_cast(ptr), "Null service not allowed"); - service = std::move(ptr); - } - - /** - * @brief Resets a service. - * - * The service is no longer valid after a reset. - */ - static void reset() { - service.reset(); - } - -private: - inline static std::shared_ptr service = nullptr; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/container.hpp b/LiteLoader/Header/third-party/entt/meta/container.hpp deleted file mode 100644 index e8ba546..0000000 --- a/LiteLoader/Header/third-party/entt/meta/container.hpp +++ /dev/null @@ -1,406 +0,0 @@ -#ifndef ENTT_META_CONTAINER_HPP -#define ENTT_META_CONTAINER_HPP - - -#include -#include -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/type_traits.hpp" -#include "type_traits.hpp" - - -namespace entt { - - -/** - * @brief Container traits. - * @tparam Container Type of the underlying container. - * @tparam Trait Traits associated with the underlying container. - */ -template class... Trait> -struct meta_container_traits: public Trait... { - /*! @brief Type of container. */ - using type = Container; -}; - - -/** - * @brief Basic STL-compatible container traits - * @tparam Container The type of the container. - */ -template -struct basic_container { - /** - * @brief Returns the size of the given container. - * @param cont The container for which to return the size. - * @return The size of the given container. - */ - [[nodiscard]] static typename Container::size_type size(const Container &cont) ENTT_NOEXCEPT { - return cont.size(); - } - - /** - * @brief Returns an iterator to the first element of the given container. - * @param cont The container for which to return the iterator. - * @return An iterator to the first element of the given container. - */ - [[nodiscard]] static typename Container::iterator begin(Container &cont) { - return cont.begin(); - } - - /** - * @brief Returns an iterator to the first element of the given container. - * @param cont The container for which to return the iterator. - * @return An iterator to the first element of the given container. - */ - [[nodiscard]] static typename Container::const_iterator cbegin(const Container &cont) { - return cont.begin(); - } - - /** - * @brief Returns an iterator past the last element of the given container. - * @param cont The container for which to return the iterator. - * @return An iterator past the last element of the given container. - */ - [[nodiscard]] static typename Container::iterator end(Container &cont) { - return cont.end(); - } - - /** - * @brief Returns an iterator past the last element of the given container. - * @param cont The container for which to return the iterator. - * @return An iterator past the last element of the given container. - */ - [[nodiscard]] static typename Container::const_iterator cend(const Container &cont) { - return cont.end(); - } -}; - - -/** - * @brief Basic STL-compatible associative container traits - * @tparam Container The type of the container. - */ -template -struct basic_associative_container { - /** - * @brief Returns an iterator to the element with key equivalent to the - * given one, if any. - * @param cont The container in which to search for the element. - * @param key The key of the element to search. - * @return An iterator to the element with the given key, if any. - */ - [[nodiscard]] static typename Container::iterator find(Container &cont, const typename Container::key_type &key) { - return cont.find(key); - } - - /*! @copydoc find */ - [[nodiscard]] static typename Container::const_iterator cfind(const Container &cont, const typename Container::key_type &key) { - return cont.find(key); - } -}; - - -/** - * @brief Basic STL-compatible dynamic container traits - * @tparam Container The type of the container. - */ -template -struct basic_dynamic_container { - /** - * @brief Clears the content of the given container. - * @param cont The container for which to clear the content. - * @return True in case of success, false otherwise. - */ - [[nodiscard]] static bool clear([[maybe_unused]] Container &cont) { - return cont.clear(), true; - } -}; - - -/** - * @brief Basic STL-compatible dynamic associative container traits - * @tparam Container The type of the container. - */ -template -struct basic_dynamic_associative_container { - /** - * @brief Removes the specified element from the given container. - * @param cont The container from which to remove the element. - * @param key The element to remove. - * @return A bool denoting whether the removal took place. - */ - [[nodiscard]] static bool erase([[maybe_unused]] Container &cont, [[maybe_unused]] const typename Container::key_type &key) { - const auto sz = cont.size(); - return cont.erase(key) != sz; - } -}; - - -/** - * @brief Basic STL-compatible sequence container traits - * @tparam Container The type of the container. - */ -template -struct basic_sequence_container { - /** - * @brief Returns a reference to the element at the specified location of - * the given container (no bounds checking is performed). - * @param cont The container from which to get the element. - * @param pos The position of the element to return. - * @return A reference to the requested element. - */ - [[nodiscard]] static typename Container::reference get(Container &cont, typename Container::size_type pos) { - return cont[pos]; - } - - /*! @copydoc get */ - [[nodiscard]] static typename Container::const_reference cget(const Container &cont, typename Container::size_type pos) { - return cont[pos]; - } -}; - - -/** - * @brief STL-compatible dynamic associative key-only container traits - * @tparam Container The type of the container. - */ -template -struct dynamic_associative_key_only_container { - /** - * @brief Inserts an element into the given container. - * @param cont The container in which to insert the element. - * @param key The element to insert. - * @return A bool denoting whether the insertion took place. - */ - [[nodiscard]] static bool insert([[maybe_unused]] Container &cont, [[maybe_unused]] const typename Container::key_type &key) { - return cont.insert(key).second; - } -}; - - -/** - * @brief STL-compatible dynamic key-value associative container traits - * @tparam Container The type of the container. - */ -template -struct dynamic_associative_key_value_container { - /** - * @brief Inserts an element (a key/value pair) into the given container. - * @param cont The container in which to insert the element. - * @param key The key of the element to insert. - * @param value The value of the element to insert. - * @return A bool denoting whether the insertion took place. - */ - [[nodiscard]] static bool insert([[maybe_unused]] Container &cont, [[maybe_unused]] const typename Container::key_type &key, [[maybe_unused]] const typename Container::mapped_type &value) { - return cont.insert(std::make_pair(key, value)).second; - } -}; - - -/** - * @brief STL-compatible dynamic sequence container traits - * @tparam Container The type of the container. - */ -template -struct dynamic_sequence_container { - /** - * @brief Resizes the given container to contain the given number of - * elements. - * @param cont The container to resize. - * @param sz The new size of the container. - * @return True in case of success, false otherwise. - */ - [[nodiscard]] static bool resize([[maybe_unused]] Container &cont, [[maybe_unused]] typename Container::size_type sz) { - return cont.resize(sz), true; - } - - /** - * @brief Inserts an element at the specified location of the given - * container. - * @param cont The container into which to insert the element. - * @param it Iterator before which the element will be inserted. - * @param value Element value to insert. - * @return A pair consisting of an iterator to the inserted element (in case - * of success) and a bool denoting whether the insertion took place. - */ - [[nodiscard]] static std::pair insert([[maybe_unused]] Container &cont, [[maybe_unused]] typename Container::const_iterator it, [[maybe_unused]] const typename Container::value_type &value) { - return { cont.insert(it, value), true }; - } - - /** - * @brief Removes the element at the specified location from the given - * container. - * @param cont The container from which to remove the element. - * @param it Iterator to the element to remove. - * @return A pair consisting of an iterator following the last removed - * element (in case of success) and a bool denoting whether the insertion - * took place. - */ - [[nodiscard]] static std::pair erase([[maybe_unused]] Container &cont, [[maybe_unused]] typename Container::const_iterator it) { - return { cont.erase(it), true }; - } -}; - - -/** - * @brief STL-compatible fixed sequence container traits - * @tparam Container The type of the container. - */ -template -struct fixed_sequence_container { - /** - * @brief Does nothing. - * @return False to indicate failure in all cases. - */ - [[nodiscard]] static bool resize(const Container &, typename Container::size_type) { - return false; - } - - /** - * @brief Does nothing. - * @return False to indicate failure in all cases. - */ - [[nodiscard]] static bool clear(const Container &) { - return false; - } - - /** - * @brief Does nothing. - * @return A pair consisting of an invalid iterator and a false value to - * indicate failure in all cases. - */ - [[nodiscard]] static std::pair insert(const Container &, typename Container::const_iterator, const typename Container::value_type &) { - return { {}, false }; - } - - /** - * @brief Does nothing. - * @return A pair consisting of an invalid iterator and a false value to - * indicate failure in all cases. - */ - [[nodiscard]] static std::pair erase(const Container &, typename Container::const_iterator) { - return { {}, false }; - } -}; - - -/** - * @brief Meta sequence container traits for `std::vector`s of any type. - * @tparam Type The type of elements. - * @tparam Args Other arguments. - */ -template -struct meta_sequence_container_traits> - : meta_container_traits< - std::vector, - basic_container, - basic_dynamic_container, - basic_sequence_container, - dynamic_sequence_container - > -{}; - - -/** - * @brief Meta sequence container traits for `std::array`s of any type. - * @tparam Type The type of elements. - * @tparam N The number of elements. - */ -template -struct meta_sequence_container_traits> - : meta_container_traits< - std::array, - basic_container, - basic_sequence_container, - fixed_sequence_container - > -{}; - - -/** - * @brief Meta associative container traits for `std::map`s of any type. - * @tparam Key The key type of elements. - * @tparam Value The value type of elements. - * @tparam Args Other arguments. - */ -template -struct meta_associative_container_traits> - : meta_container_traits< - std::map, - basic_container, - basic_associative_container, - basic_dynamic_container, - basic_dynamic_associative_container, - dynamic_associative_key_value_container - > -{}; - - -/** - * @brief Meta associative container traits for `std::unordered_map`s of any - * type. - * @tparam Key The key type of elements. - * @tparam Value The value type of elements. - * @tparam Args Other arguments. - */ -template -struct meta_associative_container_traits> - : meta_container_traits< - std::unordered_map, - basic_container, - basic_associative_container, - basic_dynamic_container, - basic_dynamic_associative_container, - dynamic_associative_key_value_container - > -{}; - - -/** - * @brief Meta associative container traits for `std::set`s of any type. - * @tparam Key The type of elements. - * @tparam Args Other arguments. - */ -template -struct meta_associative_container_traits> - : meta_container_traits< - std::set, - basic_container, - basic_associative_container, - basic_dynamic_container, - basic_dynamic_associative_container, - dynamic_associative_key_only_container - > -{}; - - -/** - * @brief Meta associative container traits for `std::unordered_set`s of any - * type. - * @tparam Key The type of elements. - * @tparam Args Other arguments. - */ -template -struct meta_associative_container_traits> - : meta_container_traits< - std::unordered_set, - basic_container, - basic_associative_container, - basic_dynamic_container, - basic_dynamic_associative_container, - dynamic_associative_key_only_container - > -{}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/ctx.hpp b/LiteLoader/Header/third-party/entt/meta/ctx.hpp deleted file mode 100644 index 5eb1170..0000000 --- a/LiteLoader/Header/third-party/entt/meta/ctx.hpp +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef ENTT_META_CTX_HPP -#define ENTT_META_CTX_HPP - - -#include "../core/attribute.h" -#include "../config/config.h" - - -namespace entt { - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -struct meta_type_node; - - -struct ENTT_API meta_context { - // we could use the lines below but VS2017 returns with an ICE if combined with ENTT_API despite the code being valid C++ - // inline static meta_type_node *local = nullptr; - // inline static meta_type_node **global = &local; - - [[nodiscard]] static meta_type_node * & local() ENTT_NOEXCEPT { - static meta_type_node *chain = nullptr; - return chain; - } - - [[nodiscard]] static meta_type_node ** & global() ENTT_NOEXCEPT { - static meta_type_node **chain = &local(); - return chain; - } -}; - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -/*! @brief Opaque container for a meta context. */ -struct meta_ctx { - /** - * @brief Binds the meta system to a given context. - * @param other A valid context to which to bind. - */ - static void bind(meta_ctx other) ENTT_NOEXCEPT { - internal::meta_context::global() = other.ctx; - } - -private: - internal::meta_type_node **ctx{&internal::meta_context::local()}; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/factory.hpp b/LiteLoader/Header/third-party/entt/meta/factory.hpp deleted file mode 100644 index fb44ec6..0000000 --- a/LiteLoader/Header/third-party/entt/meta/factory.hpp +++ /dev/null @@ -1,597 +0,0 @@ -#ifndef ENTT_META_FACTORY_HPP -#define ENTT_META_FACTORY_HPP - - -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/fwd.hpp" -#include "../core/type_info.hpp" -#include "../core/type_traits.hpp" -#include "meta.hpp" -#include "node.hpp" -#include "policy.hpp" -#include "utility.hpp" - - -namespace entt { - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -template -[[nodiscard]] bool find_if(const Node *candidate, const Node *node) ENTT_NOEXCEPT { - return node && (node == candidate || find_if(candidate, node->next)); -} - - -template -[[nodiscard]] bool find_if_not(const Id id, Node *node, const Node *owner) ENTT_NOEXCEPT { - if constexpr(std::is_pointer_v) { - return node && ((*node->id == *id && node != owner) || find_if_not(id, node->next, owner)); - } else { - return node && ((node->id == id && node != owner) || find_if_not(id, node->next, owner)); - } -} - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -/** - * @brief Meta factory to be used for reflection purposes. - * - * The meta factory is an utility class used to reflect types, data members and - * functions of all sorts. This class ensures that the underlying web of types - * is built correctly and performs some checks in debug mode to ensure that - * there are no subtle errors at runtime. - */ -template -struct meta_factory; - - -/** - * @brief Extended meta factory to be used for reflection purposes. - * @tparam Type Reflected type for which the factory was created. - * @tparam Spec Property specialization pack used to disambiguate overloads. - */ -template -struct meta_factory: public meta_factory { -private: - template - void unpack(std::index_sequence, std::tuple property, Other &&... other) { - unroll(choice<3>, std::move(std::get(property))..., std::forward(other)...); - } - - template - void unroll(choice_t<3>, std::tuple property, Other &&... other) { - unpack(std::index_sequence_for{}, std::move(property), std::forward(other)...); - } - - template - void unroll(choice_t<2>, std::pair property, Other &&... other) { - assign(std::move(property.first), std::move(property.second)); - unroll(choice<3>, std::forward(other)...); - } - - template - std::enable_if_t> - unroll(choice_t<1>, Property &&property, Other &&... other) { - assign(std::forward(property)); - unroll(choice<3>, std::forward(other)...); - } - - template - void unroll(choice_t<0>, Func &&invocable, Other &&... other) { - unroll(choice<3>, std::forward(invocable)(), std::forward(other)...); - } - - template - void unroll(choice_t<0>) {} - - template - void assign(Key &&key, meta_any value = {}) { - static meta_any property[2u]{}; - - static internal::meta_prop_node node{ - nullptr, - property[0u], - property[1u] - }; - - entt::meta_any instance{std::forward(key)}; - ENTT_ASSERT(!internal::find_if_not(&instance, *curr, &node), "Duplicate key"); - property[0u] = std::move(instance); - property[1u] = std::move(value); - - if(!internal::find_if(&node, *curr)) { - node.next = *curr; - *curr = &node; - } - } - -public: - /** - * @brief Constructs an extended factory from a given node. - * @param target The underlying node to which to assign the properties. - */ - meta_factory(internal::meta_prop_node **target) ENTT_NOEXCEPT - : curr{target} - {} - - /** - * @brief Assigns a property to the last meta object created. - * - * Both the key and the value (if any) must be at least copy constructible. - * - * @tparam PropertyOrKey Type of the property or property key. - * @tparam Value Optional type of the property value. - * @param property_or_key Property or property key. - * @param value Optional property value. - * @return A meta factory for the parent type. - */ - template - auto prop(PropertyOrKey &&property_or_key, Value &&... value) && { - if constexpr(sizeof...(Value) == 0) { - unroll(choice<3>, std::forward(property_or_key)); - } else { - assign(std::forward(property_or_key), std::forward(value)...); - } - - return meta_factory{curr}; - } - - /** - * @brief Assigns properties to the last meta object created. - * - * Both the keys and the values (if any) must be at least copy - * constructible. - * - * @tparam Property Types of the properties. - * @param property Properties to assign to the last meta object created. - * @return A meta factory for the parent type. - */ - template - auto props(Property... property) && { - unroll(choice<3>, std::forward(property)...); - return meta_factory{curr}; - } - -private: - internal::meta_prop_node **curr; -}; - - -/** - * @brief Basic meta factory to be used for reflection purposes. - * @tparam Type Reflected type for which the factory was created. - */ -template -struct meta_factory { - /** - * @brief Makes a meta type _searchable_. - * @param id Optional unique identifier. - * @return An extended meta factory for the given type. - */ - auto type(const id_type id = type_hash::value()) { - auto * const node = internal::meta_info::resolve(); - - ENTT_ASSERT(!internal::find_if_not(id, *internal::meta_context::global(), node), "Duplicate identifier"); - node->id = id; - - if(!internal::find_if(node, *internal::meta_context::global())) { - node->next = *internal::meta_context::global(); - *internal::meta_context::global() = node; - } - - return meta_factory{&node->prop}; - } - - /** - * @brief Assigns a meta base to a meta type. - * - * A reflected base class must be a real base class of the reflected type. - * - * @tparam Base Type of the base class to assign to the meta type. - * @return A meta factory for the parent type. - */ - template - auto base() ENTT_NOEXCEPT { - static_assert(std::is_base_of_v, "Invalid base type"); - auto * const type = internal::meta_info::resolve(); - - static internal::meta_base_node node{ - type, - nullptr, - &internal::meta_info::resolve, - [](const void *instance) ENTT_NOEXCEPT -> const void * { - return static_cast(static_cast(instance)); - } - }; - - if(!internal::find_if(&node, type->base)) { - node.next = type->base; - type->base = &node; - } - - return meta_factory{}; - } - - /** - * @brief Assigns a meta conversion function to a meta type. - * - * Conversion functions can be either free functions or member - * functions.
- * In case of free functions, they must accept a const reference to an - * instance of the parent type as an argument. In case of member functions, - * they should have no arguments at all. - * - * @tparam Candidate The actual function to use for the conversion. - * @return A meta factory for the parent type. - */ - template - std::enable_if_t, meta_factory> conv() ENTT_NOEXCEPT { - using conv_type = std::invoke_result_t; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_conv_node node{ - type, - nullptr, - &internal::meta_info::resolve, - [](const void *instance) -> meta_any { - return (static_cast(instance)->*Candidate)(); - } - }; - - if(!internal::find_if(&node, type->conv)) { - node.next = type->conv; - type->conv = &node; - } - - return meta_factory{}; - } - - /*! @copydoc conv */ - template - std::enable_if_t, meta_factory> conv() ENTT_NOEXCEPT { - using conv_type = std::invoke_result_t; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_conv_node node{ - type, - nullptr, - &internal::meta_info::resolve, - [](const void *instance) -> meta_any { - return Candidate(*static_cast(instance)); - } - }; - - if(!internal::find_if(&node, type->conv)) { - node.next = type->conv; - type->conv = &node; - } - - return meta_factory{}; - } - - /** - * @brief Assigns a meta conversion function to a meta type. - * - * The given type must be such that an instance of the reflected type can be - * converted to it. - * - * @tparam To Type of the conversion function to assign to the meta type. - * @return A meta factory for the parent type. - */ - template - auto conv() ENTT_NOEXCEPT { - static_assert(std::is_convertible_v, "Could not convert to the required type"); - auto * const type = internal::meta_info::resolve(); - - static internal::meta_conv_node node{ - type, - nullptr, - &internal::meta_info::resolve, - [](const void *instance) -> meta_any { - return static_cast(*static_cast(instance)); - } - }; - - if(!internal::find_if(&node, type->conv)) { - node.next = type->conv; - type->conv = &node; - } - - return meta_factory{}; - } - - /** - * @brief Assigns a meta constructor to a meta type. - * - * Both member functions and free function can be assigned to meta types in - * the role of constructors. All that is required is that they return an - * instance of the underlying type.
- * From a client's point of view, nothing changes if a constructor of a meta - * type is a built-in one or not. - * - * @tparam Candidate The actual function to use as a constructor. - * @tparam Policy Optional policy (no policy set by default). - * @return An extended meta factory for the parent type. - */ - template - auto ctor() ENTT_NOEXCEPT { - using descriptor = meta_function_helper_t; - static_assert(std::is_same_v, Type>, "The function doesn't return an object of the required type"); - auto * const type = internal::meta_info::resolve(); - - static internal::meta_ctor_node node{ - type, - nullptr, - nullptr, - descriptor::args_type::size, - [](const typename internal::meta_ctor_node::size_type index) ENTT_NOEXCEPT { - return meta_arg(typename descriptor::args_type{}, index); - }, - [](meta_any * const args) { - return meta_invoke({}, args, std::make_index_sequence{}); - } - }; - - if(!internal::find_if(&node, type->ctor)) { - node.next = type->ctor; - type->ctor = &node; - } - - return meta_factory>{&node.prop}; - } - - /** - * @brief Assigns a meta constructor to a meta type. - * - * A meta constructor is uniquely identified by the types of its arguments - * and is such that there exists an actual constructor of the underlying - * type that can be invoked with parameters whose types are those given. - * - * @tparam Args Types of arguments to use to construct an instance. - * @return An extended meta factory for the parent type. - */ - template - auto ctor() ENTT_NOEXCEPT { - using descriptor = meta_function_helper_t; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_ctor_node node{ - type, - nullptr, - nullptr, - descriptor::args_type::size, - [](const typename internal::meta_ctor_node::size_type index) ENTT_NOEXCEPT { - return meta_arg(typename descriptor::args_type{}, index); - }, - [](meta_any * const args) { - return meta_construct(args, std::make_index_sequence{}); - } - }; - - if(!internal::find_if(&node, type->ctor)) { - node.next = type->ctor; - type->ctor = &node; - } - - return meta_factory{&node.prop}; - } - - /** - * @brief Assigns a meta destructor to a meta type. - * - * Free functions can be assigned to meta types in the role of destructors. - * The signature of the function should identical to the following: - * - * @code{.cpp} - * void(Type &); - * @endcode - * - * The purpose is to give users the ability to free up resources that - * require special treatment before an object is actually destroyed. - * - * @tparam Func The actual function to use as a destructor. - * @return A meta factory for the parent type. - */ - template - auto dtor() ENTT_NOEXCEPT { - static_assert(std::is_invocable_v, "The function doesn't accept an object of the type provided"); - auto * const type = internal::meta_info::resolve(); - - type->dtor = [](void *instance) { - Func(*static_cast(instance)); - }; - - return meta_factory{}; - } - - /** - * @brief Assigns a meta data to a meta type. - * - * Both data members and static and global variables, as well as constants - * of any kind, can be assigned to a meta type.
- * From a client's point of view, all the variables associated with the - * reflected object will appear as if they were part of the type itself. - * - * @tparam Data The actual variable to attach to the meta type. - * @tparam Policy Optional policy (no policy set by default). - * @param id Unique identifier. - * @return An extended meta factory for the parent type. - */ - template - auto data(const id_type id) ENTT_NOEXCEPT { - if constexpr(std::is_member_object_pointer_v) { - return data(id); - } else { - using data_type = std::remove_pointer_t; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_data_node node{ - {}, - type, - nullptr, - nullptr, - std::is_same_v || std::is_const_v, - true, - &internal::meta_info::resolve, - &meta_setter, - &meta_getter - }; - - ENTT_ASSERT(!internal::find_if_not(id, type->data, &node), "Duplicate identifier"); - node.id = id; - - if(!internal::find_if(&node, type->data)) { - node.next = type->data; - type->data = &node; - } - - return meta_factory>{&node.prop}; - } - } - - /** - * @brief Assigns a meta data to a meta type by means of its setter and - * getter. - * - * Setters and getters can be either free functions, member functions or a - * mix of them.
- * In case of free functions, setters and getters must accept a reference to - * an instance of the parent type as their first argument. A setter has then - * an extra argument of a type convertible to that of the parameter to - * set.
- * In case of member functions, getters have no arguments at all, while - * setters has an argument of a type convertible to that of the parameter to - * set. - * - * @tparam Setter The actual function to use as a setter. - * @tparam Getter The actual function to use as a getter. - * @tparam Policy Optional policy (no policy set by default). - * @param id Unique identifier. - * @return An extended meta factory for the parent type. - */ - template - auto data(const id_type id) ENTT_NOEXCEPT { - using underlying_type = std::remove_reference_t>; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_data_node node{ - {}, - type, - nullptr, - nullptr, - std::is_same_v || (std::is_member_object_pointer_v && std::is_const_v), - false, - &internal::meta_info::resolve, - &meta_setter, - &meta_getter - }; - - ENTT_ASSERT(!internal::find_if_not(id, type->data, &node), "Duplicate identifier"); - node.id = id; - - if(!internal::find_if(&node, type->data)) { - node.next = type->data; - type->data = &node; - } - - return meta_factory, std::integral_constant>{&node.prop}; - } - - /** - * @brief Assigns a meta funcion to a meta type. - * - * Both member functions and free functions can be assigned to a meta - * type.
- * From a client's point of view, all the functions associated with the - * reflected object will appear as if they were part of the type itself. - * - * @tparam Candidate The actual function to attach to the meta type. - * @tparam Policy Optional policy (no policy set by default). - * @param id Unique identifier. - * @return An extended meta factory for the parent type. - */ - template - auto func(const id_type id) ENTT_NOEXCEPT { - using descriptor = meta_function_helper_t; - auto * const type = internal::meta_info::resolve(); - - static internal::meta_func_node node{ - {}, - type, - nullptr, - nullptr, - descriptor::args_type::size, - descriptor::is_const, - descriptor::is_static, - &internal::meta_info, void, typename descriptor::return_type>>::resolve, - [](const typename internal::meta_func_node::size_type index) ENTT_NOEXCEPT { - return meta_arg(typename descriptor::args_type{}, index); - }, - [](meta_handle instance, meta_any *args) { - return meta_invoke(std::move(instance), args, std::make_index_sequence{}); - } - }; - - for(auto *it = &type->func; *it; it = &(*it)->next) { - if(*it == &node) { - *it = node.next; - break; - } - } - - internal::meta_func_node **it = &type->func; - for(; *it && (*it)->id != id; it = &(*it)->next); - for(; *it && (*it)->id == id && (*it)->arity < node.arity; it = &(*it)->next); - - node.id = id; - node.next = *it; - *it = &node; - - return meta_factory>{&node.prop}; - } -}; - - -/** - * @brief Utility function to use for reflection. - * - * This is the point from which everything starts.
- * By invoking this function with a type that is not yet reflected, a meta type - * is created to which it will be possible to attach meta objects through a - * dedicated factory. - * - * @tparam Type Type to reflect. - * @return A meta factory for the given type. - */ -template -[[nodiscard]] auto meta() ENTT_NOEXCEPT { - auto * const node = internal::meta_info::resolve(); - // extended meta factory to allow assigning properties to opaque meta types - return meta_factory{&node->prop}; -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/meta.hpp b/LiteLoader/Header/third-party/entt/meta/meta.hpp deleted file mode 100644 index 52fc741..0000000 --- a/LiteLoader/Header/third-party/entt/meta/meta.hpp +++ /dev/null @@ -1,2226 +0,0 @@ -#ifndef ENTT_META_META_HPP -#define ENTT_META_META_HPP - - -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/any.hpp" -#include "../core/fwd.hpp" -#include "../core/utility.hpp" -#include "../core/type_info.hpp" -#include "../core/type_traits.hpp" -#include "adl_pointer.hpp" -#include "ctx.hpp" -#include "node.hpp" -#include "range.hpp" -#include "type_traits.hpp" - - -namespace entt { - - -class meta_any; -class meta_type; - - -/*! @brief Proxy object for sequence containers. */ -class meta_sequence_container { - template - struct meta_sequence_container_proxy; - - class meta_iterator; - -public: - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Meta iterator type. */ - using iterator = meta_iterator; - - /*! @brief Default constructor. */ - meta_sequence_container() ENTT_NOEXCEPT = default; - - /** - * @brief Construct a proxy object for sequence containers. - * @tparam Type Type of container to wrap. - * @param instance The container to wrap. - */ - template - meta_sequence_container(std::in_place_type_t, any instance) ENTT_NOEXCEPT - : value_type_fn{&meta_sequence_container_proxy::value_type}, - size_fn{&meta_sequence_container_proxy::size}, - resize_fn{&meta_sequence_container_proxy::resize}, - clear_fn{&meta_sequence_container_proxy::clear}, - begin_fn{&meta_sequence_container_proxy::begin}, - end_fn{&meta_sequence_container_proxy::end}, - insert_fn{&meta_sequence_container_proxy::insert}, - erase_fn{&meta_sequence_container_proxy::erase}, - get_fn{&meta_sequence_container_proxy::get}, - storage{std::move(instance)} - {} - - [[nodiscard]] inline meta_type value_type() const ENTT_NOEXCEPT; - [[nodiscard]] inline size_type size() const ENTT_NOEXCEPT; - inline bool resize(size_type); - inline bool clear(); - [[nodiscard]] inline iterator begin(); - [[nodiscard]] inline iterator end(); - inline std::pair insert(iterator, meta_any); - inline std::pair erase(iterator); - [[nodiscard]] inline meta_any operator[](size_type); - [[nodiscard]] inline explicit operator bool() const ENTT_NOEXCEPT; - -private: - meta_type(* value_type_fn)() ENTT_NOEXCEPT = nullptr; - size_type(* size_fn)(const any &) ENTT_NOEXCEPT = nullptr; - bool(* resize_fn)(any &, size_type) = nullptr; - bool(* clear_fn)(any &) = nullptr; - iterator(* begin_fn)(any &) = nullptr; - iterator(* end_fn)(any &) = nullptr; - std::pair(* insert_fn)(any &, iterator, meta_any &) = nullptr; - std::pair(* erase_fn)(any &, iterator) = nullptr; - meta_any(* get_fn)(any &, size_type) = nullptr; - any storage{}; -}; - - -/*! @brief Proxy object for associative containers. */ -class meta_associative_container { - template - struct meta_associative_container_proxy; - - class meta_iterator; - -public: - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Meta iterator type. */ - using iterator = meta_iterator; - - /*! @brief Default constructor. */ - meta_associative_container() ENTT_NOEXCEPT = default; - - /** - * @brief Construct a proxy object for associative containers. - * @tparam Type Type of container to wrap. - * @param instance The container to wrap. - */ - template - meta_associative_container(std::in_place_type_t, any instance) ENTT_NOEXCEPT - : key_only_container{is_key_only_meta_associative_container_v}, - key_type_fn{&meta_associative_container_proxy::key_type}, - mapped_type_fn{&meta_associative_container_proxy::mapped_type}, - value_type_fn{&meta_associative_container_proxy::value_type}, - size_fn{&meta_associative_container_proxy::size}, - clear_fn{&meta_associative_container_proxy::clear}, - begin_fn{&meta_associative_container_proxy::begin}, - end_fn{&meta_associative_container_proxy::end}, - insert_fn{&meta_associative_container_proxy::insert}, - erase_fn{&meta_associative_container_proxy::erase}, - find_fn{&meta_associative_container_proxy::find}, - storage{std::move(instance)} - {} - - [[nodiscard]] inline bool key_only() const ENTT_NOEXCEPT; - [[nodiscard]] inline meta_type key_type() const ENTT_NOEXCEPT; - [[nodiscard]] inline meta_type mapped_type() const ENTT_NOEXCEPT; - [[nodiscard]] inline meta_type value_type() const ENTT_NOEXCEPT; - [[nodiscard]] inline size_type size() const ENTT_NOEXCEPT; - inline bool clear(); - [[nodiscard]] inline iterator begin(); - [[nodiscard]] inline iterator end(); - inline bool insert(meta_any, meta_any); - inline bool erase(meta_any); - [[nodiscard]] inline iterator find(meta_any); - [[nodiscard]] inline explicit operator bool() const ENTT_NOEXCEPT; - -private: - bool key_only_container{}; - meta_type(* key_type_fn)() ENTT_NOEXCEPT = nullptr; - meta_type(* mapped_type_fn)() ENTT_NOEXCEPT = nullptr; - meta_type(* value_type_fn)() ENTT_NOEXCEPT = nullptr; - size_type(* size_fn)(const any &) ENTT_NOEXCEPT = nullptr; - bool(* clear_fn)(any &) = nullptr; - iterator(* begin_fn)(any &) = nullptr; - iterator(* end_fn)(any &) = nullptr; - bool(* insert_fn)(any &, meta_any &, meta_any &) = nullptr; - bool(* erase_fn)(any &, meta_any &) = nullptr; - iterator(* find_fn)(any &, meta_any &) = nullptr; - any storage{}; -}; - - -/*! @brief Opaque wrapper for values of any type. */ -class meta_any { - enum class operation { DTOR, DEREF, SEQ, ASSOC }; - - using vtable_type = void(const operation, const any &, void *); - - template - static void basic_vtable([[maybe_unused]] const operation op, [[maybe_unused]] const any &from, [[maybe_unused]] void *to) { - static_assert(std::is_same_v>, Type>, "Invalid type"); - - if constexpr(!std::is_void_v) { - switch(op) { - case operation::DTOR: - if(auto *curr = static_cast(to); curr->dtor && from.owner()) { - curr->dtor(const_cast(from).data()); - } - break; - case operation::DEREF: - if constexpr(is_meta_pointer_like_v) { - using element_type = std::remove_const_t::element_type>; - - if constexpr(std::is_function_v) { - *static_cast(to) = any_cast(from); - } else if constexpr(!std::is_same_v::element_type>, void>) { - using in_place_type = decltype(adl_meta_pointer_like::dereference(any_cast(from))); - static_cast(to)->emplace(adl_meta_pointer_like::dereference(any_cast(from))); - } - } - break; - case operation::SEQ: - if constexpr(is_complete_v>) { - *static_cast(to) = { std::in_place_type, std::move(const_cast(from)) }; - } - break; - case operation::ASSOC: - if constexpr(is_complete_v>) { - *static_cast(to) = { std::in_place_type, std::move(const_cast(from)) }; - } - break; - } - } - } - - meta_any(const meta_any &other, any ref) ENTT_NOEXCEPT - : storage{std::move(ref)}, - node{storage ? other.node : nullptr}, - vtable{storage ? other.vtable : &basic_vtable} - {} - -public: - /*! @brief Default constructor. */ - meta_any() ENTT_NOEXCEPT - : storage{}, - node{}, - vtable{&basic_vtable} - {} - - /** - * @brief Constructs a wrapper by directly initializing the new object. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - */ - template - explicit meta_any(std::in_place_type_t, Args &&... args) - : storage{std::in_place_type, std::forward(args)...}, - node{internal::meta_info::resolve()}, - vtable{&basic_vtable>>} - {} - - /** - * @brief Constructs a wrapper that holds an unmanaged object. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - */ - template - meta_any(std::reference_wrapper value) - : meta_any{} - { - // invokes deprecated assignment operator (and avoids issues with vs2017) - *this = value; - } - - /** - * @brief Constructs a wrapper from a given value. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - */ - template, meta_any>>> - meta_any(Type &&value) - : storage{std::forward(value)}, - node{internal::meta_info>::resolve()}, - vtable{&basic_vtable>} - {} - - /** - * @brief Copy constructor. - * @param other The instance to copy from. - */ - meta_any(const meta_any &other) = default; - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - meta_any(meta_any &&other) ENTT_NOEXCEPT - : storage{std::move(other.storage)}, - node{std::exchange(other.node, nullptr)}, - vtable{std::exchange(other.vtable, &basic_vtable)} - {} - - /*! @brief Frees the internal storage, whatever it means. */ - ~meta_any() { - vtable(operation::DTOR, storage, node); - } - - /** - * @brief Copy assignment operator. - * @param other The instance to copy from. - * @return This meta any object. - */ - meta_any & operator=(const meta_any &other) { - std::exchange(vtable, other.vtable)(operation::DTOR, storage, node); - storage = other.storage; - node = other.node; - return *this; - } - - /** - * @brief Move assignment operator. - * @param other The instance to move from. - * @return This meta any object. - */ - meta_any & operator=(meta_any &&other) ENTT_NOEXCEPT { - std::exchange(vtable, std::exchange(other.vtable, &basic_vtable))(operation::DTOR, storage, node); - storage = std::move(other.storage); - node = std::exchange(other.node, nullptr); - return *this; - } - - /** - * @brief Value assignment operator. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - * @return This meta any object. - */ - template - [[deprecated("Use std::in_place_type, entt::make_meta, emplace or forward_as_meta instead")]] - meta_any & operator=(std::reference_wrapper value) { - emplace(value.get()); - return *this; - } - - /** - * @brief Value assignment operator. - * @tparam Type Type of object to use to initialize the wrapper. - * @param value An instance of an object to use to initialize the wrapper. - * @return This meta any object. - */ - template - std::enable_if_t, meta_any>, meta_any &> - operator=(Type &&value) { - emplace>(std::forward(value)); - return *this; - } - - /** - * @brief Returns the type of the underlying object. - * @return The type of the underlying object, if any. - */ - [[nodiscard]] inline meta_type type() const ENTT_NOEXCEPT; - - /** - * @brief Returns an opaque pointer to the contained instance. - * @return An opaque pointer the contained instance, if any. - */ - [[nodiscard]] const void * data() const ENTT_NOEXCEPT { - return storage.data(); - } - - /*! @copydoc data */ - [[nodiscard]] void * data() ENTT_NOEXCEPT { - return storage.data(); - } - - /** - * @brief Invokes the underlying function, if possible. - * - * @sa meta_func::invoke - * - * @tparam Args Types of arguments to use to invoke the function. - * @param id Unique identifier. - * @param args Parameters to use to invoke the function. - * @return A wrapper containing the returned value, if any. - */ - template - meta_any invoke(const id_type id, Args &&... args) const; - - /*! @copydoc invoke */ - template - meta_any invoke(const id_type id, Args &&... args); - - /** - * @brief Sets the value of a given variable. - * - * The type of the value must be such that a cast or conversion to the type - * of the variable is possible. Otherwise, invoking the setter does nothing. - * - * @tparam Type Type of value to assign. - * @param id Unique identifier. - * @param value Parameter to use to set the underlying variable. - * @return True in case of success, false otherwise. - */ - template - bool set(const id_type id, Type &&value); - - /** - * @brief Gets the value of a given variable. - * @param id Unique identifier. - * @return A wrapper containing the value of the underlying variable. - */ - [[nodiscard]] meta_any get(const id_type id) const; - - /*! @copydoc get */ - [[nodiscard]] meta_any get(const id_type id); - - /** - * @brief Tries to cast an instance to a given type. - * @tparam Type Type to which to cast the instance. - * @return A (possibly null) pointer to the contained instance. - */ - template - [[nodiscard]] const Type * try_cast() const { - if(node) { - if(const auto info = type_id(); node->info == info) { - return any_cast(&storage); - } else if(const auto *base = internal::meta_visit<&internal::meta_type_node::base>([info](const auto *curr) { return curr->type()->info == info; }, node); base) { - return static_cast(base->cast(storage.data())); - } - } - - return nullptr; - } - - /*! @copydoc try_cast */ - template - [[nodiscard]] Type * try_cast() { - if(node) { - if(const auto info = type_id(); node->info == info) { - return any_cast(&storage); - } else if(const auto *base = internal::meta_visit<&internal::meta_type_node::base>([info](const auto *curr) { return curr->type()->info == info; }, node); base) { - return static_cast(const_cast *>(base->cast(static_cast &>(storage).data()))); - } - } - - return nullptr; - } - - /** - * @brief Tries to cast an instance to a given type. - * - * The type of the instance must be such that the cast is possible. - * - * @warning - * Attempting to perform an invalid cast results in undefined behavior. - * - * @tparam Type Type to which to cast the instance. - * @return A reference to the contained instance. - */ - template - [[nodiscard]] Type cast() const { - auto * const instance = try_cast>(); - ENTT_ASSERT(instance, "Invalid instance"); - return static_cast(*instance); - } - - /*! @copydoc cast */ - template - [[nodiscard]] Type cast() { - // forces const on non-reference types to make them work also with wrappers for const references - auto * const instance = try_cast>(); - ENTT_ASSERT(instance, "Invalid instance"); - return static_cast(*instance); - } - - /** - * @brief Converts an object in such a way that a given cast becomes viable. - * @tparam Type Type to which the cast is requested. - * @return A valid meta any object if there exists a viable conversion, an - * invalid one otherwise. - */ - template - [[nodiscard]] meta_any allow_cast() const { - if(try_cast>() != nullptr) { - return as_ref(); - } else if(node) { - if(const auto * const conv = internal::meta_visit<&internal::meta_type_node::conv>([info = type_id()](const auto *curr) { return curr->type()->info == info; }, node); conv) { - return conv->conv(storage.data()); - } - } - - return {}; - } - - /** - * @brief Converts an object in such a way that a given cast becomes viable. - * @tparam Type Type to which the cast is requested. - * @return True if there exists a viable conversion, false otherwise. - */ - template - bool allow_cast() { - // forces const on non-reference types to make them work also with wrappers for const references - if(try_cast>() != nullptr) { - return true; - } else if(node) { - if(const auto * const conv = internal::meta_visit<&internal::meta_type_node::conv>([info = type_id()](const auto *curr) { return curr->type()->info == info; }, node); conv) { - *this = conv->conv(std::as_const(storage).data()); - return true; - } - } - - return false; - } - - /** - * @brief Replaces the contained object by creating a new instance directly. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - */ - template - void emplace(Args &&... args) { - std::exchange(vtable, &basic_vtable>>)(operation::DTOR, storage, node); - storage.emplace(std::forward(args)...); - node = internal::meta_info::resolve(); - } - - /*! @brief Destroys contained object */ - void reset() { - std::exchange(vtable, &basic_vtable)(operation::DTOR, storage, node); - storage.reset(); - node = nullptr; - } - - /** - * @brief Returns a sequence container proxy. - * @return A sequence container proxy for the underlying object. - */ - [[nodiscard]] meta_sequence_container as_sequence_container() ENTT_NOEXCEPT { - meta_sequence_container proxy; - vtable(operation::SEQ, storage.as_ref(), &proxy); - return proxy; - } - - /*! @copydoc as_sequence_container */ - [[nodiscard]] meta_sequence_container as_sequence_container() const ENTT_NOEXCEPT { - meta_sequence_container proxy; - vtable(operation::SEQ, storage.as_ref(), &proxy); - return proxy; - } - - /** - * @brief Returns an associative container proxy. - * @return An associative container proxy for the underlying object. - */ - [[nodiscard]] meta_associative_container as_associative_container() ENTT_NOEXCEPT { - meta_associative_container proxy; - vtable(operation::ASSOC, storage.as_ref(), &proxy); - return proxy; - } - - /*! @copydoc as_associative_container */ - [[nodiscard]] meta_associative_container as_associative_container() const ENTT_NOEXCEPT { - meta_associative_container proxy; - vtable(operation::ASSOC, storage.as_ref(), &proxy); - return proxy; - } - - /** - * @brief Indirection operator for dereferencing opaque objects. - * @return A wrapper that shares a reference to an unmanaged object if the - * wrapped element is dereferenceable, an invalid meta any otherwise. - */ - [[nodiscard]] meta_any operator*() const ENTT_NOEXCEPT { - meta_any ret{}; - vtable(operation::DEREF, storage, &ret); - return ret; - } - - /** - * @brief Returns false if a wrapper is invalid, true otherwise. - * @return False if the wrapper is invalid, true otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - - /** - * @brief Checks if two wrappers differ in their content. - * @param other Wrapper with which to compare. - * @return False if the two objects differ in their content, true otherwise. - */ - [[nodiscard]] bool operator==(const meta_any &other) const { - return (!node && !other.node) || (node && other.node && node->info == other.node->info && storage == other.storage); - } - - /** - * @brief Aliasing constructor. - * @return A wrapper that shares a reference to an unmanaged object. - */ - [[nodiscard]] meta_any as_ref() ENTT_NOEXCEPT { - return meta_any{*this, storage.as_ref()}; - } - - /*! @copydoc as_ref */ - [[nodiscard]] meta_any as_ref() const ENTT_NOEXCEPT { - return meta_any{*this, storage.as_ref()}; - } - -private: - any storage; - internal::meta_type_node *node; - vtable_type *vtable; -}; - - -/** - * @brief Checks if two wrappers differ in their content. - * @param lhs A wrapper, either empty or not. - * @param rhs A wrapper, either empty or not. - * @return True if the two wrappers differ in their content, false otherwise. - */ -[[nodiscard]] inline bool operator!=(const meta_any &lhs, const meta_any &rhs) ENTT_NOEXCEPT { - return !(lhs == rhs); -} - - -/** - * @brief Constructs a wrapper from a given type, passing it all arguments. - * @tparam Type Type of object to use to initialize the wrapper. - * @tparam Args Types of arguments to use to construct the new instance. - * @param args Parameters to use to construct the instance. - * @return A properly initialized wrapper for an object of the given type. - */ -template -meta_any make_meta(Args &&... args) { - return meta_any{std::in_place_type, std::forward(args)...}; -} - - -/** - * @brief Forwards its argument and avoids copies for lvalue references. - * @tparam Type Type of argument to use to construct the new instance. - * @param value Parameter to use to construct the instance. - * @return A properly initialized and not necessarily owning wrapper. - */ -template -meta_any forward_as_meta(Type &&value) { - return meta_any{std::in_place_type, std::decay_t, Type>>, std::forward(value)}; -} - - -/** - * @brief Opaque pointers to instances of any type. - * - * A handle doesn't perform copies and isn't responsible for the contained - * object. It doesn't prolong the lifetime of the pointed instance.
- * Handles are used to generate references to actual objects when needed. - */ -struct meta_handle { - /*! @brief Default constructor. */ - meta_handle() = default; - - - /*! @brief Default copy constructor, deleted on purpose. */ - meta_handle(const meta_handle &) = delete; - - /*! @brief Default move constructor. */ - meta_handle(meta_handle &&) = default; - - /** - * @brief Default copy assignment operator, deleted on purpose. - * @return This meta handle. - */ - meta_handle & operator=(const meta_handle &) = delete; - - /** - * @brief Default move assignment operator. - * @return This meta handle. - */ - meta_handle & operator=(meta_handle &&) = default; - - /** - * @brief Creates a handle that points to an unmanaged object. - * @tparam Type Type of object to use to initialize the handle. - * @param value An instance of an object to use to initialize the handle. - */ - template, meta_handle>>> - meta_handle(Type &value) ENTT_NOEXCEPT - : meta_handle{} - { - if constexpr(std::is_same_v, meta_any>) { - any = value.as_ref(); - } else { - any.emplace(value); - } - } - - /** - * @brief Returns false if a handle is invalid, true otherwise. - * @return False if the handle is invalid, true otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return static_cast(any); - } - - /** - * @brief Access operator for accessing the contained opaque object. - * @return A wrapper that shares a reference to an unmanaged object. - */ - [[nodiscard]] meta_any * operator->() { - return &any; - } - - /*! @copydoc operator-> */ - [[nodiscard]] const meta_any * operator->() const { - return &any; - } - -private: - meta_any any; -}; - - -/*! @brief Opaque wrapper for properties of any type. */ -struct meta_prop { - /*! @brief Node type. */ - using node_type = internal::meta_prop_node; - - /** - * @brief Constructs an instance from a given node. - * @param curr The underlying node with which to construct the instance. - */ - meta_prop(const node_type *curr = nullptr) ENTT_NOEXCEPT - : node{curr} - {} - - /** - * @brief Returns the stored key as a const reference. - * @return A wrapper containing the key stored with the property. - */ - [[nodiscard]] meta_any key() const { - return node->id.as_ref(); - } - - /** - * @brief Returns the stored value by copy. - * @return A wrapper containing the value stored with the property. - */ - [[nodiscard]] meta_any value() const { - return node->value; - } - - /** - * @brief Returns true if an object is valid, false otherwise. - * @return True if the object is valid, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - -private: - const node_type *node; -}; - - -/*! @brief Opaque wrapper for constructors. */ -struct meta_ctor { - /*! @brief Node type. */ - using node_type = internal::meta_ctor_node; - /*! @brief Unsigned integer type. */ - using size_type = typename node_type::size_type; - - /*! @copydoc meta_prop::meta_prop */ - meta_ctor(const node_type *curr = nullptr) ENTT_NOEXCEPT - : node{curr} - {} - - /** - * @brief Returns the type to which an object belongs. - * @return The type to which the object belongs. - */ - [[nodiscard]] inline meta_type parent() const ENTT_NOEXCEPT; - - /** - * @brief Returns the number of arguments accepted by a constructor. - * @return The number of arguments accepted by the constructor. - */ - [[nodiscard]] size_type arity() const ENTT_NOEXCEPT { - return node->arity; - } - - /** - * @brief Returns the type of the i-th argument of a constructor. - * @param index Index of the argument of which to return the type. - * @return The type of the i-th argument of a constructor. - */ - [[nodiscard]] meta_type arg(size_type index) const ENTT_NOEXCEPT; - - /** - * @brief Creates an instance of the underlying type, if possible. - * - * Parameters must be such that a cast or conversion to the required types - * is possible. Otherwise, an empty and thus invalid wrapper is returned. - * - * @param args Parameters to use to construct the instance. - * @param sz Number of parameters to use to construct the instance. - * @return A wrapper containing the new instance, if any. - */ - [[nodiscard]] meta_any invoke(meta_any * const args, const size_type sz) const { - return sz == arity() ? node->invoke(args) : meta_any{}; - } - - /** - * @copybrief invoke - * - * @sa invoke - * - * @tparam Args Types of arguments to use to construct the instance. - * @param args Parameters to use to construct the instance. - * @return A wrapper containing the new instance, if any. - */ - template - [[nodiscard]] meta_any invoke([[maybe_unused]] Args &&... args) const { - meta_any arguments[sizeof...(Args) + 1u]{std::forward(args)...}; - return invoke(arguments, sizeof...(Args)); - } - - /** - * @brief Returns a range to use to visit all properties. - * @return An iterable range to use to visit all properties. - */ - [[nodiscard]] meta_range prop() const ENTT_NOEXCEPT { - return node->prop; - } - - /** - * @brief Returns the property associated with a given key. - * @param key The key to use to search for a property. - * @return The property associated with the given key, if any. - */ - [[nodiscard]] meta_prop prop(meta_any key) const { - return internal::meta_visit<&node_type::prop>([&key](const auto *curr) { return curr->id == key; }, node); - } - - /** - * @brief Returns true if an object is valid, false otherwise. - * @return True if the object is valid, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - -private: - const node_type *node; -}; - - -/*! @brief Opaque wrapper for data members. */ -struct meta_data { - /*! @brief Node type. */ - using node_type = internal::meta_data_node; - - /*! @copydoc meta_prop::meta_prop */ - meta_data(const node_type *curr = nullptr) ENTT_NOEXCEPT - : node{curr} - {} - - /*! @copydoc meta_type::id */ - [[nodiscard]] id_type id() const ENTT_NOEXCEPT { - return node->id; - } - - /*! @copydoc meta_ctor::parent */ - [[nodiscard]] inline meta_type parent() const ENTT_NOEXCEPT; - - /** - * @brief Indicates whether a data member is constant or not. - * @return True if the data member is constant, false otherwise. - */ - [[nodiscard]] bool is_const() const ENTT_NOEXCEPT { - return node->is_const; - } - - /** - * @brief Indicates whether a data member is static or not. - * @return True if the data member is static, false otherwise. - */ - [[nodiscard]] bool is_static() const ENTT_NOEXCEPT { - return node->is_static; - } - - /*! @copydoc meta_any::type */ - [[nodiscard]] inline meta_type type() const ENTT_NOEXCEPT; - - /** - * @brief Sets the value of a given variable. - * - * It must be possible to cast the instance to the parent type of the data - * member. Otherwise, invoking the setter results in an undefined - * behavior.
- * The type of the value must be such that a cast or conversion to the type - * of the variable is possible. Otherwise, invoking the setter does nothing. - * - * @tparam Type Type of value to assign. - * @param instance An opaque instance of the underlying type. - * @param value Parameter to use to set the underlying variable. - * @return True in case of success, false otherwise. - */ - template - bool set(meta_handle instance, Type &&value) const { - return node->set && node->set(std::move(instance), std::forward(value)); - } - - /** - * @brief Gets the value of a given variable. - * - * It must be possible to cast the instance to the parent type of the data - * member. Otherwise, invoking the getter results in an undefined behavior. - * - * @param instance An opaque instance of the underlying type. - * @return A wrapper containing the value of the underlying variable. - */ - [[nodiscard]] meta_any get(meta_handle instance) const { - return node->get(std::move(instance)); - } - - /*! @copydoc meta_ctor::prop */ - [[nodiscard]] meta_range prop() const ENTT_NOEXCEPT { - return node->prop; - } - - /** - * @brief Returns the property associated with a given key. - * @param key The key to use to search for a property. - * @return The property associated with the given key, if any. - */ - [[nodiscard]] meta_prop prop(meta_any key) const { - return internal::meta_visit<&node_type::prop>([&key](const auto *curr) { return curr->id == key; }, node); - } - - /** - * @brief Returns true if an object is valid, false otherwise. - * @return True if the object is valid, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - -private: - const node_type *node; -}; - - -/*! @brief Opaque wrapper for member functions. */ -struct meta_func { - /*! @brief Node type. */ - using node_type = internal::meta_func_node; - /*! @brief Unsigned integer type. */ - using size_type = typename node_type::size_type; - - /*! @copydoc meta_prop::meta_prop */ - meta_func(const node_type *curr = nullptr) ENTT_NOEXCEPT - : node{curr} - {} - - /*! @copydoc meta_type::id */ - [[nodiscard]] id_type id() const ENTT_NOEXCEPT { - return node->id; - } - - /*! @copydoc meta_ctor::parent */ - [[nodiscard]] inline meta_type parent() const ENTT_NOEXCEPT; - - /** - * @brief Returns the number of arguments accepted by a member function. - * @return The number of arguments accepted by the member function. - */ - [[nodiscard]] size_type arity() const ENTT_NOEXCEPT { - return node->arity; - } - - /** - * @brief Indicates whether a member function is constant or not. - * @return True if the member function is constant, false otherwise. - */ - [[nodiscard]] bool is_const() const ENTT_NOEXCEPT { - return node->is_const; - } - - /** - * @brief Indicates whether a member function is static or not. - * @return True if the member function is static, false otherwise. - */ - [[nodiscard]] bool is_static() const ENTT_NOEXCEPT { - return node->is_static; - } - - /** - * @brief Returns the return type of a member function. - * @return The return type of the member function. - */ - [[nodiscard]] inline meta_type ret() const ENTT_NOEXCEPT; - - /** - * @brief Returns the type of the i-th argument of a member function. - * @param index Index of the argument of which to return the type. - * @return The type of the i-th argument of a member function. - */ - [[nodiscard]] inline meta_type arg(size_type index) const ENTT_NOEXCEPT; - - /** - * @brief Invokes the underlying function, if possible. - * - * To invoke a member function, the parameters must be such that a cast or - * conversion to the required types is possible. Otherwise, an empty and - * thus invalid wrapper is returned.
- * It must be possible to cast the instance to the parent type of the member - * function. Otherwise, invoking the underlying function results in an - * undefined behavior. - * - * @param instance An opaque instance of the underlying type. - * @param args Parameters to use to invoke the function. - * @param sz Number of parameters to use to invoke the function. - * @return A wrapper containing the returned value, if any. - */ - meta_any invoke(meta_handle instance, meta_any * const args, const size_type sz) const { - return sz == arity() ? node->invoke(std::move(instance), args) : meta_any{}; - } - - /** - * @copybrief invoke - * - * @sa invoke - * - * @tparam Args Types of arguments to use to invoke the function. - * @param instance An opaque instance of the underlying type. - * @param args Parameters to use to invoke the function. - * @return A wrapper containing the new instance, if any. - */ - template - meta_any invoke(meta_handle instance, Args &&... args) const { - meta_any arguments[sizeof...(Args) + 1u]{std::forward(args)...}; - return invoke(std::move(instance), arguments, sizeof...(Args)); - } - - /*! @copydoc meta_ctor::prop */ - [[nodiscard]] meta_range prop() const ENTT_NOEXCEPT { - return node->prop; - } - - /** - * @brief Returns the property associated with a given key. - * @param key The key to use to search for a property. - * @return The property associated with the given key, if any. - */ - [[nodiscard]] meta_prop prop(meta_any key) const { - return internal::meta_visit<&node_type::prop>([&key](const auto *curr) { return curr->id == key; }, node); - } - - /** - * @brief Returns true if an object is valid, false otherwise. - * @return True if the object is valid, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - -private: - const node_type *node; -}; - - -/*! @brief Opaque wrapper for types. */ -class meta_type { - static bool can_cast_or_convert(const internal::meta_type_node *type, const type_info info) ENTT_NOEXCEPT { - if(type->info == info) { - return true; - } - - for(const auto *curr = type->conv; curr; curr = curr->next) { - if(curr->type()->info == info) { - return true; - } - } - - for(const auto *curr = type->base; curr; curr = curr->next) { - if(auto *target = curr->type(); can_cast_or_convert(target, info)) { - return true; - } - } - - return false; - } - - template - [[nodiscard]] static const internal::meta_ctor_node * ctor(const internal::meta_ctor_node *curr, std::index_sequence) { - for(; curr; curr = curr->next) { - if(curr->arity == sizeof...(Args) && (can_cast_or_convert(internal::meta_info::resolve(), curr->arg(Index).info()) && ...)) { - return curr; - } - } - - return nullptr; - } - - template - void unregister_all(Node **curr) { - while(*curr) { - (unregister_all(&((*curr)->*Member)), ...); - *curr = std::exchange((*curr)->next, nullptr); - } - } - -public: - /*! @brief Node type. */ - using node_type = internal::meta_type_node; - /*! @brief Node type. */ - using base_node_type = internal::meta_base_node; - /*! @brief Unsigned integer type. */ - using size_type = typename node_type::size_type; - - /*! @copydoc meta_prop::meta_prop */ - meta_type(node_type *curr = nullptr) ENTT_NOEXCEPT - : node{curr} - {} - - /** - * @brief Constructs an instance from a given base node. - * @param curr The base node with which to construct the instance. - */ - meta_type(base_node_type *curr) ENTT_NOEXCEPT - : node{curr ? curr->type() : nullptr} - {} - - /** - * @brief Returns the type info object of the underlying type. - * @return The type info object of the underlying type. - */ - [[nodiscard]] type_info info() const ENTT_NOEXCEPT { - return node->info; - } - - /** - * @brief Returns the identifier assigned to a type. - * @return The identifier assigned to the type. - */ - [[nodiscard]] id_type id() const ENTT_NOEXCEPT { - return node->id; - } - - /** - * @brief Returns the size of the underlying type if known. - * @return The size of the underlying type if known, 0 otherwise. - */ - [[nodiscard]] size_type size_of() const ENTT_NOEXCEPT { - return node->size_of; - } - - /** - * @brief Checks whether a type refers to void or not. - * @return True if the underlying type is void, false otherwise. - */ - [[nodiscard]] bool is_void() const ENTT_NOEXCEPT { - return node->is_void; - } - - /** - * @brief Checks whether a type refers to an integral type or not. - * @return True if the underlying type is an integral type, false otherwise. - */ - [[nodiscard]] bool is_integral() const ENTT_NOEXCEPT { - return node->is_integral; - } - - /** - * @brief Checks whether a type refers to a floating-point type or not. - * @return True if the underlying type is a floating-point type, false - * otherwise. - */ - [[nodiscard]] bool is_floating_point() const ENTT_NOEXCEPT { - return node->is_floating_point; - } - - /** - * @brief Checks whether a type refers to an array type or not. - * @return True if the underlying type is an array type, false otherwise. - */ - [[nodiscard]] bool is_array() const ENTT_NOEXCEPT { - return node->is_array; - } - - /** - * @brief Checks whether a type refers to an enum or not. - * @return True if the underlying type is an enum, false otherwise. - */ - [[nodiscard]] bool is_enum() const ENTT_NOEXCEPT { - return node->is_enum; - } - - /** - * @brief Checks whether a type refers to an union or not. - * @return True if the underlying type is an union, false otherwise. - */ - [[nodiscard]] bool is_union() const ENTT_NOEXCEPT { - return node->is_union; - } - - /** - * @brief Checks whether a type refers to a class or not. - * @return True if the underlying type is a class, false otherwise. - */ - [[nodiscard]] bool is_class() const ENTT_NOEXCEPT { - return node->is_class; - } - - /** - * @brief Checks whether a type refers to a pointer or not. - * @return True if the underlying type is a pointer, false otherwise. - */ - [[nodiscard]] bool is_pointer() const ENTT_NOEXCEPT { - return node->is_pointer; - } - - /** - * @brief Checks whether a type refers to a function pointer or not. - * @return True if the underlying type is a function pointer, false - * otherwise. - */ - [[nodiscard]] bool is_function_pointer() const ENTT_NOEXCEPT { - return node->is_function_pointer; - } - - /** - * @brief Checks whether a type refers to a pointer to data member or not. - * @return True if the underlying type is a pointer to data member, false - * otherwise. - */ - [[nodiscard]] bool is_member_object_pointer() const ENTT_NOEXCEPT { - return node->is_member_object_pointer; - } - - /** - * @brief Checks whether a type refers to a pointer to member function or - * not. - * @return True if the underlying type is a pointer to member function, - * false otherwise. - */ - [[nodiscard]] bool is_member_function_pointer() const ENTT_NOEXCEPT { - return node->is_member_function_pointer; - } - - /** - * @brief Checks whether a type is a pointer-like type or not. - * @return True if the underlying type is a pointer-like one, false - * otherwise. - */ - [[nodiscard]] bool is_pointer_like() const ENTT_NOEXCEPT { - return node->is_pointer_like; - } - - /** - * @brief Checks whether a type refers to a sequence container or not. - * @return True if the type is a sequence container, false otherwise. - */ - [[nodiscard]] bool is_sequence_container() const ENTT_NOEXCEPT { - return node->is_sequence_container; - } - - /** - * @brief Checks whether a type refers to an associative container or not. - * @return True if the type is an associative container, false otherwise. - */ - [[nodiscard]] bool is_associative_container() const ENTT_NOEXCEPT { - return node->is_associative_container; - } - - /** - * @brief Checks whether a type refers to a recognized class template - * specialization or not. - * @return True if the type is a recognized class template specialization, - * false otherwise. - */ - [[nodiscard]] bool is_template_specialization() const ENTT_NOEXCEPT { - return node->template_info.is_template_specialization; - } - - /** - * @brief Returns the number of template arguments, if any. - * @return The number of template arguments, if any. - */ - [[nodiscard]] size_type template_arity() const ENTT_NOEXCEPT { - return node->template_info.arity; - } - - /** - * @brief Returns a tag for the class template of the underlying type. - * - * @sa meta_class_template_tag - * - * @return The tag for the class template of the underlying type. - */ - [[nodiscard]] inline meta_type template_type() const ENTT_NOEXCEPT { - return is_template_specialization() ? node->template_info.type() : meta_type{}; - } - - /** - * @brief Returns the type of the i-th template argument of a type. - * @param index Index of the template argument of which to return the type. - * @return The type of the i-th template argument of a type. - */ - [[nodiscard]] inline meta_type template_arg(size_type index) const ENTT_NOEXCEPT { - return index < template_arity() ? node->template_info.arg(index) : meta_type{}; - } - - /** - * @brief Provides the number of dimensions of an array type. - * @return The number of dimensions in case of array types, 0 otherwise. - */ - [[nodiscard]] size_type rank() const ENTT_NOEXCEPT { - return node->rank; - } - - /** - * @brief The number of elements along the given dimension of an array type. - * @param dim The dimension of which to return the number of elements. - * @return The number of elements along the given dimension in case of array - * types, 0 otherwise. - */ - [[nodiscard]] size_type extent(size_type dim = {}) const ENTT_NOEXCEPT { - return node->extent(dim); - } - - /** - * @brief Provides the type for which the pointer is defined. - * @return The type for which the pointer is defined or this type if it - * doesn't refer to a pointer type. - */ - [[nodiscard]] meta_type remove_pointer() const ENTT_NOEXCEPT { - return node->remove_pointer(); - } - - /** - * @brief Provides the type for which the array is defined. - * @return The type for which the array is defined or this type if it - * doesn't refer to an array type. - */ - [[nodiscard]] meta_type remove_extent() const ENTT_NOEXCEPT { - return node->remove_extent(); - } - - /** - * @brief Returns a range to use to visit top-level base meta types. - * @return An iterable range to use to visit top-level base meta types. - */ - [[nodiscard]] meta_range base() const ENTT_NOEXCEPT { - return node->base; - } - - /** - * @brief Returns the base meta type associated with a given identifier. - * @param id Unique identifier. - * @return The base meta type associated with the given identifier, if any. - */ - [[nodiscard]] meta_type base(const id_type id) const { - return internal::meta_visit<&node_type::base>([id](const auto *curr) { return curr->type()->id == id; }, node); - } - - /** - * @brief Returns a range to use to visit top-level constructors. - * @return An iterable range to use to visit top-level constructors. - */ - [[nodiscard]] meta_range ctor() const ENTT_NOEXCEPT { - return node->ctor; - } - - /** - * @brief Returns a constructor for a given list of types of arguments. - * @tparam Args Constructor arguments. - * @return The requested constructor, if any. - */ - template - [[nodiscard]] meta_ctor ctor() const { - return ctor(node->ctor, std::make_index_sequence{}); - } - - /** - * @brief Returns a range to use to visit top-level data. - * @return An iterable range to use to visit top-level data. - */ - [[nodiscard]] meta_range data() const ENTT_NOEXCEPT { - return node->data; - } - - /** - * @brief Returns the data associated with a given identifier. - * - * The data of the base classes will also be visited, if any. - * - * @param id Unique identifier. - * @return The data associated with the given identifier, if any. - */ - [[nodiscard]] meta_data data(const id_type id) const { - return internal::meta_visit<&node_type::data>([id](const auto *curr) { return curr->id == id; }, node); - } - - /** - * @brief Returns a range to use to visit top-level functions. - * @return An iterable range to use to visit top-level functions. - */ - [[nodiscard]] meta_range func() const ENTT_NOEXCEPT { - return node->func; - } - - /** - * @brief Returns the function associated with a given identifier. - * - * The functions of the base classes will also be visited, if any.
- * In the case of overloaded functions, the first one with the required - * identifier will be returned. - * - * @param id Unique identifier. - * @return The function associated with the given identifier, if any. - */ - [[nodiscard]] meta_func func(const id_type id) const { - return internal::meta_visit<&node_type::func>([id](const auto *curr) { return curr->id == id; }, node); - } - - /** - * @brief Creates an instance of the underlying type, if possible. - * - * Parameters must be such that a cast or conversion to the required types - * is possible. Otherwise, an empty and thus invalid wrapper is returned. - * - * @param args Parameters to use to construct the instance. - * @param sz Number of parameters to use to construct the instance. - * @return A wrapper containing the new instance, if any. - */ - [[nodiscard]] meta_any construct(meta_any * const args, const size_type sz) const { - meta_any ret{}; - internal::meta_visit<&node_type::ctor>([args, sz, &ret](const auto *curr) { return (curr->arity == sz) && (ret = curr->invoke(args)); }, node); - return ret; - } - - /** - * @copybrief construct - * - * @sa construct - * - * @tparam Args Types of arguments to use to construct the instance. - * @param args Parameters to use to construct the instance. - * @return A wrapper containing the new instance, if any. - */ - template - [[nodiscard]] meta_any construct(Args &&... args) const { - meta_any arguments[sizeof...(Args) + 1u]{std::forward(args)...}; - return construct(arguments, sizeof...(Args)); - } - - /** - * @brief Invokes a function given an identifier, if possible. - * - * It must be possible to cast the instance to the parent type of the member - * function. Otherwise, invoking the underlying function results in an - * undefined behavior. - * - * @sa meta_func::invoke - * - * @param id Unique identifier. - * @param instance An opaque instance of the underlying type. - * @param args Parameters to use to invoke the function. - * @param sz Number of parameters to use to invoke the function. - * @return A wrapper containing the returned value, if any. - */ - meta_any invoke(const id_type id, meta_handle instance, meta_any * const args, const size_type sz) const { - const internal::meta_func_node* candidate{}; - size_type extent{sz + 1u}; - bool ambiguous{}; - - for(auto *it = internal::meta_visit<&node_type::func>([id, sz](const auto *curr) { return curr->id == id && curr->arity == sz; }, node); it && it->id == id && it->arity == sz; it = it->next) { - size_type direct{}; - size_type ext{}; - - for(size_type next{}; next < sz && next == (direct + ext); ++next) { - const auto type = args[next].type(); - const auto req = it->arg(next).info(); - type.info() == req ? ++direct : (ext += can_cast_or_convert(type.node, req)); - } - - if((direct + ext) == sz) { - if(ext < extent) { - candidate = it; - extent = ext; - ambiguous = false; - } else if(ext == extent) { - ambiguous = true; - } - } - } - - return (candidate && !ambiguous) ? candidate->invoke(std::move(instance), args) : meta_any{}; - } - - /** - * @copybrief invoke - * - * @sa invoke - * - * @param id Unique identifier. - * @tparam Args Types of arguments to use to invoke the function. - * @param instance An opaque instance of the underlying type. - * @param args Parameters to use to invoke the function. - * @return A wrapper containing the new instance, if any. - */ - template - meta_any invoke(const id_type id, meta_handle instance, Args &&... args) const { - meta_any arguments[sizeof...(Args) + 1u]{std::forward(args)...}; - return invoke(id, std::move(instance), arguments, sizeof...(Args)); - } - - /** - * @brief Sets the value of a given variable. - * - * It must be possible to cast the instance to the parent type of the data - * member. Otherwise, invoking the setter results in an undefined - * behavior.
- * The type of the value must be such that a cast or conversion to the type - * of the variable is possible. Otherwise, invoking the setter does nothing. - * - * @tparam Type Type of value to assign. - * @param id Unique identifier. - * @param instance An opaque instance of the underlying type. - * @param value Parameter to use to set the underlying variable. - * @return True in case of success, false otherwise. - */ - template - bool set(const id_type id, meta_handle instance, Type &&value) const { - const auto candidate = data(id); - return candidate && candidate.set(std::move(instance), std::forward(value)); - } - - /** - * @brief Gets the value of a given variable. - * - * It must be possible to cast the instance to the parent type of the data - * member. Otherwise, invoking the getter results in an undefined behavior. - * - * @param id Unique identifier. - * @param instance An opaque instance of the underlying type. - * @return A wrapper containing the value of the underlying variable. - */ - [[nodiscard]] meta_any get(const id_type id, meta_handle instance) const { - const auto candidate = data(id); - return candidate ? candidate.get(std::move(instance)) : meta_any{}; - } - - /** - * @brief Returns a range to use to visit top-level properties. - * @return An iterable range to use to visit top-level properties. - */ - [[nodiscard]] meta_range prop() const ENTT_NOEXCEPT { - return node->prop; - } - - /** - * @brief Returns the property associated with a given key. - * - * Properties of the base classes will also be visited, if any. - * - * @param key The key to use to search for a property. - * @return The property associated with the given key, if any. - */ - [[nodiscard]] meta_prop prop(meta_any key) const { - return internal::meta_visit<&node_type::prop>([&key](const auto *curr) { return curr->id == key; }, node); - } - - /** - * @brief Returns true if an object is valid, false otherwise. - * @return True if the object is valid, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(node == nullptr); - } - - /** - * @brief Checks if two objects refer to the same type. - * @param other The object with which to compare. - * @return True if the objects refer to the same type, false otherwise. - */ - [[nodiscard]] bool operator==(const meta_type &other) const ENTT_NOEXCEPT { - return (!node && !other.node) || (node && other.node && node->info == other.node->info); - } - - /** - * @brief Resets a type and all its parts. - * - * This function resets a type and all its data members, member functions - * and properties, as well as its constructors, destructors and conversion - * functions if any.
- * Base classes aren't reset but the link between the two types is removed. - * - * The type is also removed from the list of searchable types. - */ - void reset() ENTT_NOEXCEPT { - for(auto** it = internal::meta_context::global(); *it; it = &(*it)->next) { - if(*it == node) { - *it = (*it)->next; - break; - } - } - - unregister_all(&node->prop); - unregister_all(&node->base); - unregister_all(&node->conv); - unregister_all<&internal::meta_ctor_node::prop>(&node->ctor); - unregister_all<&internal::meta_data_node::prop>(&node->data); - unregister_all<&internal::meta_func_node::prop>(&node->func); - - node->id = {}; - node->ctor = node->def_ctor; - node->dtor = nullptr; - } - -private: - node_type *node; -}; - - -/** - * @brief Checks if two objects refer to the same type. - * @param lhs An object, either valid or not. - * @param rhs An object, either valid or not. - * @return False if the objects refer to the same node, true otherwise. - */ -[[nodiscard]] inline bool operator!=(const meta_type &lhs, const meta_type &rhs) ENTT_NOEXCEPT { - return !(lhs == rhs); -} - - -[[nodiscard]] inline meta_type meta_any::type() const ENTT_NOEXCEPT { - return node; -} - - -template -meta_any meta_any::invoke(const id_type id, Args &&... args) const { - return type().invoke(id, *this, std::forward(args)...); -} - - -template -meta_any meta_any::invoke(const id_type id, Args &&... args) { - return type().invoke(id, *this, std::forward(args)...); -} - - -template -bool meta_any::set(const id_type id, Type &&value) { - return type().set(id, *this, std::forward(value)); -} - - -[[nodiscard]] inline meta_any meta_any::get(const id_type id) const { - return type().get(id, *this); -} - - -[[nodiscard]] inline meta_any meta_any::get(const id_type id) { - return type().get(id, *this); -} - - -[[nodiscard]] inline meta_type meta_ctor::parent() const ENTT_NOEXCEPT { - return node->parent; -} - - -[[nodiscard]] inline meta_type meta_ctor::arg(size_type index) const ENTT_NOEXCEPT { - return index < arity() ? node->arg(index) : meta_type{}; -} - - -[[nodiscard]] inline meta_type meta_data::parent() const ENTT_NOEXCEPT { - return node->parent; -} - - -[[nodiscard]] inline meta_type meta_data::type() const ENTT_NOEXCEPT { - return node->type(); -} - - -[[nodiscard]] inline meta_type meta_func::parent() const ENTT_NOEXCEPT { - return node->parent; -} - - -[[nodiscard]] inline meta_type meta_func::ret() const ENTT_NOEXCEPT { - return node->ret(); -} - - -[[nodiscard]] inline meta_type meta_func::arg(size_type index) const ENTT_NOEXCEPT { - return index < arity() ? node->arg(index) : meta_type{}; -} - - -/*! @brief Opaque iterator for sequence containers. */ -class meta_sequence_container::meta_iterator { - /*! @brief A sequence container can access the underlying iterator. */ - friend class meta_sequence_container; - - enum class operation { INCR, DEREF }; - - using vtable_type = void(const operation, const any &, void *); - - template - static void basic_vtable(const operation op, const any &from, void *to) { - switch(op) { - case operation::INCR: - ++any_cast(const_cast(from)); - break; - case operation::DEREF: - static_cast(to)->emplace::reference>(*any_cast(from)); - break; - } - } - -public: - /*! @brief Signed integer type. */ - using difference_type = std::ptrdiff_t; - /*! @brief Type of elements returned by the iterator. */ - using value_type = meta_any; - /*! @brief Pointer type, `void` on purpose. */ - using pointer = void; - /*! @brief Reference type, it is **not** an actual reference. */ - using reference = value_type; - /*! @brief Iterator category. */ - using iterator_category = std::input_iterator_tag; - - /*! @brief Default constructor. */ - meta_iterator() ENTT_NOEXCEPT = default; - - /** - * @brief Constructs a meta iterator from a given iterator. - * @tparam It Type of actual iterator with which to build the meta iterator. - * @param iter The actual iterator with which to build the meta iterator. - */ - template - meta_iterator(It iter) - : vtable{&basic_vtable}, - handle{std::move(iter)} - {} - - /*! @brief Pre-increment operator. @return This iterator. */ - meta_iterator & operator++() ENTT_NOEXCEPT { - return vtable(operation::INCR, handle, nullptr), *this; - } - - /*! @brief Post-increment operator. @return This iterator. */ - meta_iterator operator++(int) ENTT_NOEXCEPT { - meta_iterator orig = *this; - return ++(*this), orig; - } - - /** - * @brief Checks if two iterators refer to the same element. - * @param other The iterator with which to compare. - * @return True if the iterators refer to the same element, false otherwise. - */ - [[nodiscard]] bool operator==(const meta_iterator &other) const ENTT_NOEXCEPT { - return handle == other.handle; - } - - /** - * @brief Checks if two iterators refer to the same element. - * @param other The iterator with which to compare. - * @return False if the iterators refer to the same element, true otherwise. - */ - [[nodiscard]] bool operator!=(const meta_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - /** - * @brief Indirection operator. - * @return The element to which the iterator points. - */ - [[nodiscard]] reference operator*() const { - meta_any other; - vtable(operation::DEREF, handle, &other); - return other; - } - - /** - * @brief Returns false if an iterator is invalid, true otherwise. - * @return False if the iterator is invalid, true otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return static_cast(handle); - } - -private: - vtable_type *vtable{}; - any handle{}; -}; - - -template -struct meta_sequence_container::meta_sequence_container_proxy { - using traits_type = meta_sequence_container_traits; - - [[nodiscard]] static meta_type value_type() ENTT_NOEXCEPT { - return internal::meta_info::resolve(); - } - - [[nodiscard]] static size_type size(const any &container) ENTT_NOEXCEPT { - return traits_type::size(any_cast(container)); - } - - [[nodiscard]] static bool resize(any &container, size_type sz) { - auto * const cont = any_cast(&container); - return cont && traits_type::resize(*cont, sz); - } - - [[nodiscard]] static bool clear(any &container) { - auto * const cont = any_cast(&container); - return cont && traits_type::clear(*cont); - } - - [[nodiscard]] static iterator begin(any &container) { - if(auto * const cont = any_cast(&container); cont) { - return iterator{traits_type::begin(*cont)}; - } - - return iterator{traits_type::cbegin(any_cast(container))}; - } - - [[nodiscard]] static iterator end(any &container) { - if(auto * const cont = any_cast(&container); cont) { - return iterator{traits_type::end(*cont)}; - } - - return iterator{traits_type::cend(any_cast(container))}; - } - - [[nodiscard]] static std::pair insert(any &container, iterator it, meta_any &value) { - if(auto * const cont = any_cast(&container); cont) { - // this abomination is necessary because only on macos value_type and const_reference are different types for std::vector - if(value.allow_cast() || value.allow_cast()) { - const auto *element = value.try_cast>(); - auto ret = traits_type::insert(*cont, any_cast(it.handle), element ? *element : value.cast()); - return { iterator{std::move(ret.first)}, ret.second }; - } - } - - return {}; - } - - [[nodiscard]] static std::pair erase(any &container, iterator it) { - if(auto * const cont = any_cast(&container); cont) { - auto ret = traits_type::erase(*cont, any_cast(it.handle)); - return { iterator{std::move(ret.first)}, ret.second }; - } - - return {}; - } - - [[nodiscard]] static meta_any get(any &container, size_type pos) { - if(auto * const cont = any_cast(&container); cont) { - return meta_any{std::in_place_type, traits_type::get(*cont, pos)}; - } - - return meta_any{std::in_place_type, traits_type::cget(any_cast(container), pos)}; - } -}; - - -/** - * @brief Returns the meta value type of a container. - * @return The meta value type of the container. - */ -[[nodiscard]] inline meta_type meta_sequence_container::value_type() const ENTT_NOEXCEPT { - return value_type_fn(); -} - - -/** - * @brief Returns the size of a container. - * @return The size of the container. - */ -[[nodiscard]] inline meta_sequence_container::size_type meta_sequence_container::size() const ENTT_NOEXCEPT { - return size_fn(storage); -} - - -/** - * @brief Resizes a container to contain a given number of elements. - * @param sz The new size of the container. - * @return True in case of success, false otherwise. - */ -inline bool meta_sequence_container::resize(size_type sz) { - return resize_fn(storage, sz); -} - - -/** - * @brief Clears the content of a container. - * @return True in case of success, false otherwise. - */ -inline bool meta_sequence_container::clear() { - return clear_fn(storage); -} - - -/** - * @brief Returns an iterator to the first element of a container. - * @return An iterator to the first element of the container. - */ -[[nodiscard]] inline meta_sequence_container::iterator meta_sequence_container::begin() { - return begin_fn(storage); -} - - -/** - * @brief Returns an iterator that is past the last element of a container. - * @return An iterator that is past the last element of the container. - */ -[[nodiscard]] inline meta_sequence_container::iterator meta_sequence_container::end() { - return end_fn(storage); -} - - -/** - * @brief Inserts an element at a specified location of a container. - * @param it Iterator before which the element will be inserted. - * @param value Element value to insert. - * @return A pair consisting of an iterator to the inserted element (in case of - * success) and a bool denoting whether the insertion took place. - */ -inline std::pair meta_sequence_container::insert(iterator it, meta_any value) { - return insert_fn(storage, it, value); -} - - -/** - * @brief Removes a given element from a container. - * @param it Iterator to the element to remove. - * @return A pair consisting of an iterator following the last removed element - * (in case of success) and a bool denoting whether the insertion took place. - */ -inline std::pair meta_sequence_container::erase(iterator it) { - return erase_fn(storage, it); -} - - -/** - * @brief Returns a reference to the element at a given location of a container - * (no bounds checking is performed). - * @param pos The position of the element to return. - * @return A reference to the requested element properly wrapped. - */ -[[nodiscard]] inline meta_any meta_sequence_container::operator[](size_type pos) { - return get_fn(storage, pos); -} - - -/** - * @brief Returns false if a proxy is invalid, true otherwise. - * @return False if the proxy is invalid, true otherwise. - */ -[[nodiscard]] inline meta_sequence_container::operator bool() const ENTT_NOEXCEPT { - return static_cast(storage); -} - - -/*! @brief Opaque iterator for associative containers. */ -class meta_associative_container::meta_iterator { - enum operation { INCR, DEREF }; - - using vtable_type = void(const operation, const any &, void *); - - template - static void basic_vtable(const operation op, const any &from, void *to) { - switch(op) { - case operation::INCR: - ++any_cast(const_cast(from)); - break; - case operation::DEREF: - const auto &it = any_cast(from); - if constexpr(KeyOnly) { - static_cast *>(to)->first.emplace(*it); - } else { - static_cast *>(to)->first.emplacefirst))>(it->first); - static_cast *>(to)->second.emplacesecond))>(it->second); - } - break; - } - } - -public: - /*! @brief Signed integer type. */ - using difference_type = std::ptrdiff_t; - /*! @brief Type of elements returned by the iterator. */ - using value_type = std::pair; - /*! @brief Pointer type, `void` on purpose. */ - using pointer = void; - /*! @brief Reference type, it is **not** an actual reference. */ - using reference = value_type; - /*! @brief Iterator category. */ - using iterator_category = std::input_iterator_tag; - - /*! @brief Default constructor. */ - meta_iterator() ENTT_NOEXCEPT = default; - - /** - * @brief Constructs an meta iterator from a given iterator. - * @tparam KeyOnly True if the container is also key-only, false otherwise. - * @tparam It Type of actual iterator with which to build the meta iterator. - * @param iter The actual iterator with which to build the meta iterator. - */ - template - meta_iterator(std::integral_constant, It iter) - : vtable{&basic_vtable}, - handle{std::move(iter)} - {} - - /*! @brief Pre-increment operator. @return This iterator. */ - meta_iterator & operator++() ENTT_NOEXCEPT { - return vtable(operation::INCR, handle, nullptr), *this; - } - - /*! @brief Post-increment operator. @return This iterator. */ - meta_iterator operator++(int) ENTT_NOEXCEPT { - meta_iterator orig = *this; - return ++(*this), orig; - } - - /** - * @brief Checks if two iterators refer to the same element. - * @param other The iterator with which to compare. - * @return True if the iterators refer to the same element, false otherwise. - */ - [[nodiscard]] bool operator==(const meta_iterator &other) const ENTT_NOEXCEPT { - return handle == other.handle; - } - - /** - * @brief Checks if two iterators refer to the same element. - * @param other The iterator with which to compare. - * @return False if the iterators refer to the same element, true otherwise. - */ - [[nodiscard]] bool operator!=(const meta_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - /** - * @brief Indirection operator. - * @return The element to which the iterator points. - */ - [[nodiscard]] reference operator*() const { - reference other; - vtable(operation::DEREF, handle, &other); - return other; - } - - /** - * @brief Returns false if an iterator is invalid, true otherwise. - * @return False if the iterator is invalid, true otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return static_cast(handle); - } - -private: - vtable_type *vtable{}; - any handle{}; -}; - - -template -struct meta_associative_container::meta_associative_container_proxy { - using traits_type = meta_associative_container_traits; - - [[nodiscard]] static meta_type key_type() ENTT_NOEXCEPT { - return internal::meta_info::resolve(); - } - - [[nodiscard]] static meta_type mapped_type() ENTT_NOEXCEPT { - if constexpr(is_key_only_meta_associative_container_v) { - return meta_type{}; - } else { - return internal::meta_info::resolve(); - } - } - - [[nodiscard]] static meta_type value_type() ENTT_NOEXCEPT { - return internal::meta_info::resolve(); - } - - [[nodiscard]] static size_type size(const any &container) ENTT_NOEXCEPT { - return traits_type::size(any_cast(container)); - } - - [[nodiscard]] static bool clear(any &container) { - auto * const cont = any_cast(&container); - return cont && traits_type::clear(*cont); - } - - [[nodiscard]] static iterator begin(any &container) { - if(auto * const cont = any_cast(&container); cont) { - return iterator{is_key_only_meta_associative_container{}, traits_type::begin(*cont)}; - } - - return iterator{is_key_only_meta_associative_container{}, traits_type::cbegin(any_cast(container))}; - } - - [[nodiscard]] static iterator end(any &container) { - if(auto * const cont = any_cast(&container); cont) { - return iterator{is_key_only_meta_associative_container{}, traits_type::end(*cont)}; - } - - return iterator{is_key_only_meta_associative_container{}, traits_type::cend(any_cast(container))}; - } - - [[nodiscard]] static bool insert(any &container, meta_any &key, meta_any &value) { - if(auto * const cont = any_cast(&container); cont && key.allow_cast()) { - if constexpr(is_key_only_meta_associative_container_v) { - return traits_type::insert(*cont, key.cast()); - } else { - return value.allow_cast() - && traits_type::insert(*cont, key.cast(), value.cast()); - } - } - - return false; - } - - [[nodiscard]] static bool erase(any &container, meta_any &key) { - if(auto * const cont = any_cast(&container); cont && key.allow_cast()) { - return traits_type::erase(*cont, key.cast()); - } - - return false; - } - - [[nodiscard]] static iterator find(any &container, meta_any &key) { - if(key.allow_cast()) { - if(auto * const cont = any_cast(&container); cont) { - return iterator{is_key_only_meta_associative_container{}, traits_type::find(*cont, key.cast())}; - } - - return iterator{is_key_only_meta_associative_container{}, traits_type::cfind(any_cast(container), key.cast())}; - } - - return {}; - } -}; - - -/** - * @brief Returns true if a container is also key-only, false otherwise. - * @return True if the associative container is also key-only, false otherwise. - */ -[[nodiscard]] inline bool meta_associative_container::key_only() const ENTT_NOEXCEPT { - return key_only_container; -} - - -/** - * @brief Returns the meta key type of a container. - * @return The meta key type of the a container. - */ -[[nodiscard]] inline meta_type meta_associative_container::key_type() const ENTT_NOEXCEPT { - return key_type_fn(); -} - - -/** - * @brief Returns the meta mapped type of a container. - * @return The meta mapped type of the a container. - */ -[[nodiscard]] inline meta_type meta_associative_container::mapped_type() const ENTT_NOEXCEPT { - return mapped_type_fn(); -} - - -/*! @copydoc meta_sequence_container::value_type */ -[[nodiscard]] inline meta_type meta_associative_container::value_type() const ENTT_NOEXCEPT { - return value_type_fn(); -} - - -/*! @copydoc meta_sequence_container::size */ -[[nodiscard]] inline meta_associative_container::size_type meta_associative_container::size() const ENTT_NOEXCEPT { - return size_fn(storage); -} - - -/*! @copydoc meta_sequence_container::clear */ -inline bool meta_associative_container::clear() { - return clear_fn(storage); -} - - -/*! @copydoc meta_sequence_container::begin */ -[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::begin() { - return begin_fn(storage); -} - - -/*! @copydoc meta_sequence_container::end */ -[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::end() { - return end_fn(storage); -} - - -/** - * @brief Inserts an element (a key/value pair) into a container. - * @param key The key of the element to insert. - * @param value The value of the element to insert. - * @return A bool denoting whether the insertion took place. - */ -inline bool meta_associative_container::insert(meta_any key, meta_any value = {}) { - return insert_fn(storage, key, value); -} - - -/** - * @brief Removes the specified element from a container. - * @param key The key of the element to remove. - * @return A bool denoting whether the removal took place. - */ -inline bool meta_associative_container::erase(meta_any key) { - return erase_fn(storage, key); -} - - -/** - * @brief Returns an iterator to the element with a given key, if any. - * @param key The key of the element to search. - * @return An iterator to the element with the given key, if any. - */ -[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::find(meta_any key) { - return find_fn(storage, key); -} - - -/** - * @brief Returns false if a proxy is invalid, true otherwise. - * @return False if the proxy is invalid, true otherwise. - */ -[[nodiscard]] inline meta_associative_container::operator bool() const ENTT_NOEXCEPT { - return static_cast(storage); -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/node.hpp b/LiteLoader/Header/third-party/entt/meta/node.hpp deleted file mode 100644 index fab1167..0000000 --- a/LiteLoader/Header/third-party/entt/meta/node.hpp +++ /dev/null @@ -1,270 +0,0 @@ -#ifndef ENTT_META_NODE_HPP -#define ENTT_META_NODE_HPP - - -#include -#include -#include -#include "../config/config.h" -#include "../core/attribute.h" -#include "../core/fwd.hpp" -#include "../core/type_info.hpp" -#include "../core/type_traits.hpp" -#include "type_traits.hpp" - - -namespace entt { - - -class meta_any; -class meta_type; -struct meta_handle; - - -/** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. - */ - - -namespace internal { - - -struct meta_type_node; - - -struct meta_prop_node { - meta_prop_node * next; - const meta_any &id; - meta_any &value; -}; - - -struct meta_base_node { - meta_type_node * const parent; - meta_base_node * next; - meta_type_node *(* const type)() ENTT_NOEXCEPT; - const void *(* const cast)(const void *) ENTT_NOEXCEPT; -}; - - -struct meta_conv_node { - meta_type_node * const parent; - meta_conv_node * next; - meta_type_node *(* const type)() ENTT_NOEXCEPT; - meta_any(* const conv)(const void *); -}; - - -struct meta_ctor_node { - using size_type = std::size_t; - meta_type_node * const parent; - meta_ctor_node * next; - meta_prop_node * prop; - const size_type arity; - meta_type(* const arg)(const size_type) ENTT_NOEXCEPT; - meta_any(* const invoke)(meta_any * const); -}; - - -struct meta_data_node { - id_type id; - meta_type_node * const parent; - meta_data_node * next; - meta_prop_node * prop; - const bool is_const; - const bool is_static; - meta_type_node *(* const type)() ENTT_NOEXCEPT; - bool(* const set)(meta_handle, meta_any); - meta_any(* const get)(meta_handle); -}; - - -struct meta_func_node { - using size_type = std::size_t; - id_type id; - meta_type_node * const parent; - meta_func_node * next; - meta_prop_node * prop; - const size_type arity; - const bool is_const; - const bool is_static; - meta_type_node *(* const ret)() ENTT_NOEXCEPT; - meta_type(* const arg)(const size_type) ENTT_NOEXCEPT; - meta_any(* const invoke)(meta_handle, meta_any *); -}; - - -struct meta_template_info { - using size_type = std::size_t; - const bool is_template_specialization; - const size_type arity; - meta_type_node *(* const type)() ENTT_NOEXCEPT; - meta_type_node *(* const arg)(const size_type) ENTT_NOEXCEPT; -}; - - -struct meta_type_node { - using size_type = std::size_t; - const type_info info; - id_type id; - meta_type_node * next; - meta_prop_node * prop; - const size_type size_of; - const bool is_void; - const bool is_integral; - const bool is_floating_point; - const bool is_array; - const bool is_enum; - const bool is_union; - const bool is_class; - const bool is_pointer; - const bool is_function_pointer; - const bool is_member_object_pointer; - const bool is_member_function_pointer; - const bool is_pointer_like; - const bool is_sequence_container; - const bool is_associative_container; - const meta_template_info template_info; - const size_type rank; - size_type(* const extent)(const size_type) ENTT_NOEXCEPT ; - meta_type_node *(* const remove_pointer)() ENTT_NOEXCEPT; - meta_type_node *(* const remove_extent)() ENTT_NOEXCEPT; - meta_ctor_node * const def_ctor; - meta_ctor_node *ctor{nullptr}; - meta_base_node *base{nullptr}; - meta_conv_node *conv{nullptr}; - meta_data_node *data{nullptr}; - meta_func_node *func{nullptr}; - void(* dtor)(void *){nullptr}; -}; - - -template -auto meta_visit(const Op &op, const Node *node) --> std::decay_t*Member)> { - for(auto *curr = node->*Member; curr; curr = curr->next) { - if(op(curr)) { - return curr; - } - } - - if constexpr(std::is_same_v) { - for(auto *curr = node->base; curr; curr = curr->next) { - if(auto *ret = meta_visit(op, curr->type()); ret) { - return ret; - } - } - } - - return nullptr; -} - - -template -meta_type_node * meta_arg_node(type_list, const std::size_t index) ENTT_NOEXCEPT; - - -template -class ENTT_API meta_node { - static_assert(std::is_same_v>>, "Invalid type"); - - template - [[nodiscard]] static auto extent(const meta_type_node::size_type dim, std::index_sequence) ENTT_NOEXCEPT { - meta_type_node::size_type ext{}; - ((ext = (dim == Index ? std::extent_v : ext)), ...); - return ext; - } - - [[nodiscard]] static meta_ctor_node * meta_default_constructor([[maybe_unused]] meta_type_node *type) ENTT_NOEXCEPT { - if constexpr(std::is_default_constructible_v) { - static meta_ctor_node node{ - type, - nullptr, - nullptr, - 0u, - nullptr, - [](meta_any * const) { return meta_any{std::in_place_type}; } - }; - - return &node; - } else { - return nullptr; - } - } - - [[nodiscard]] static meta_template_info meta_template_descriptor() ENTT_NOEXCEPT { - if constexpr(is_complete_v>) { - return { - true, - meta_template_traits::args_type::size, - &meta_node::class_type>::resolve, - [](const std::size_t index) ENTT_NOEXCEPT { - return meta_arg_node(typename meta_template_traits::args_type{}, index); - } - }; - } else { - return { false, 0u, nullptr, nullptr }; - } - } - -public: - [[nodiscard]] static meta_type_node * resolve() ENTT_NOEXCEPT { - static meta_type_node node{ - type_id(), - {}, - nullptr, - nullptr, - size_of_v, - std::is_void_v, - std::is_integral_v, - std::is_floating_point_v, - std::is_array_v, - std::is_enum_v, - std::is_union_v, - std::is_class_v, - std::is_pointer_v, - std::is_pointer_v && std::is_function_v>, - std::is_member_object_pointer_v, - std::is_member_function_pointer_v, - is_meta_pointer_like_v, - is_complete_v>, - is_complete_v>, - meta_template_descriptor(), - std::rank_v, - [](meta_type_node::size_type dim) ENTT_NOEXCEPT { return extent(dim, std::make_index_sequence>{}); }, - &meta_node>>>::resolve, - &meta_node>>>::resolve, - meta_default_constructor(&node), - meta_default_constructor(&node) - }; - - return &node; - } -}; - - -template -struct meta_info: meta_node>> {}; - - -template -meta_type_node * meta_arg_node(type_list, const std::size_t index) ENTT_NOEXCEPT { - meta_type_node *args[sizeof...(Args) + 1u]{nullptr, internal::meta_info::resolve()...}; - return args[index + 1u]; -} - - -} - - -/** - * Internal details not to be documented. - * @endcond - */ - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/policy.hpp b/LiteLoader/Header/third-party/entt/meta/policy.hpp deleted file mode 100644 index 1b7d9c8..0000000 --- a/LiteLoader/Header/third-party/entt/meta/policy.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef ENTT_META_POLICY_HPP -#define ENTT_META_POLICY_HPP - - -namespace entt { - - -/*! @brief Empty class type used to request the _as ref_ policy. */ -struct as_ref_t {}; - - -/*! @brief Empty class type used to request the _as cref_ policy. */ -struct as_cref_t {}; - - -/*! @brief Empty class type used to request the _as-is_ policy. */ -struct as_is_t {}; - - -/*! @brief Empty class type used to request the _as void_ policy. */ -struct as_void_t {}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/range.hpp b/LiteLoader/Header/third-party/entt/meta/range.hpp deleted file mode 100644 index 7b54525..0000000 --- a/LiteLoader/Header/third-party/entt/meta/range.hpp +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef ENTT_META_RANGE_HPP -#define ENTT_META_RANGE_HPP - - -#include -#include - - -namespace entt { - - -/** - * @brief Iterable range to use to iterate all types of meta objects. - * @tparam Type Type of meta objects returned. - * @tparam Node Type of meta nodes iterated. - */ -template -class meta_range { - struct range_iterator { - using difference_type = std::ptrdiff_t; - using value_type = Type; - using pointer = void; - using reference = value_type; - using iterator_category = std::input_iterator_tag; - using node_type = Node; - - range_iterator() ENTT_NOEXCEPT = default; - - range_iterator(node_type *head) ENTT_NOEXCEPT - : it{head} - {} - - range_iterator & operator++() ENTT_NOEXCEPT { - return (it = it->next), *this; - } - - range_iterator operator++(int) ENTT_NOEXCEPT { - range_iterator orig = *this; - return ++(*this), orig; - } - - [[nodiscard]] reference operator*() const ENTT_NOEXCEPT { - return it; - } - - [[nodiscard]] bool operator==(const range_iterator &other) const ENTT_NOEXCEPT { - return other.it == it; - } - - [[nodiscard]] bool operator!=(const range_iterator &other) const ENTT_NOEXCEPT { - return !(*this == other); - } - - private: - node_type *it{}; - }; - -public: - /*! @brief Node type. */ - using node_type = Node; - /*! @brief Input iterator type. */ - using iterator = range_iterator; - - /*! @brief Default constructor. */ - meta_range() ENTT_NOEXCEPT = default; - - /** - * @brief Constructs a meta range from a given node. - * @param head The underlying node with which to construct the range. - */ - meta_range(node_type *head) - : node{head} - {} - - /** - * @brief Returns an iterator to the beginning. - * @return An iterator to the first meta object of the range. - */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return iterator{node}; - } - - /** - * @brief Returns an iterator to the end. - * @return An iterator to the element following the last meta object of the - * range. - */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return iterator{}; - } - -private: - node_type *node{nullptr}; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/resolve.hpp b/LiteLoader/Header/third-party/entt/meta/resolve.hpp deleted file mode 100644 index ca1fbfa..0000000 --- a/LiteLoader/Header/third-party/entt/meta/resolve.hpp +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef ENTT_META_RESOLVE_HPP -#define ENTT_META_RESOLVE_HPP - - -#include -#include "../core/type_info.hpp" -#include "ctx.hpp" -#include "meta.hpp" -#include "node.hpp" -#include "range.hpp" - - -namespace entt { - - -/** - * @brief Returns the meta type associated with a given type. - * @tparam Type Type to use to search for a meta type. - * @return The meta type associated with the given type, if any. - */ -template -[[nodiscard]] meta_type resolve() ENTT_NOEXCEPT { - return internal::meta_info::resolve(); -} - - -/** - * @brief Returns a range to use to visit all meta types. - * @return An iterable range to use to visit all meta types. - */ -[[nodiscard]] inline meta_range resolve() { - return *internal::meta_context::global(); -} - - -/** - * @brief Returns the meta type associated with a given identifier, if any. - * @param id Unique identifier. - * @return The meta type associated with the given identifier, if any. - */ -[[nodiscard]] inline meta_type resolve(const id_type id) ENTT_NOEXCEPT { - for(auto *curr = *internal::meta_context::global(); curr; curr = curr->next) { - if(curr->id == id) { - return curr; - } - } - - return {}; -} - - -/** - * @brief Returns the meta type associated with a given type info object, if - * any. - * @param info The type info object of the requested type. - * @return The meta type associated with the given type info object, if any. - */ -[[nodiscard]] inline meta_type resolve(const type_info info) ENTT_NOEXCEPT { - for(auto *curr = *internal::meta_context::global(); curr; curr = curr->next) { - if(curr->info == info) { - return curr; - } - } - - return {}; -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/meta/utility.hpp b/LiteLoader/Header/third-party/entt/meta/utility.hpp deleted file mode 100644 index e701571..0000000 --- a/LiteLoader/Header/third-party/entt/meta/utility.hpp +++ /dev/null @@ -1,333 +0,0 @@ -#ifndef ENTT_META_UTILITY_HPP -#define ENTT_META_UTILITY_HPP - - -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/type_traits.hpp" -#include "meta.hpp" -#include "node.hpp" -#include "policy.hpp" - - -namespace entt { - - -/*! @brief Primary template isn't defined on purpose. */ -template -struct meta_function_descriptor; - - -/** - * @brief Meta function descriptor. - * @tparam Type Reflected type to which the meta function is associated. - * @tparam Ret Function return type. - * @tparam Class Actual owner of the member function. - * @tparam Args Function arguments. - */ -template -struct meta_function_descriptor { - /*! @brief Meta function return type. */ - using return_type = Ret; - /*! @brief Meta function arguments. */ - using args_type = std::conditional_t, type_list, type_list>; - - /*! @brief True if the meta function is const, false otherwise. */ - static constexpr auto is_const = true; - /*! @brief True if the meta function is static, false otherwise. */ - static constexpr auto is_static = !std::is_same_v; -}; - - -/** - * @brief Meta function descriptor. - * @tparam Type Reflected type to which the meta function is associated. - * @tparam Ret Function return type. - * @tparam Class Actual owner of the member function. - * @tparam Args Function arguments. - */ -template -struct meta_function_descriptor { - /*! @brief Meta function return type. */ - using return_type = Ret; - /*! @brief Meta function arguments. */ - using args_type = std::conditional_t, type_list, type_list>; - - /*! @brief True if the meta function is const, false otherwise. */ - static constexpr auto is_const = false; - /*! @brief True if the meta function is static, false otherwise. */ - static constexpr auto is_static = !std::is_same_v; -}; - - -/** - * @brief Meta function descriptor. - * @tparam Type Reflected type to which the meta function is associated. - * @tparam Ret Function return type. - * @tparam Args Function arguments. - */ -template -struct meta_function_descriptor { - /*! @brief Meta function return type. */ - using return_type = Ret; - /*! @brief Meta function arguments. */ - using args_type = type_list; - - /*! @brief True if the meta function is const, false otherwise. */ - static constexpr auto is_const = false; - /*! @brief True if the meta function is static, false otherwise. */ - static constexpr auto is_static = true; -}; - - -/** - * @brief Meta function helper. - * - * Converts a function type to be associated with a reflected type into its meta - * function descriptor. - * - * @tparam Type Reflected type to which the meta function is associated. - * @tparam Candidate The actual function to associate with the reflected type. - */ -template -class meta_function_helper { - template - static constexpr meta_function_descriptor get_rid_of_noexcept(Ret(Class:: *)(Args...) const); - - template - static constexpr meta_function_descriptor get_rid_of_noexcept(Ret(Class:: *)(Args...)); - - template - static constexpr meta_function_descriptor get_rid_of_noexcept(Ret(*)(Args...)); - -public: - /*! @brief The meta function descriptor of the given function. */ - using type = decltype(get_rid_of_noexcept(std::declval())); -}; - - -/** - * @brief Helper type. - * @tparam Type Reflected type to which the meta function is associated. - * @tparam Candidate The actual function to associate with the reflected type. - */ -template -using meta_function_helper_t = typename meta_function_helper::type; - - -/** - * @brief Returns the meta type of the i-th element of a list of arguments. - * @tparam Args Actual types of arguments. - * @return The meta type of the i-th element of the list of arguments. - */ -template -[[nodiscard]] static meta_type meta_arg(type_list, const std::size_t index) ENTT_NOEXCEPT { - return internal::meta_arg_node(type_list{}, index); -} - - -/** - * @brief Constructs an instance given a list of erased parameters, if possible. - * @tparam Type Actual type of the instance to construct. - * @tparam Args Types of arguments expected. - * @tparam Index Indexes to use to extract erased arguments from their list. - * @param args Parameters to use to construct the instance. - * @return A meta any containing the new instance, if any. - */ -template -[[nodiscard]] meta_any meta_construct(meta_any * const args, std::index_sequence) { - if(((args+Index)->allow_cast() && ...)) { - return Type{(args+Index)->cast()...}; - } - - return {}; -} - - -/** - * @brief Sets the value of a given variable. - * @tparam Type Reflected type to which the variable is associated. - * @tparam Data The actual variable to set. - * @param instance An opaque instance of the underlying type, if required. - * @param value Parameter to use to set the variable. - * @return True in case of success, false otherwise. - */ -template -[[nodiscard]] bool meta_setter([[maybe_unused]] meta_handle instance, [[maybe_unused]] meta_any value) { - if constexpr(!std::is_same_v && !std::is_same_v) { - if constexpr(std::is_function_v>>) { - using data_type = type_list_element_t<1u, typename meta_function_helper_t::args_type>; - - if(auto * const clazz = instance->try_cast(); clazz && value.allow_cast()) { - Data(*clazz, value.cast()); - return true; - } - } else if constexpr(std::is_member_function_pointer_v) { - using data_type = type_list_element_t<0u, typename meta_function_helper_t::args_type>; - - if(auto * const clazz = instance->try_cast(); clazz && value.allow_cast()) { - (clazz->*Data)(value.cast()); - return true; - } - } else if constexpr(std::is_member_object_pointer_v) { - using data_type = std::remove_reference_t().*Data)>; - - if constexpr(!std::is_array_v && !std::is_const_v) { - if(auto * const clazz = instance->try_cast(); clazz && value.allow_cast()) { - clazz->*Data = value.cast(); - return true; - } - } - } else { - using data_type = std::remove_reference_t; - - if constexpr(!std::is_array_v && !std::is_const_v) { - if(value.allow_cast()) { - *Data = value.cast(); - return true; - } - } - } - } - - return false; -} - - -/** - * @brief Wraps a value depending on the given policy. - * @tparam Policy Optional policy (no policy set by default). - * @tparam Type Type of value to wrap. - * @param value Value to wrap. - * @return A meta any containing the returned value. - */ -template -meta_any meta_dispatch(Type &&value) { - if constexpr(std::is_same_v) { - return meta_any{std::in_place_type, std::forward(value)}; - } else if constexpr(std::is_same_v) { - return meta_any{std::in_place_type, std::forward(value)}; - } else if constexpr(std::is_same_v) { - static_assert(std::is_lvalue_reference_v, "Invalid type"); - return meta_any{std::in_place_type &>, std::as_const(value)}; - } else { - static_assert(std::is_same_v, "Policy not supported"); - return meta_any{std::forward(value)}; - } -} - - -/** - * @brief Gets the value of a given variable. - * @tparam Type Reflected type to which the variable is associated. - * @tparam Data The actual variable to get. - * @tparam Policy Optional policy (no policy set by default). - * @param instance An opaque instance of the underlying type, if required. - * @return A meta any containing the value of the underlying variable. - */ -template -[[nodiscard]] meta_any meta_getter([[maybe_unused]] meta_handle instance) { - if constexpr(std::is_function_v>>) { - auto * const clazz = instance->try_cast, const Type, Type>>(); - return clazz ? meta_dispatch(Data(*clazz)) : meta_any{}; - } else if constexpr(std::is_member_function_pointer_v) { - auto * const clazz = instance->try_cast, const Type, Type>>(); - return clazz ? meta_dispatch((clazz->*Data)()) : meta_any{}; - } else if constexpr(std::is_member_object_pointer_v) { - if constexpr(!std::is_array_v().*Data)>>>) { - if(auto * clazz = instance->try_cast(); clazz) { - return meta_dispatch(clazz->*Data); - } else if(auto * fallback = instance->try_cast(); fallback) { - return meta_dispatch(fallback->*Data); - } - } - - return meta_any{}; - } else if constexpr(std::is_pointer_v) { - if constexpr(std::is_array_v>) { - return meta_any{}; - } else { - return meta_dispatch(*Data); - } - } else { - return meta_dispatch(Data); - } -} - - -/** - * @brief Invokes a function given a list of erased parameters, if possible. - * @tparam Type Reflected type to which the function is associated. - * @tparam Candidate The actual function to invoke. - * @tparam Policy Optional policy (no policy set by default). - * @tparam Index Indexes to use to extract erased arguments from their list. - * @param instance An opaque instance of the underlying type, if required. - * @param args Parameters to use to invoke the function. - * @return A meta any containing the returned value, if any. - */ -template -[[nodiscard]] std::enable_if_t, meta_any> meta_invoke([[maybe_unused]] meta_handle instance, meta_any *args, std::index_sequence) { - using descriptor = meta_function_helper_t; - - const auto invoke = [](auto &&maybe_clazz, auto &&... other) { - if constexpr(std::is_member_function_pointer_v) { - if constexpr(std::is_void_v) { - (std::forward(maybe_clazz).*Candidate)(std::forward(other)...); - return meta_any{std::in_place_type}; - } else { - return meta_dispatch((std::forward(maybe_clazz).*Candidate)(std::forward(other)...)); - } - } else { - if constexpr(std::is_void_v) { - Candidate(std::forward(maybe_clazz), std::forward(other)...); - return meta_any{std::in_place_type}; - } else { - return meta_dispatch(Candidate(std::forward(maybe_clazz), std::forward(other)...)); - } - } - }; - - if constexpr(std::is_invocable_v...>) { - if(const auto * const clazz = instance->try_cast(); clazz && ((args+Index)->allow_cast>() && ...)) { - return invoke(*clazz, (args+Index)->cast>()...); - } - } else if constexpr(std::is_invocable_v...>) { - if(auto * const clazz = instance->try_cast(); clazz && ((args+Index)->allow_cast>() && ...)) { - return invoke(*clazz, (args+Index)->cast>()...); - } - } else { - if(((args+Index)->allow_cast>() && ...)) { - return invoke((args+Index)->cast>()...); - } - } - - return meta_any{}; -} - - -/** - * @brief Invokes a function given a list of erased parameters, if possible. - * @tparam Type Reflected type to which the function is associated. - * @tparam Candidate The actual function to invoke. - * @tparam Policy Optional policy (no policy set by default). - * @tparam Index Indexes to use to extract erased arguments from their list. - * @return A meta any containing the returned value, if any. - */ -template -[[nodiscard]] std::enable_if_t, meta_any> meta_invoke(meta_handle, meta_any *, std::index_sequence) { - if constexpr(std::is_void_v) { - Candidate(); - return meta_any{std::in_place_type}; - } else { - return meta_dispatch(Candidate()); - } -} - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/resource/cache.hpp b/LiteLoader/Header/third-party/entt/resource/cache.hpp deleted file mode 100644 index 031373c..0000000 --- a/LiteLoader/Header/third-party/entt/resource/cache.hpp +++ /dev/null @@ -1,237 +0,0 @@ -#ifndef ENTT_RESOURCE_CACHE_HPP -#define ENTT_RESOURCE_CACHE_HPP - - -#include -#include -#include -#include "../config/config.h" -#include "../core/fwd.hpp" -#include "handle.hpp" -#include "loader.hpp" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @brief Simple cache for resources of a given type. - * - * Minimal implementation of a cache for resources of a given type. It doesn't - * offer much functionalities but it's suitable for small or medium sized - * applications and can be freely inherited to add targeted functionalities for - * large sized applications. - * - * @tparam Resource Type of resources managed by a cache. - */ -template -struct resource_cache { - /*! @brief Unsigned integer type. */ - using size_type = std::size_t; - /*! @brief Type of resources managed by a cache. */ - using resource_type = Resource; - - /*! @brief Default constructor. */ - resource_cache() = default; - - /*! @brief Default move constructor. */ - resource_cache(resource_cache &&) = default; - - /*! @brief Default move assignment operator. @return This cache. */ - resource_cache & operator=(resource_cache &&) = default; - - /** - * @brief Number of resources managed by a cache. - * @return Number of resources currently stored. - */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return resources.size(); - } - - /** - * @brief Returns true if a cache contains no resources, false otherwise. - * @return True if the cache contains no resources, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return resources.empty(); - } - - /** - * @brief Clears a cache and discards all its resources. - * - * Handles are not invalidated and the memory used by a resource isn't - * freed as long as at least a handle keeps the resource itself alive. - */ - void clear() ENTT_NOEXCEPT { - resources.clear(); - } - - /** - * @brief Loads the resource that corresponds to a given identifier. - * - * In case an identifier isn't already present in the cache, it loads its - * resource and stores it aside for future uses. Arguments are forwarded - * directly to the loader in order to construct properly the requested - * resource. - * - * @note - * If the identifier is already present in the cache, this function does - * nothing and the arguments are simply discarded. - * - * @warning - * If the resource cannot be loaded correctly, the returned handle will be - * invalid and any use of it will result in undefined behavior. - * - * @tparam Loader Type of loader to use to load the resource if required. - * @tparam Args Types of arguments to use to load the resource if required. - * @param id Unique resource identifier. - * @param args Arguments to use to load the resource if required. - * @return A handle for the given resource. - */ - template - resource_handle load(const id_type id, Args &&... args) { - if(auto it = resources.find(id); it == resources.cend()) { - if(auto handle = temp(std::forward(args)...); handle) { - return (resources[id] = std::move(handle)); - } - } else { - return it->second; - } - - return {}; - } - - /** - * @brief Reloads a resource or loads it for the first time if not present. - * - * Equivalent to the following snippet (pseudocode): - * - * @code{.cpp} - * cache.discard(id); - * cache.load(id, args...); - * @endcode - * - * Arguments are forwarded directly to the loader in order to construct - * properly the requested resource. - * - * @warning - * If the resource cannot be loaded correctly, the returned handle will be - * invalid and any use of it will result in undefined behavior. - * - * @tparam Loader Type of loader to use to load the resource. - * @tparam Args Types of arguments to use to load the resource. - * @param id Unique resource identifier. - * @param args Arguments to use to load the resource. - * @return A handle for the given resource. - */ - template - resource_handle reload(const id_type id, Args &&... args) { - return (discard(id), load(id, std::forward(args)...)); - } - - /** - * @brief Creates a temporary handle for a resource. - * - * Arguments are forwarded directly to the loader in order to construct - * properly the requested resource. The handle isn't stored aside and the - * cache isn't in charge of the lifetime of the resource itself. - * - * @tparam Loader Type of loader to use to load the resource. - * @tparam Args Types of arguments to use to load the resource. - * @param args Arguments to use to load the resource. - * @return A handle for the given resource. - */ - template - [[nodiscard]] resource_handle temp(Args &&... args) const { - return Loader{}.get(std::forward(args)...); - } - - /** - * @brief Creates a handle for a given resource identifier. - * - * A resource handle can be in a either valid or invalid state. In other - * terms, a resource handle is properly initialized with a resource if the - * cache contains the resource itself. Otherwise the returned handle is - * uninitialized and accessing it results in undefined behavior. - * - * @sa resource_handle - * - * @param id Unique resource identifier. - * @return A handle for the given resource. - */ - [[nodiscard]] resource_handle handle(const id_type id) const { - if(auto it = resources.find(id); it != resources.cend()) { - return it->second; - } - - return {}; - } - - /** - * @brief Checks if a cache contains a given identifier. - * @param id Unique resource identifier. - * @return True if the cache contains the resource, false otherwise. - */ - [[nodiscard]] bool contains(const id_type id) const { - return (resources.find(id) != resources.cend()); - } - - /** - * @brief Discards the resource that corresponds to a given identifier. - * - * Handles are not invalidated and the memory used by the resource isn't - * freed as long as at least a handle keeps the resource itself alive. - * - * @param id Unique resource identifier. - */ - void discard(const id_type id) { - if(auto it = resources.find(id); it != resources.end()) { - resources.erase(it); - } - } - - /** - * @brief Iterates all resources. - * - * The function object is invoked for each element. It is provided with - * either the resource identifier, the resource handle or both of them.
- * The signature of the function must be equivalent to one of the following - * forms: - * - * @code{.cpp} - * void(const entt::id_type); - * void(entt::resource_handle); - * void(const entt::id_type, entt::resource_handle); - * @endcode - * - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void each(Func func) const { - auto begin = resources.begin(); - auto end = resources.end(); - - while(begin != end) { - auto curr = begin++; - - if constexpr(std::is_invocable_v) { - func(curr->first); - } else if constexpr(std::is_invocable_v>) { - func(curr->second); - } else { - func(curr->first, curr->second); - } - } - } - -private: - std::unordered_map> resources; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/resource/fwd.hpp b/LiteLoader/Header/third-party/entt/resource/fwd.hpp deleted file mode 100644 index 8a2c9e9..0000000 --- a/LiteLoader/Header/third-party/entt/resource/fwd.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef ENTT_RESOURCE_FWD_HPP -#define ENTT_RESOURCE_FWD_HPP - - -namespace entt { - - -template -struct resource_cache; - - -template -class resource_handle; - - -template -class resource_loader; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/resource/handle.hpp b/LiteLoader/Header/third-party/entt/resource/handle.hpp deleted file mode 100644 index 37c29b3..0000000 --- a/LiteLoader/Header/third-party/entt/resource/handle.hpp +++ /dev/null @@ -1,189 +0,0 @@ -#ifndef ENTT_RESOURCE_HANDLE_HPP -#define ENTT_RESOURCE_HANDLE_HPP - - -#include -#include -#include -#include "../config/config.h" -#include "fwd.hpp" - - -namespace entt { - - -/** - * @brief Shared resource handle. - * - * A shared resource handle is a small class that wraps a resource and keeps it - * alive even if it's deleted from the cache. It can be either copied or - * moved. A handle shares a reference to the same resource with all the other - * handles constructed for the same identifier.
- * As a rule of thumb, resources should never be copied nor moved. Handles are - * the way to go to keep references to them. - * - * @tparam Resource Type of resource managed by a handle. - */ -template -class resource_handle { - /*! @brief Resource handles are friends with each other. */ - template - friend class resource_handle; - -public: - /*! @brief Default constructor. */ - resource_handle() ENTT_NOEXCEPT = default; - - /** - * @brief Creates a handle from a shared pointer, namely a resource. - * @param res A pointer to a properly initialized resource. - */ - resource_handle(std::shared_ptr res) ENTT_NOEXCEPT - : resource{std::move(res)} - {} - - /** - * @brief Copy constructor. - * @param other The instance to copy from. - */ - resource_handle(const resource_handle &other) ENTT_NOEXCEPT = default; - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - resource_handle(resource_handle &&other) ENTT_NOEXCEPT = default; - - /** - * @brief Copy constructs a handle which shares ownership of the resource. - * @tparam Other Type of resource managed by the received handle. - * @param other The handle to copy from. - */ - template && std::is_base_of_v>> - resource_handle(const resource_handle &other) ENTT_NOEXCEPT - : resource{other.resource} - {} - - /** - * @brief Move constructs a handle which takes ownership of the resource. - * @tparam Other Type of resource managed by the received handle. - * @param other The handle to move from. - */ - template && std::is_base_of_v>> - resource_handle(resource_handle &&other) ENTT_NOEXCEPT - : resource{std::move(other.resource)} - {} - - /** - * @brief Copy assignment operator. - * @param other The instance to copy from. - * @return This resource handle. - */ - resource_handle & operator=(const resource_handle &other) ENTT_NOEXCEPT = default; - - /** - * @brief Move assignment operator. - * @param other The instance to move from. - * @return This resource handle. - */ - resource_handle & operator=(resource_handle &&other) ENTT_NOEXCEPT = default; - - /** - * @brief Copy assignment operator from foreign handle. - * @tparam Other Type of resource managed by the received handle. - * @param other The handle to copy from. - * @return This resource handle. - */ - template - std::enable_if_t && std::is_base_of_v, resource_handle &> - operator=(const resource_handle &other) ENTT_NOEXCEPT { - resource = other.resource; - return *this; - } - - /** - * @brief Move assignment operator from foreign handle. - * @tparam Other Type of resource managed by the received handle. - * @param other The handle to move from. - * @return This resource handle. - */ - template - std::enable_if_t && std::is_base_of_v, resource_handle &> - operator=(resource_handle &&other) ENTT_NOEXCEPT { - resource = std::move(other.resource); - return *this; - } - - /** - * @brief Gets a reference to the managed resource. - * - * @warning - * The behavior is undefined if the handle doesn't contain a resource. - * - * @return A reference to the managed resource. - */ - [[nodiscard]] const Resource & get() const ENTT_NOEXCEPT { - ENTT_ASSERT(static_cast(resource), "Invalid resource"); - return *resource; - } - - /*! @copydoc get */ - [[nodiscard]] Resource & get() ENTT_NOEXCEPT { - return const_cast(std::as_const(*this).get()); - } - - /*! @copydoc get */ - [[nodiscard]] operator const Resource & () const ENTT_NOEXCEPT { - return get(); - } - - /*! @copydoc get */ - [[nodiscard]] operator Resource & () ENTT_NOEXCEPT { - return get(); - } - - /*! @copydoc get */ - [[nodiscard]] const Resource & operator *() const ENTT_NOEXCEPT { - return get(); - } - - /*! @copydoc get */ - [[nodiscard]] Resource & operator *() ENTT_NOEXCEPT { - return get(); - } - - /** - * @brief Gets a pointer to the managed resource. - * - * @warning - * The behavior is undefined if the handle doesn't contain a resource. - * - * @return A pointer to the managed resource or `nullptr` if the handle - * contains no resource at all. - */ - [[nodiscard]] const Resource * operator->() const ENTT_NOEXCEPT { - return resource.get(); - } - - /*! @copydoc operator-> */ - [[nodiscard]] Resource * operator->() ENTT_NOEXCEPT { - return const_cast(std::as_const(*this).operator->()); - } - - /** - * @brief Returns true if a handle contains a resource, false otherwise. - * @return True if the handle contains a resource, false otherwise. - */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return static_cast(resource); - } - -private: - std::shared_ptr resource; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/resource/loader.hpp b/LiteLoader/Header/third-party/entt/resource/loader.hpp deleted file mode 100644 index fa39d55..0000000 --- a/LiteLoader/Header/third-party/entt/resource/loader.hpp +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef ENTT_RESOURCE_LOADER_HPP -#define ENTT_RESOURCE_LOADER_HPP - - -#include "fwd.hpp" -#include "handle.hpp" - - -namespace entt { - - -/** - * @brief Base class for resource loaders. - * - * Resource loaders must inherit from this class and stay true to the CRTP - * idiom. Moreover, a resource loader must expose a public, const member - * function named `load` that accepts a variable number of arguments and returns - * a handle to the resource just created.
- * As an example: - * - * @code{.cpp} - * struct my_resource {}; - * - * struct my_loader: entt::resource_loader { - * resource_handle load(int value) const { - * // use the integer value somehow - * return std::make_shared(); - * } - * }; - * @endcode - * - * In general, resource loaders should not have a state or retain data of any - * type. They should let the cache manage their resources instead. - * - * @note - * Base class and CRTP idiom aren't strictly required with the current - * implementation. One could argue that a cache can easily work with loaders of - * any type. However, future changes won't be breaking ones by forcing the use - * of a base class today and that's why the model is already in its place. - * - * @tparam Loader Type of the derived class. - * @tparam Resource Type of resource for which to use the loader. - */ -template -class resource_loader { - /*! @brief Resource loaders are friends of their caches. */ - template - friend struct resource_cache; - - /** - * @brief Loads the resource and returns it. - * @tparam Args Types of arguments for the loader. - * @param args Arguments for the loader. - * @return The resource just loaded or an empty pointer in case of errors. - */ - template - [[nodiscard]] resource_handle get(Args &&... args) const { - return static_cast(this)->load(std::forward(args)...); - } -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/signal/dispatcher.hpp b/LiteLoader/Header/third-party/entt/signal/dispatcher.hpp deleted file mode 100644 index 15d9e47..0000000 --- a/LiteLoader/Header/third-party/entt/signal/dispatcher.hpp +++ /dev/null @@ -1,277 +0,0 @@ -#ifndef ENTT_SIGNAL_DISPATCHER_HPP -#define ENTT_SIGNAL_DISPATCHER_HPP - - -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/fwd.hpp" -#include "../core/type_info.hpp" -#include "sigh.hpp" - - -namespace entt { - - -/** - * @brief Basic dispatcher implementation. - * - * A dispatcher can be used either to trigger an immediate event or to enqueue - * events to be published all together once per tick.
- * Listeners are provided in the form of member functions. For each event of - * type `Event`, listeners are such that they can be invoked with an argument of - * type `Event &`, no matter what the return type is. - * - * The dispatcher creates instances of the `sigh` class internally. Refer to the - * documentation of the latter for more details. - */ -class dispatcher { - struct basic_pool { - virtual ~basic_pool() = default; - virtual void publish() = 0; - virtual void disconnect(void *) = 0; - virtual void clear() ENTT_NOEXCEPT = 0; - }; - - template - struct pool_handler final: basic_pool { - static_assert(std::is_same_v>, "Invalid event type"); - - using signal_type = sigh; - using sink_type = typename signal_type::sink_type; - - void publish() override { - const auto length = events.size(); - - for(std::size_t pos{}; pos < length; ++pos) { - signal.publish(events[pos]); - } - - events.erase(events.cbegin(), events.cbegin()+length); - } - - void disconnect(void *instance) override { - sink().disconnect(instance); - } - - void clear() ENTT_NOEXCEPT override { - events.clear(); - } - - [[nodiscard]] sink_type sink() ENTT_NOEXCEPT { - return entt::sink{signal}; - } - - template - void trigger(Args &&... args) { - Event instance{std::forward(args)...}; - signal.publish(instance); - } - - template - void enqueue(Args &&... args) { - if constexpr(std::is_aggregate_v) { - events.push_back(Event{std::forward(args)...}); - } else { - events.emplace_back(std::forward(args)...); - } - } - - private: - signal_type signal{}; - std::vector events; - }; - - template - [[nodiscard]] pool_handler & assure() { - const auto index = type_seq::value(); - - if(!(index < pools.size())) { - pools.resize(std::size_t(index)+1u); - } - - if(!pools[index]) { - pools[index].reset(new pool_handler{}); - } - - return static_cast &>(*pools[index]); - } - -public: - /*! @brief Default constructor. */ - dispatcher() = default; - - /*! @brief Default move constructor. */ - dispatcher(dispatcher &&) = default; - - /*! @brief Default move assignment operator. @return This dispatcher. */ - dispatcher & operator=(dispatcher &&) = default; - - /** - * @brief Returns a sink object for the given event. - * - * A sink is an opaque object used to connect listeners to events. - * - * The function type for a listener is _compatible_ with: - * @code{.cpp} - * void(Event &); - * @endcode - * - * The order of invocation of the listeners isn't guaranteed. - * - * @sa sink - * - * @tparam Event Type of event of which to get the sink. - * @return A temporary sink object. - */ - template - [[nodiscard]] auto sink() { - return assure().sink(); - } - - /** - * @brief Triggers an immediate event of the given type. - * - * All the listeners registered for the given type are immediately notified. - * The event is discarded after the execution. - * - * @tparam Event Type of event to trigger. - * @tparam Args Types of arguments to use to construct the event. - * @param args Arguments to use to construct the event. - */ - template - void trigger(Args &&... args) { - assure().trigger(std::forward(args)...); - } - - /** - * @brief Triggers an immediate event of the given type. - * - * All the listeners registered for the given type are immediately notified. - * The event is discarded after the execution. - * - * @tparam Event Type of event to trigger. - * @param event An instance of the given type of event. - */ - template - void trigger(Event &&event) { - assure>().trigger(std::forward(event)); - } - - /** - * @brief Enqueues an event of the given type. - * - * An event of the given type is queued. No listener is invoked. Use the - * `update` member function to notify listeners when ready. - * - * @tparam Event Type of event to enqueue. - * @tparam Args Types of arguments to use to construct the event. - * @param args Arguments to use to construct the event. - */ - template - void enqueue(Args &&... args) { - assure().enqueue(std::forward(args)...); - } - - /** - * @brief Enqueues an event of the given type. - * - * An event of the given type is queued. No listener is invoked. Use the - * `update` member function to notify listeners when ready. - * - * @tparam Event Type of event to enqueue. - * @param event An instance of the given type of event. - */ - template - void enqueue(Event &&event) { - assure>().enqueue(std::forward(event)); - } - - /** - * @brief Utility function to disconnect everything related to a given value - * or instance from a dispatcher. - * @tparam Type Type of class or type of payload. - * @param value_or_instance A valid object that fits the purpose. - */ - template - void disconnect(Type &value_or_instance) { - disconnect(&value_or_instance); - } - - /** - * @brief Utility function to disconnect everything related to a given value - * or instance from a dispatcher. - * @tparam Type Type of class or type of payload. - * @param value_or_instance A valid object that fits the purpose. - */ - template - void disconnect(Type *value_or_instance) { - for(auto &&cpool: pools) { - if(cpool) { - cpool->disconnect(value_or_instance); - } - } - } - - /** - * @brief Discards all the events queued so far. - * - * If no types are provided, the dispatcher will clear all the existing - * pools. - * - * @tparam Event Type of events to discard. - */ - template - void clear() { - if constexpr(sizeof...(Event) == 0) { - for(auto &&cpool: pools) { - if(cpool) { - cpool->clear(); - } - } - } else { - (assure().clear(), ...); - } - } - - /** - * @brief Delivers all the pending events of the given type. - * - * This method is blocking and it doesn't return until all the events are - * delivered to the registered listeners. It's responsibility of the users - * to reduce at a minimum the time spent in the bodies of the listeners. - * - * @tparam Event Type of events to send. - */ - template - void update() { - assure().publish(); - } - - /** - * @brief Delivers all the pending events. - * - * This method is blocking and it doesn't return until all the events are - * delivered to the registered listeners. It's responsibility of the users - * to reduce at a minimum the time spent in the bodies of the listeners. - */ - void update() const { - for(auto pos = pools.size(); pos; --pos) { - if(auto &&cpool = pools[pos-1]; cpool) { - cpool->publish(); - } - } - } - -private: - std::vector> pools; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/signal/emitter.hpp b/LiteLoader/Header/third-party/entt/signal/emitter.hpp deleted file mode 100644 index f6769ec..0000000 --- a/LiteLoader/Header/third-party/entt/signal/emitter.hpp +++ /dev/null @@ -1,327 +0,0 @@ -#ifndef ENTT_SIGNAL_EMITTER_HPP -#define ENTT_SIGNAL_EMITTER_HPP - - -#include -#include -#include -#include -#include -#include -#include -#include -#include "../config/config.h" -#include "../core/fwd.hpp" -#include "../core/type_info.hpp" - - -namespace entt { - - -/** - * @brief General purpose event emitter. - * - * The emitter class template follows the CRTP idiom. To create a custom emitter - * type, derived classes must inherit directly from the base class as: - * - * @code{.cpp} - * struct my_emitter: emitter { - * // ... - * } - * @endcode - * - * Pools for the type of events are created internally on the fly. It's not - * required to specify in advance the full list of accepted types.
- * Moreover, whenever an event is published, an emitter provides the listeners - * with a reference to itself along with a reference to the event. Therefore - * listeners have an handy way to work with it without incurring in the need of - * capturing a reference to the emitter. - * - * @tparam Derived Actual type of emitter that extends the class template. - */ -template -class emitter { - struct basic_pool { - virtual ~basic_pool() = default; - virtual bool empty() const ENTT_NOEXCEPT = 0; - virtual void clear() ENTT_NOEXCEPT = 0; - }; - - template - struct pool_handler final: basic_pool { - static_assert(std::is_same_v>, "Invalid event type"); - - using listener_type = std::function; - using element_type = std::pair; - using container_type = std::list; - using connection_type = typename container_type::iterator; - - [[nodiscard]] bool empty() const ENTT_NOEXCEPT override { - auto pred = [](auto &&element) { return element.first; }; - - return std::all_of(once_list.cbegin(), once_list.cend(), pred) && - std::all_of(on_list.cbegin(), on_list.cend(), pred); - } - - void clear() ENTT_NOEXCEPT override { - if(publishing) { - for(auto &&element: once_list) { - element.first = true; - } - - for(auto &&element: on_list) { - element.first = true; - } - } else { - once_list.clear(); - on_list.clear(); - } - } - - connection_type once(listener_type listener) { - return once_list.emplace(once_list.cend(), false, std::move(listener)); - } - - connection_type on(listener_type listener) { - return on_list.emplace(on_list.cend(), false, std::move(listener)); - } - - void erase(connection_type conn) { - conn->first = true; - - if(!publishing) { - auto pred = [](auto &&element) { return element.first; }; - once_list.remove_if(pred); - on_list.remove_if(pred); - } - } - - void publish(Event &event, Derived &ref) { - container_type swap_list; - once_list.swap(swap_list); - - publishing = true; - - for(auto &&element: on_list) { - element.first ? void() : element.second(event, ref); - } - - for(auto &&element: swap_list) { - element.first ? void() : element.second(event, ref); - } - - publishing = false; - - on_list.remove_if([](auto &&element) { return element.first; }); - } - - private: - bool publishing{false}; - container_type once_list{}; - container_type on_list{}; - }; - - template - [[nodiscard]] pool_handler * assure() { - const auto index = type_seq::value(); - - if(!(index < pools.size())) { - pools.resize(std::size_t(index)+1u); - } - - if(!pools[index]) { - pools[index].reset(new pool_handler{}); - } - - return static_cast *>(pools[index].get()); - } - - template - [[nodiscard]] const pool_handler * assure() const { - const auto index = type_seq::value(); - return (!(index < pools.size()) || !pools[index]) ? nullptr : static_cast *>(pools[index].get()); - } - -public: - /** @brief Type of listeners accepted for the given event. */ - template - using listener = typename pool_handler::listener_type; - - /** - * @brief Generic connection type for events. - * - * Type of the connection object returned by the event emitter whenever a - * listener for the given type is registered.
- * It can be used to break connections still in use. - * - * @tparam Event Type of event for which the connection is created. - */ - template - struct connection: private pool_handler::connection_type { - /** @brief Event emitters are friend classes of connections. */ - friend class emitter; - - /*! @brief Default constructor. */ - connection() = default; - - /** - * @brief Creates a connection that wraps its underlying instance. - * @param conn A connection object to wrap. - */ - connection(typename pool_handler::connection_type conn) - : pool_handler::connection_type{std::move(conn)} - {} - }; - - /*! @brief Default constructor. */ - emitter() = default; - - /*! @brief Default destructor. */ - virtual ~emitter() { - static_assert(std::is_base_of_v, Derived>, "Incorrect use of the class template"); - } - - /*! @brief Default move constructor. */ - emitter(emitter &&) = default; - - /*! @brief Default move assignment operator. @return This emitter. */ - emitter & operator=(emitter &&) = default; - - /** - * @brief Emits the given event. - * - * All the listeners registered for the specific event type are invoked with - * the given event. The event type must either have a proper constructor for - * the arguments provided or be an aggregate type. - * - * @tparam Event Type of event to publish. - * @tparam Args Types of arguments to use to construct the event. - * @param args Parameters to use to initialize the event. - */ - template - void publish(Args &&... args) { - Event instance{std::forward(args)...}; - assure()->publish(instance, *static_cast(this)); - } - - /** - * @brief Registers a long-lived listener with the event emitter. - * - * This method can be used to register a listener designed to be invoked - * more than once for the given event type.
- * The connection returned by the method can be freely discarded. It's meant - * to be used later to disconnect the listener if required. - * - * The listener is as a callable object that can be moved and the type of - * which is _compatible_ with `void(Event &, Derived &)`. - * - * @note - * Whenever an event is emitted, the emitter provides the listener with a - * reference to the derived class. Listeners don't have to capture those - * instances for later uses. - * - * @tparam Event Type of event to which to connect the listener. - * @param instance The listener to register. - * @return Connection object that can be used to disconnect the listener. - */ - template - connection on(listener instance) { - return assure()->on(std::move(instance)); - } - - /** - * @brief Registers a short-lived listener with the event emitter. - * - * This method can be used to register a listener designed to be invoked - * only once for the given event type.
- * The connection returned by the method can be freely discarded. It's meant - * to be used later to disconnect the listener if required. - * - * The listener is as a callable object that can be moved and the type of - * which is _compatible_ with `void(Event &, Derived &)`. - * - * @note - * Whenever an event is emitted, the emitter provides the listener with a - * reference to the derived class. Listeners don't have to capture those - * instances for later uses. - * - * @tparam Event Type of event to which to connect the listener. - * @param instance The listener to register. - * @return Connection object that can be used to disconnect the listener. - */ - template - connection once(listener instance) { - return assure()->once(std::move(instance)); - } - - /** - * @brief Disconnects a listener from the event emitter. - * - * Do not use twice the same connection to disconnect a listener, it results - * in undefined behavior. Once used, discard the connection object. - * - * @tparam Event Type of event of the connection. - * @param conn A valid connection. - */ - template - void erase(connection conn) { - assure()->erase(std::move(conn)); - } - - /** - * @brief Disconnects all the listeners for the given event type. - * - * All the connections previously returned for the given event are - * invalidated. Using them results in undefined behavior. - * - * @tparam Event Type of event to reset. - */ - template - void clear() { - assure()->clear(); - } - - /** - * @brief Disconnects all the listeners. - * - * All the connections previously returned are invalidated. Using them - * results in undefined behavior. - */ - void clear() ENTT_NOEXCEPT { - for(auto &&cpool: pools) { - if(cpool) { - cpool->clear(); - } - } - } - - /** - * @brief Checks if there are listeners registered for the specific event. - * @tparam Event Type of event to test. - * @return True if there are no listeners registered, false otherwise. - */ - template - [[nodiscard]] bool empty() const { - const auto *cpool = assure(); - return !cpool || cpool->empty(); - } - - /** - * @brief Checks if there are listeners registered with the event emitter. - * @return True if there are no listeners registered, false otherwise. - */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return std::all_of(pools.cbegin(), pools.cend(), [](auto &&cpool) { - return !cpool || cpool->empty(); - }); - } - -private: - std::vector> pools{}; -}; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/entt/signal/fwd.hpp b/LiteLoader/Header/third-party/entt/signal/fwd.hpp deleted file mode 100644 index 950a1d5..0000000 --- a/LiteLoader/Header/third-party/entt/signal/fwd.hpp +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef ENTT_SIGNAL_FWD_HPP -#define ENTT_SIGNAL_FWD_HPP - - -namespace entt { - - -template -class delegate; - - -class dispatcher; - - -template -class emitter; - - -class connection; - - -struct scoped_connection; - - -template -class sink; - - -template -class sigh; - - -} - - -#endif diff --git a/LiteLoader/Header/third-party/magic_enum/magic_enum.hpp b/LiteLoader/Header/third-party/magic_enum/magic_enum.hpp deleted file mode 100644 index 4464026..0000000 --- a/LiteLoader/Header/third-party/magic_enum/magic_enum.hpp +++ /dev/null @@ -1,985 +0,0 @@ -// __ __ _ ______ _____ -// | \/ | (_) | ____| / ____|_ _ -// | \ / | __ _ __ _ _ ___ | |__ _ __ _ _ _ __ ___ | | _| |_ _| |_ -// | |\/| |/ _` |/ _` | |/ __| | __| | '_ \| | | | '_ ` _ \ | | |_ _|_ _| -// | | | | (_| | (_| | | (__ | |____| | | | |_| | | | | | | | |____|_| |_| -// |_| |_|\__,_|\__, |_|\___| |______|_| |_|\__,_|_| |_| |_| \_____| -// __/ | https://github.com/Neargye/magic_enum -// |___/ version 0.7.3 -// -// Licensed under the MIT License . -// SPDX-License-Identifier: MIT -// Copyright (c) 2019 - 2021 Daniil Goncharov . -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#ifndef NEARGYE_MAGIC_ENUM_HPP -#define NEARGYE_MAGIC_ENUM_HPP - -#define MAGIC_ENUM_VERSION_MAJOR 0 -#define MAGIC_ENUM_VERSION_MINOR 7 -#define MAGIC_ENUM_VERSION_PATCH 3 - -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(MAGIC_ENUM_CONFIG_FILE) -#include MAGIC_ENUM_CONFIG_FILE -#endif - -#if !defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) -#include -#endif -#if !defined(MAGIC_ENUM_USING_ALIAS_STRING) -#include -#endif -#if !defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) -#include -#endif - -#if defined(__clang__) -# pragma clang diagnostic push -#elif defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // May be used uninitialized 'return {};'. -#elif defined(_MSC_VER) -# pragma warning(push) -# pragma warning(disable : 26495) // Variable 'static_string::chars_' is uninitialized. -# pragma warning(disable : 28020) // Arithmetic overflow: Using operator '-' on a 4 byte value and then casting the result to a 8 byte value. -# pragma warning(disable : 26451) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call. -#endif - -// Checks magic_enum compiler compatibility. -#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1910 -# undef MAGIC_ENUM_SUPPORTED -# define MAGIC_ENUM_SUPPORTED 1 -#endif - -// Checks magic_enum compiler aliases compatibility. -#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1920 -# undef MAGIC_ENUM_SUPPORTED_ALIASES -# define MAGIC_ENUM_SUPPORTED_ALIASES 1 -#endif - -// Enum value must be greater or equals than MAGIC_ENUM_RANGE_MIN. By default MAGIC_ENUM_RANGE_MIN = -128. -// If need another min range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN. -#if !defined(MAGIC_ENUM_RANGE_MIN) -# define MAGIC_ENUM_RANGE_MIN -128 -#endif - -// Enum value must be less or equals than MAGIC_ENUM_RANGE_MAX. By default MAGIC_ENUM_RANGE_MAX = 128. -// If need another max range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MAX. -#if !defined(MAGIC_ENUM_RANGE_MAX) -# define MAGIC_ENUM_RANGE_MAX 128 -#endif - -namespace magic_enum { - -// If need another optional type, define the macro MAGIC_ENUM_USING_ALIAS_OPTIONAL. -#if defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) -MAGIC_ENUM_USING_ALIAS_OPTIONAL -#else -using std::optional; -#endif - -// If need another string_view type, define the macro MAGIC_ENUM_USING_ALIAS_STRING_VIEW. -#if defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) -MAGIC_ENUM_USING_ALIAS_STRING_VIEW -#else -using std::string_view; -#endif - -// If need another string type, define the macro MAGIC_ENUM_USING_ALIAS_STRING. -#if defined(MAGIC_ENUM_USING_ALIAS_STRING) -MAGIC_ENUM_USING_ALIAS_STRING -#else -using std::string; -#endif - -namespace customize { - -// Enum value must be in range [MAGIC_ENUM_RANGE_MIN, MAGIC_ENUM_RANGE_MAX]. By default MAGIC_ENUM_RANGE_MIN = -128, MAGIC_ENUM_RANGE_MAX = 128. -// If need another range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN and MAGIC_ENUM_RANGE_MAX. -// If need another range for specific enum type, add specialization enum_range for necessary enum type. -template -struct enum_range { - static_assert(std::is_enum_v, "magic_enum::customize::enum_range requires enum type."); - static constexpr int min = MAGIC_ENUM_RANGE_MIN; - static constexpr int max = MAGIC_ENUM_RANGE_MAX; - static_assert(max > min, "magic_enum::customize::enum_range requires max > min."); -}; - -static_assert(MAGIC_ENUM_RANGE_MAX > MAGIC_ENUM_RANGE_MIN, "MAGIC_ENUM_RANGE_MAX must be greater than MAGIC_ENUM_RANGE_MIN."); -static_assert((MAGIC_ENUM_RANGE_MAX - MAGIC_ENUM_RANGE_MIN) < (std::numeric_limits::max)(), "MAGIC_ENUM_RANGE must be less than UINT16_MAX."); - -// If need custom names for enum, add specialization enum_name for necessary enum type. -template -constexpr string_view enum_name(E) noexcept { - static_assert(std::is_enum_v, "magic_enum::customize::enum_name requires enum type."); - - return {}; -} - -} // namespace magic_enum::customize - -namespace detail { - -template -struct supported -#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED || defined(MAGIC_ENUM_NO_CHECK_SUPPORT) - : std::true_type {}; -#else - : std::false_type {}; -#endif - -template -struct has_is_flags : std::false_type {}; - -template -struct has_is_flags::is_flags)>> : std::bool_constant::is_flags)>>> {}; - -template -struct range_min : std::integral_constant {}; - -template -struct range_min::min)>> : std::integral_constant::min), customize::enum_range::min> {}; - -template -struct range_max : std::integral_constant {}; - -template -struct range_max::max)>> : std::integral_constant::max), customize::enum_range::max> {}; - -struct char_equal_to { - constexpr bool operator()(char lhs, char rhs) const noexcept { - return lhs == rhs; - } -}; - -template -class static_string { - public: - constexpr explicit static_string(string_view str) noexcept : static_string{str, std::make_index_sequence{}} { - assert(str.size() == N); - } - - constexpr const char* data() const noexcept { return chars_; } - - constexpr std::size_t size() const noexcept { return N; } - - constexpr operator string_view() const noexcept { return {data(), size()}; } - - private: - template - constexpr static_string(string_view str, std::index_sequence) noexcept : chars_{str[I]..., '\0'} {} - - char chars_[N + 1]; -}; - -template <> -class static_string<0> { - public: - constexpr explicit static_string(string_view) noexcept {} - - constexpr const char* data() const noexcept { return nullptr; } - - constexpr std::size_t size() const noexcept { return 0; } - - constexpr operator string_view() const noexcept { return {}; } -}; - -constexpr string_view pretty_name(string_view name) noexcept { - for (std::size_t i = name.size(); i > 0; --i) { - if (!((name[i - 1] >= '0' && name[i - 1] <= '9') || - (name[i - 1] >= 'a' && name[i - 1] <= 'z') || - (name[i - 1] >= 'A' && name[i - 1] <= 'Z') || -#if defined(MAGIC_ENUM_ENABLE_NONASCII) - (name[i - 1] & 0x80) || -#endif - (name[i - 1] == '_'))) { - name.remove_prefix(i); - break; - } - } - - if (name.size() > 0 && ((name.front() >= 'a' && name.front() <= 'z') || - (name.front() >= 'A' && name.front() <= 'Z') || -#if defined(MAGIC_ENUM_ENABLE_NONASCII) - (name.front() & 0x80) || -#endif - (name.front() == '_'))) { - return name; - } - - return {}; // Invalid name. -} - -constexpr std::size_t find(string_view str, char c) noexcept { -#if defined(__clang__) && __clang_major__ < 9 && defined(__GLIBCXX__) || defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) -// https://stackoverflow.com/questions/56484834/constexpr-stdstring-viewfind-last-of-doesnt-work-on-clang-8-with-libstdc -// https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html - constexpr bool workaround = true; -#else - constexpr bool workaround = false; -#endif - - if constexpr (workaround) { - for (std::size_t i = 0; i < str.size(); ++i) { - if (str[i] == c) { - return i; - } - } - - return string_view::npos; - } else { - return str.find_first_of(c); - } -} - -template -constexpr std::array, N> to_array(T (&a)[N], std::index_sequence) { - return {{a[I]...}}; -} - -template -constexpr bool cmp_equal(string_view lhs, string_view rhs, BinaryPredicate&& p) noexcept(std::is_nothrow_invocable_r_v) { -#if defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) - // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html - // https://developercommunity.visualstudio.com/content/problem/232218/c-constexpr-string-view.html - constexpr bool workaround = true; -#else - constexpr bool workaround = false; -#endif - constexpr bool custom_predicate = std::negation_v, char_equal_to>>; - - if constexpr (custom_predicate || workaround) { - if (lhs.size() != rhs.size()) { - return false; - } - - const auto size = lhs.size(); - for (std::size_t i = 0; i < size; ++i) { - if (!p(lhs[i], rhs[i])) { - return false; - } - } - - return true; - } else { - static_cast(p); - - return lhs == rhs; - } -} - -template -constexpr bool cmp_less(L lhs, R rhs) noexcept { - static_assert(std::is_integral_v && std::is_integral_v, "magic_enum::detail::cmp_less requires integral type."); - - if constexpr (std::is_signed_v == std::is_signed_v) { - // If same signedness (both signed or both unsigned). - return lhs < rhs; - } else if constexpr (std::is_same_v) { // bool special case - return static_cast(lhs) < rhs; - } else if constexpr (std::is_same_v) { // bool special case - return lhs < static_cast(rhs); - } else if constexpr (std::is_signed_v) { - // If 'right' is negative, then result is 'false', otherwise cast & compare. - return rhs > 0 && lhs < static_cast>(rhs); - } else { - // If 'left' is negative, then result is 'true', otherwise cast & compare. - return lhs < 0 || static_cast>(lhs) < rhs; - } -} - -template -constexpr I log2(I value) noexcept { - static_assert(std::is_integral_v, "magic_enum::detail::log2 requires integral type."); - - auto ret = I{0}; - for (; value > I{1}; value >>= I{1}, ++ret) {} - - return ret; -} - -template -inline constexpr bool is_enum_v = std::is_enum_v && std::is_same_v>; - -template -constexpr auto n() noexcept { - static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); -#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED -# if defined(__clang__) - constexpr string_view name{__PRETTY_FUNCTION__ + 34, sizeof(__PRETTY_FUNCTION__) - 36}; -# elif defined(__GNUC__) - constexpr string_view name{__PRETTY_FUNCTION__ + 49, sizeof(__PRETTY_FUNCTION__) - 51}; -# elif defined(_MSC_VER) - constexpr string_view name{__FUNCSIG__ + 40, sizeof(__FUNCSIG__) - 57}; -# endif - return static_string{name}; -#else - return string_view{}; // Unsupported compiler. -#endif -} - -template -inline constexpr auto type_name_v = n(); - -template -constexpr auto n() noexcept { - static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); - constexpr auto custom_name = customize::enum_name(V); - - if constexpr (custom_name.empty()) { - static_cast(custom_name); -#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED -# if defined(__clang__) || defined(__GNUC__) - constexpr auto name = pretty_name({__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 2}); -# elif defined(_MSC_VER) - constexpr auto name = pretty_name({__FUNCSIG__, sizeof(__FUNCSIG__) - 17}); -# endif - return static_string{name}; -#else - return string_view{}; // Unsupported compiler. -#endif - } else { - return static_string{custom_name}; - } -} - -template -inline constexpr auto enum_name_v = n(); - -template -constexpr bool is_valid() noexcept { - static_assert(is_enum_v, "magic_enum::detail::is_valid requires enum type."); - - return n(V)>().size() != 0; -} - -template > -constexpr E value(std::size_t i) noexcept { - static_assert(is_enum_v, "magic_enum::detail::value requires enum type."); - - if constexpr (std::is_same_v) { // bool special case - static_assert(O == 0, "magic_enum::detail::value requires valid offset."); - - return static_cast(i); - } else if constexpr (IsFlags) { - return static_cast(U{1} << static_cast(static_cast(i) + O)); - } else { - return static_cast(static_cast(i) + O); - } -} - -template > -constexpr int reflected_min() noexcept { - static_assert(is_enum_v, "magic_enum::detail::reflected_min requires enum type."); - - if constexpr (IsFlags) { - return 0; - } else { - constexpr auto lhs = range_min::value; - constexpr auto rhs = (std::numeric_limits::min)(); - - if constexpr (cmp_less(rhs, lhs)) { - return lhs; - } else { - return rhs; - } - } -} - -template > -constexpr int reflected_max() noexcept { - static_assert(is_enum_v, "magic_enum::detail::reflected_max requires enum type."); - - if constexpr (IsFlags) { - return std::numeric_limits::digits - 1; - } else { - constexpr auto lhs = range_max::value; - constexpr auto rhs = (std::numeric_limits::max)(); - - if constexpr (cmp_less(lhs, rhs)) { - return lhs; - } else { - return rhs; - } - } -} - -template -inline constexpr auto reflected_min_v = reflected_min(); - -template -inline constexpr auto reflected_max_v = reflected_max(); - -template -constexpr std::size_t values_count(const bool (&valid)[N]) noexcept { - auto count = std::size_t{0}; - for (std::size_t i = 0; i < N; ++i) { - if (valid[i]) { - ++count; - } - } - - return count; -} - -template -constexpr auto values(std::index_sequence) noexcept { - static_assert(is_enum_v, "magic_enum::detail::values requires enum type."); - constexpr bool valid[sizeof...(I)] = {is_valid(I)>()...}; - constexpr std::size_t count = values_count(valid); - - if constexpr (count > 0) { - E values[count] = {}; - for (std::size_t i = 0, v = 0; v < count; ++i) { - if (valid[i]) { - values[v++] = value(i); - } - } - - return to_array(values, std::make_index_sequence{}); - } else { - return std::array{}; - } -} - -template > -constexpr auto values() noexcept { - static_assert(is_enum_v, "magic_enum::detail::values requires enum type."); - constexpr auto min = reflected_min_v; - constexpr auto max = reflected_max_v; - constexpr auto range_size = max - min + 1; - static_assert(range_size > 0, "magic_enum::enum_range requires valid size."); - static_assert(range_size < (std::numeric_limits::max)(), "magic_enum::enum_range requires valid size."); - - return values>(std::make_index_sequence{}); -} - -template > -constexpr bool is_flags_enum() noexcept { - static_assert(is_enum_v, "magic_enum::detail::is_flags_enum requires enum type."); - - if constexpr (has_is_flags::value) { - return customize::enum_range::is_flags; - } else if constexpr (std::is_same_v) { // bool special case - return false; - } else { -#if defined(MAGIC_ENUM_NO_CHECK_FLAGS) - return false; -#else - constexpr auto flags_values = values(); - constexpr auto default_values = values(); - if (flags_values.size() == 0 || default_values.size() > flags_values.size()) { - return false; - } - for (std::size_t i = 0; i < default_values.size(); ++i) { - const auto v = static_cast(default_values[i]); - if (v != 0 && (v & (v - 1)) != 0) { - return false; - } - } - return flags_values.size() > 0; -#endif - } -} - -template -inline constexpr bool is_flags_v = is_flags_enum(); - -template -inline constexpr auto values_v = values>(); - -template > -using values_t = decltype((values_v)); - -template -inline constexpr auto count_v = values_v.size(); - -template > -inline constexpr auto min_v = (count_v > 0) ? static_cast(values_v.front()) : U{0}; - -template > -inline constexpr auto max_v = (count_v > 0) ? static_cast(values_v.back()) : U{0}; - -template -constexpr auto names(std::index_sequence) noexcept { - static_assert(is_enum_v, "magic_enum::detail::names requires enum type."); - - return std::array{{enum_name_v[I]>...}}; -} - -template -inline constexpr auto names_v = names(std::make_index_sequence>{}); - -template > -using names_t = decltype((names_v)); - -template -constexpr auto entries(std::index_sequence) noexcept { - static_assert(is_enum_v, "magic_enum::detail::entries requires enum type."); - - return std::array, sizeof...(I)>{{{values_v[I], enum_name_v[I]>}...}}; -} - -template -inline constexpr auto entries_v = entries(std::make_index_sequence>{}); - -template > -using entries_t = decltype((entries_v)); - -template > -constexpr bool is_sparse() noexcept { - static_assert(is_enum_v, "magic_enum::detail::is_sparse requires enum type."); - constexpr auto max = is_flags_v ? log2(max_v) : max_v; - constexpr auto min = is_flags_v ? log2(min_v) : min_v; - constexpr auto range_size = max - min + 1; - - return range_size != count_v; -} - -template -inline constexpr bool is_sparse_v = is_sparse(); - -template > -constexpr U values_ors() noexcept { - static_assert(is_enum_v, "magic_enum::detail::values_ors requires enum type."); - - auto ors = U{0}; - for (std::size_t i = 0; i < count_v; ++i) { - ors |= static_cast(values_v[i]); - } - - return ors; -} - -template -struct enable_if_enum {}; - -template -struct enable_if_enum { - using type = R; - using D = std::decay_t; - static_assert(supported::value, "magic_enum unsupported compiler (https://github.com/Neargye/magic_enum#compiler-compatibility)."); -}; - -template -using enable_if_enum_t = std::enable_if_t>, R>; - -template >>> -using enum_concept = T; - -template > -struct is_scoped_enum : std::false_type {}; - -template -struct is_scoped_enum : std::bool_constant>> {}; - -template > -struct is_unscoped_enum : std::false_type {}; - -template -struct is_unscoped_enum : std::bool_constant>> {}; - -template >> -struct underlying_type {}; - -template -struct underlying_type : std::underlying_type> {}; - -} // namespace magic_enum::detail - -// Checks is magic_enum supported compiler. -inline constexpr bool is_magic_enum_supported = detail::supported::value; - -template -using Enum = detail::enum_concept; - -// Checks whether T is an Unscoped enumeration type. -// Provides the member constant value which is equal to true, if T is an [Unscoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Unscoped_enumeration) type. Otherwise, value is equal to false. -template -struct is_unscoped_enum : detail::is_unscoped_enum {}; - -template -inline constexpr bool is_unscoped_enum_v = is_unscoped_enum::value; - -// Checks whether T is an Scoped enumeration type. -// Provides the member constant value which is equal to true, if T is an [Scoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Scoped_enumerations) type. Otherwise, value is equal to false. -template -struct is_scoped_enum : detail::is_scoped_enum {}; - -template -inline constexpr bool is_scoped_enum_v = is_scoped_enum::value; - -// If T is a complete enumeration type, provides a member typedef type that names the underlying type of T. -// Otherwise, if T is not an enumeration type, there is no member type. Otherwise (T is an incomplete enumeration type), the program is ill-formed. -template -struct underlying_type : detail::underlying_type {}; - -template -using underlying_type_t = typename underlying_type::type; - -// Returns type name of enum. -template -[[nodiscard]] constexpr auto enum_type_name() noexcept -> detail::enable_if_enum_t { - constexpr string_view name = detail::type_name_v>; - static_assert(name.size() > 0, "Enum type does not have a name."); - - return name; -} - -// Returns number of enum values. -template -[[nodiscard]] constexpr auto enum_count() noexcept -> detail::enable_if_enum_t { - return detail::count_v>; -} - -// Returns enum value at specified index. -// No bounds checking is performed: the behavior is undefined if index >= number of enum values. -template -[[nodiscard]] constexpr auto enum_value(std::size_t index) noexcept -> detail::enable_if_enum_t> { - using D = std::decay_t; - - if constexpr (detail::is_sparse_v) { - return assert((index < detail::count_v)), detail::values_v[index]; - } else { - constexpr bool is_flag = detail::is_flags_v; - constexpr auto min = is_flag ? detail::log2(detail::min_v) : detail::min_v; - - return assert((index < detail::count_v)), detail::value(index); - } -} - -// Returns enum value at specified index. -template -[[nodiscard]] constexpr auto enum_value() noexcept -> detail::enable_if_enum_t> { - return enum_value>(I); -} - -// Returns std::array with enum values, sorted by enum value. -template -[[nodiscard]] constexpr auto enum_values() noexcept -> detail::enable_if_enum_t> { - return detail::values_v>; -} - -// Returns name from static storage enum variable. -// This version is much lighter on the compile times and is not restricted to the enum_range limitation. -template -[[nodiscard]] constexpr auto enum_name() noexcept -> detail::enable_if_enum_t { - constexpr string_view name = detail::enum_name_v, V>; - static_assert(name.size() > 0, "Enum value does not have a name."); - - return name; -} - -// Returns name from enum value. -// If enum value does not have name or value out of range, returns empty string. -template -[[nodiscard]] constexpr auto enum_name(E value) noexcept -> detail::enable_if_enum_t { - using D = std::decay_t; - using U = underlying_type_t; - - if constexpr (detail::is_sparse_v || detail::is_flags_v) { - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (enum_value(i) == value) { - return detail::names_v[i]; - } - } - } else { - const auto v = static_cast(value); - if (v >= detail::min_v && v <= detail::max_v) { - return detail::names_v[static_cast(v - detail::min_v)]; - } - } - - return {}; // Invalid value or out of range. -} - -// Returns name from enum-flags value. -// If enum-flags value does not have name or value out of range, returns empty string. -template -[[nodiscard]] auto enum_flags_name(E value) -> detail::enable_if_enum_t { - using D = std::decay_t; - using U = underlying_type_t; - - if constexpr (detail::is_flags_v) { - string name; - auto check_value = U{0}; - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (const auto v = static_cast(enum_value(i)); (static_cast(value) & v) != 0) { - check_value |= v; - const auto n = detail::names_v[i]; - if (!name.empty()) { - name.append(1, '|'); - } - name.append(n.data(), n.size()); - } - } - - if (check_value != 0 && check_value == static_cast(value)) { - return name; - } - - return {}; // Invalid value or out of range. - } else { - return string{enum_name(value)}; - } -} - -// Returns std::array with names, sorted by enum value. -template -[[nodiscard]] constexpr auto enum_names() noexcept -> detail::enable_if_enum_t> { - return detail::names_v>; -} - -// Returns std::array with pairs (value, name), sorted by enum value. -template -[[nodiscard]] constexpr auto enum_entries() noexcept -> detail::enable_if_enum_t> { - return detail::entries_v>; -} - -// Obtains enum value from integer value. -// Returns optional with enum value. -template -[[nodiscard]] constexpr auto enum_cast(underlying_type_t value) noexcept -> detail::enable_if_enum_t>> { - using D = std::decay_t; - using U = underlying_type_t; - - if constexpr (detail::is_sparse_v) { - constexpr auto count = detail::count_v; - if constexpr (detail::is_flags_v) { - auto check_value = U{0}; - for (std::size_t i = 0; i < count; ++i) { - if (const auto v = static_cast(enum_value(i)); (value & v) != 0) { - check_value |= v; - } - } - - if (check_value != 0 && check_value == value) { - return static_cast(value); - } - } else { - for (std::size_t i = 0; i < count; ++i) { - if (value == static_cast(enum_value(i))) { - return static_cast(value); - } - } - } - } else { - constexpr auto min = detail::min_v; - constexpr auto max = detail::is_flags_v ? detail::values_ors() : detail::max_v; - - if (value >= min && value <= max) { - return static_cast(value); - } - } - - return {}; // Invalid value or out of range. -} - -// Obtains enum value from name. -// Returns optional with enum value. -template -[[nodiscard]] constexpr auto enum_cast(string_view value, BinaryPredicate p) noexcept(std::is_nothrow_invocable_r_v) -> detail::enable_if_enum_t>> { - static_assert(std::is_invocable_r_v, "magic_enum::enum_cast requires bool(char, char) invocable predicate."); - using D = std::decay_t; - using U = underlying_type_t; - - if constexpr (detail::is_flags_v) { - auto result = U{0}; - while (!value.empty()) { - const auto d = detail::find(value, '|'); - const auto s = (d == string_view::npos) ? value : value.substr(0, d); - auto f = U{0}; - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (detail::cmp_equal(s, detail::names_v[i], p)) { - f = static_cast(enum_value(i)); - result |= f; - break; - } - } - if (f == U{0}) { - return {}; // Invalid value or out of range. - } - value.remove_prefix((d == string_view::npos) ? value.size() : d + 1); - } - - if (result != U{0}) { - return static_cast(result); - } - } else { - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (detail::cmp_equal(value, detail::names_v[i], p)) { - return enum_value(i); - } - } - } - - return {}; // Invalid value or out of range. -} - -// Obtains enum value from name. -// Returns optional with enum value. -template -[[nodiscard]] constexpr auto enum_cast(string_view value) noexcept -> detail::enable_if_enum_t>> { - using D = std::decay_t; - - return enum_cast(value, detail::char_equal_to{}); -} - -// Returns integer value from enum value. -template -[[nodiscard]] constexpr auto enum_integer(E value) noexcept -> detail::enable_if_enum_t> { - return static_cast>(value); -} - -// Obtains index in enum values from enum value. -// Returns optional with index. -template -[[nodiscard]] constexpr auto enum_index(E value) noexcept -> detail::enable_if_enum_t> { - using D = std::decay_t; - using U = underlying_type_t; - - if constexpr (detail::is_sparse_v || detail::is_flags_v) { - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (enum_value(i) == value) { - return i; - } - } - } else { - const auto v = static_cast(value); - if (v >= detail::min_v && v <= detail::max_v) { - return static_cast(v - detail::min_v); - } - } - - return {}; // Invalid value or out of range. -} - -// Checks whether enum contains enumerator with such enum value. -template -[[nodiscard]] constexpr auto enum_contains(E value) noexcept -> detail::enable_if_enum_t { - using D = std::decay_t; - using U = underlying_type_t; - - return enum_cast(static_cast(value)).has_value(); -} - -// Checks whether enum contains enumerator with such integer value. -template -[[nodiscard]] constexpr auto enum_contains(underlying_type_t value) noexcept -> detail::enable_if_enum_t { - return enum_cast>(value).has_value(); -} - -// Checks whether enum contains enumerator with such name. -template -[[nodiscard]] constexpr auto enum_contains(string_view value, BinaryPredicate p) noexcept(std::is_nothrow_invocable_r_v) -> detail::enable_if_enum_t { - static_assert(std::is_invocable_r_v, "magic_enum::enum_contains requires bool(char, char) invocable predicate."); - - return enum_cast>(value, std::move_if_noexcept(p)).has_value(); -} - -// Checks whether enum contains enumerator with such name. -template -[[nodiscard]] constexpr auto enum_contains(string_view value) noexcept -> detail::enable_if_enum_t { - return enum_cast>(value).has_value(); -} - -namespace ostream_operators { - -template = 0> -std::basic_ostream& operator<<(std::basic_ostream& os, E value) { - using D = std::decay_t; - using U = underlying_type_t; -#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED - if (const auto name = magic_enum::enum_flags_name(value); !name.empty()) { - for (const auto c : name) { - os.put(c); - } - return os; - } -#endif - return (os << static_cast(value)); -} - -template = 0> -std::basic_ostream& operator<<(std::basic_ostream& os, optional value) { - return value.has_value() ? (os << value.value()) : os; -} - -} // namespace magic_enum::ostream_operators - -namespace bitwise_operators { - -template = 0> -constexpr E operator~(E rhs) noexcept { - return static_cast(~static_cast>(rhs)); -} - -template = 0> -constexpr E operator|(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) | static_cast>(rhs)); -} - -template = 0> -constexpr E operator&(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) & static_cast>(rhs)); -} - -template = 0> -constexpr E operator^(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) ^ static_cast>(rhs)); -} - -template = 0> -constexpr E& operator|=(E& lhs, E rhs) noexcept { - return lhs = (lhs | rhs); -} - -template = 0> -constexpr E& operator&=(E& lhs, E rhs) noexcept { - return lhs = (lhs & rhs); -} - -template = 0> -constexpr E& operator^=(E& lhs, E rhs) noexcept { - return lhs = (lhs ^ rhs); -} - -} // namespace magic_enum::bitwise_operators - -} // namespace magic_enum - -#if defined(__clang__) -# pragma clang diagnostic pop -#elif defined(__GNUC__) -# pragma GCC diagnostic pop -#elif defined(_MSC_VER) -# pragma warning(pop) -#endif - -#endif // NEARGYE_MAGIC_ENUM_HPP diff --git a/LiteLoader/Kernel/Command/CommandOutputAPI.cpp b/LiteLoader/Kernel/Command/CommandOutputAPI.cpp deleted file mode 100644 index b6ddd47..0000000 --- a/LiteLoader/Kernel/Command/CommandOutputAPI.cpp +++ /dev/null @@ -1,13 +0,0 @@ - #include - - void CommandOutput::addMessage(const std::string& str) { - this->addMessage(str, {}, (CommandOutputMessageType)0); - } - - void CommandOutput::success(const std::string& str) { - this->success(str, {}); - } - - void CommandOutput::error(const std::string& str) { - this->error(str, {}); - } \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/GameModeAPI.cpp b/LiteLoader/Kernel/MC/GameModeAPI.cpp deleted file mode 100644 index 20d6ced..0000000 --- a/LiteLoader/Kernel/MC/GameModeAPI.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include - -ServerPlayer* GameMode::getPlayer() { - return dAccess(this); -} \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/MobAPI.cpp b/LiteLoader/Kernel/MC/MobAPI.cpp deleted file mode 100644 index eea73da..0000000 --- a/LiteLoader/Kernel/MC/MobAPI.cpp +++ /dev/null @@ -1,13 +0,0 @@ -//#include "MobAPI.h" -#include -#include -#include -#include -#include - -bool Mob::refreshInventory() { - sendInventory(true); - std::bitset<4> bits("1111"); - sendArmor(bits); - return true; -} diff --git a/LiteLoader/Kernel/MC/ResourcePackRepositoryAPI.cpp b/LiteLoader/Kernel/MC/ResourcePackRepositoryAPI.cpp deleted file mode 100644 index 0f147d4..0000000 --- a/LiteLoader/Kernel/MC/ResourcePackRepositoryAPI.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include -#include -#include - - void ResourcePackRepository::setCustomResourcePackPath(PackType type, const std::string& path) { - auto CompositePack = dAccess(this, 48); - auto& PackSourceFactory = getPackSourceFactory(); - auto& DirectoryPackSource = PackSourceFactory.createDirectoryPackSource(Core::Path(path), type, PackOrigin::PackOrigin_Dev, 0); - CompositePack->addPackSource((PackSource*)&DirectoryPackSource); - refreshPacks(); - } \ No newline at end of file diff --git a/LiteLoader/Kernel/ParticleAPI.cpp b/LiteLoader/Kernel/ParticleAPI.cpp deleted file mode 100644 index 6f1c8ec..0000000 --- a/LiteLoader/Kernel/ParticleAPI.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// -// Created by OEOTYAN on 2022/08/27. -// -#include "ParticleAPI.h" -#include "MC/Player.hpp" -#include "MC/Dimension.hpp" -#include "MC/Level.hpp" -#include -#include -#include -#include -//void InitParticle() { -// Event::ResourcePackInitEvent::subscribe([](const Event::ResourcePackInitEvent& ev) { -// ev.mRepo->setCustomResourcePackPath(PackType::PackType_Resources, R"(plugins/LiteLoader/ResourcePacks)"); -// return true; -// }); -//} - -ParticleAPI ParticleCUI::api{}; \ No newline at end of file diff --git a/LiteLoader/Kernel/PermissionAPI.cpp b/LiteLoader/Kernel/PermissionAPI.cpp deleted file mode 100644 index fc94e14..0000000 --- a/LiteLoader/Kernel/PermissionAPI.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include - -DynPermissionAPI Permission::api{}; \ No newline at end of file diff --git a/LiteLoader/Kernel/SimulatedPlayerAPI.cpp b/LiteLoader/Kernel/SimulatedPlayerAPI.cpp deleted file mode 100644 index 09e48bf..0000000 --- a/LiteLoader/Kernel/SimulatedPlayerAPI.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include - -// // static_assert(sizeof(ScriptNavigationResult) == 32); - -// // For compatibility -// bool SimulatedPlayer::simulateDestory() { -// return SimulatedPlayer::simulateDestroy(); -// } - -// bool SimulatedPlayer::simulateDestroy() { -// FaceID face = FaceID::Unknown; -// auto blockIns = getBlockFromViewVector(face); -// if (blockIns.isNull()) -// return false; -// return simulateDestroyBlock(blockIns.getPosition(), (ScriptModuleMinecraft::ScriptFacing)face); -// } - -// bool SimulatedPlayer::simulateUseItem() { -// auto slot = getSelectedItemSlot(); -// return simulateUseItemInSlot(slot); -// } - -// bool SimulatedPlayer::simulateSneak() { -// setSneaking(true); -// return isSneaking(); -// } - -// bool SimulatedPlayer::simulateStopSneaking() { -// setSneaking(false); -// return !isSneaking(); -// } - -// template <> -// class OwnerPtrT { -// char filler[24]; - -// public: -// MCAPI ~OwnerPtrT(); - -// inline OwnerPtrT(OwnerPtrT&& right) noexcept { -// void (OwnerPtrT::*rv)(OwnerPtrT && right); -// *((void**)&rv) = dlsym("??0OwnerStorageEntity@@IEAA@$$QEAV0@@Z"); -// (this->*rv)(std::move(right)); -// } -// inline OwnerPtrT& operator=(OwnerPtrT&& right) noexcept { -// void (OwnerPtrT::*rv)(OwnerPtrT && right); -// *((void**)&rv) = dlsym("??4OwnerStorageEntity@@IEAAAEAV0@$$QEAV0@@Z"); -// (this->*rv)(std::move(right)); -// } - -// inline SimulatedPlayer* tryGetSimulatedPlayer(bool b = false) { -// auto& context = dAccess(this).getStackRef(); -// return SimulatedPlayer::tryGetFromEntity(context, b); -// } - -// inline bool hasValue() const { -// if (!this) -// return false; -// return dAccess(this); -// } -// // inline bool isValid() -// }; - -// class SimulatedPlayer* SimulatedPlayer::create(std::string const& name, class BlockPos const& position, class AutomaticID dimensionId) { -// // auto handler = Global->getServerNetworkHandler(); -// // return create(name, position, dimensionId, Global->getServerNetworkHandler()); -// OwnerPtrT ownerPtr = Global->createSimulatedPlayer(name, dimensionId, ""); -// auto player = ownerPtr.tryGetSimulatedPlayer(); - -// if (player /* && player->isSimulatedPlayer() */) { -// player->postLoad(/* isNewPlayer */ true); -// Level& level = player->getLevel(); -// level.addUser(std::move(ownerPtr)); -// auto pos = position.bottomCenter(); -// pos.y = pos.y + 1.62001f; -// player->setPos(pos); -// player->setRespawnReady(pos); -// player->setSpawnBlockRespawnPosition(position, dimensionId); -// player->setLocalPlayerAsInitialized(); -// player->doInitialSpawn(); -// } -// return player; -// } - - -// class SimulatedPlayer* SimulatedPlayer::create(std::string const& name, class AutomaticID dimensionId) { -// OwnerPtrT ownerPtr = Global->createSimulatedPlayer(name, dimensionId, ""); -// auto player = ownerPtr.tryGetSimulatedPlayer(); - -// if (player /* && player->isSimulatedPlayer() */) { -// player->postLoad(/* isNewPlayer */ true); -// Level& level = player->getLevel(); -// level.addUser(std::move(ownerPtr)); -// // auto pos = bpos.bottomCenter(); -// // pos.y = pos.y + 1.62001; -// // player->setPos(pos); -// // player->setRespawnReady(pos); -// // player->setSpawnBlockRespawnPosition(bpos, dimId); -// player->setLocalPlayerAsInitialized(); -// player->doInitialSpawn(); -// } -// return player; -// } diff --git a/LiteLoader/Kernel/Utils/STLHelper.cpp b/LiteLoader/Kernel/Utils/STLHelper.cpp deleted file mode 100644 index b9f5273..0000000 --- a/LiteLoader/Kernel/Utils/STLHelper.cpp +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/LiteLoader/Resource/LiteLoader.aps b/LiteLoader/Resource/LiteLoader.aps deleted file mode 100644 index 27191bd..0000000 Binary files a/LiteLoader/Resource/LiteLoader.aps and /dev/null differ diff --git a/LiteLoader/Resource/LiteLoader.rc b/LiteLoader/Resource/LiteLoader.rc deleted file mode 100644 index c0be274..0000000 --- a/LiteLoader/Resource/LiteLoader.rc +++ /dev/null @@ -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 - diff --git a/LiteLoader/Resource/resource.h b/LiteLoader/Resource/resource.h deleted file mode 100644 index 550e0f6..0000000 --- a/LiteLoader/Resource/resource.h +++ /dev/null @@ -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 - diff --git a/LiteLoader/cpp.hint b/LiteLoader/cpp.hint deleted file mode 100644 index 30e696e..0000000 --- a/LiteLoader/cpp.hint +++ /dev/null @@ -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 ""); } } diff --git a/LiteLoader/Main/AddonsHelper.h b/LiteLoader/include/liteloader/AddonsHelper.h similarity index 92% rename from LiteLoader/Main/AddonsHelper.h rename to LiteLoader/include/liteloader/AddonsHelper.h index 34796b2..8675c2d 100644 --- a/LiteLoader/Main/AddonsHelper.h +++ b/LiteLoader/include/liteloader/AddonsHelper.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include "llapi/LLAPI.h" void InitAddonsHelper(); @@ -13,7 +13,7 @@ struct Addon { std::string name; std::string description; Type type; - LL::Version version; + ll::Version version; std::string uuid; std::string directory; bool enable = false; diff --git a/LiteLoader/Main/Config.h b/LiteLoader/include/liteloader/Config.h similarity index 97% rename from LiteLoader/Main/Config.h rename to LiteLoader/include/liteloader/Config.h index 3940d18..1344ea3 100644 --- a/LiteLoader/Main/Config.h +++ b/LiteLoader/include/liteloader/Config.h @@ -4,7 +4,7 @@ #include #include -#include +#include "llapi/LLAPI.h" /////////////////////// CrashLogger /////////////////////// // When comes with these plugins, disable builtin CrashLogger since they will cause crash @@ -15,7 +15,7 @@ constexpr const char* NoCrashLogger[] = {"AntiCheats"}; /////////////////////// LL Configs /////////////////////// #define LITELOADER_CONFIG_FILE "plugins/LiteLoader/LiteLoader.json" -namespace LL { +namespace ll { struct CommandLineOption { bool noColorOption = false; }; @@ -77,7 +77,7 @@ void inline from_json(const nlohmann::json& j, LLConfig& conf); bool LoadLLConfig(); bool SaveLLConfig(); -} // namespace LL +} // namespace ll /////////////////////// Addon Helper /////////////////////// diff --git a/LiteLoader/Main/CrashLogger.h b/LiteLoader/include/liteloader/CrashLogger.h similarity index 73% rename from LiteLoader/Main/CrashLogger.h rename to LiteLoader/include/liteloader/CrashLogger.h index baad10b..f49fb8b 100644 --- a/LiteLoader/Main/CrashLogger.h +++ b/LiteLoader/include/liteloader/CrashLogger.h @@ -1,6 +1,6 @@ #pragma once -namespace LL { +namespace ll { bool StartCrashLoggerProcess(); void InitCrashLogger(bool enableCrashLogger); -} // namespace LL +} // namespace ll diff --git a/LiteLoader/Main/LiteLoader.h b/LiteLoader/include/liteloader/LiteLoader.h similarity index 74% rename from LiteLoader/Main/LiteLoader.h rename to LiteLoader/include/liteloader/LiteLoader.h index fad991d..f40534a 100644 --- a/LiteLoader/Main/LiteLoader.h +++ b/LiteLoader/include/liteloader/LiteLoader.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "llapi/LoggerAPI.h" extern Logger logger; extern time_t startTime; extern time_t endTime; diff --git a/LiteLoader/Main/Loader.h b/LiteLoader/include/liteloader/Loader.h similarity index 60% rename from LiteLoader/Main/Loader.h rename to LiteLoader/include/liteloader/Loader.h index 5541df0..0401e8e 100644 --- a/LiteLoader/Main/Loader.h +++ b/LiteLoader/include/liteloader/Loader.h @@ -1,6 +1,6 @@ #pragma once #include -namespace LL { +namespace ll { void LoadMain(); -} // namespace LL +} // namespace ll diff --git a/LiteLoader/Main/PluginManager.h b/LiteLoader/include/liteloader/PluginManager.h similarity index 74% rename from LiteLoader/Main/PluginManager.h rename to LiteLoader/include/liteloader/PluginManager.h index bd95728..007aa2c 100644 --- a/LiteLoader/Main/PluginManager.h +++ b/LiteLoader/include/liteloader/PluginManager.h @@ -1,10 +1,9 @@ #pragma once -#include -#include +#include "llapi/Global.h" #include #include -namespace LL { +namespace ll { struct Plugin; struct Version; @@ -14,12 +13,12 @@ class PluginManager { public: static LIAPI bool registerPlugin(HMODULE handle, std::string name, std::string desc, - LL::Version version, std::map others); + ll::Version version, std::map others); - static LIAPI LL::Plugin* getPlugin(HMODULE handle); - static LIAPI LL::Plugin* getPlugin(std::string name, bool includeScriptPlugin = true); + static LIAPI ll::Plugin* getPlugin(HMODULE handle); + static LIAPI ll::Plugin* getPlugin(std::string name, bool includeScriptPlugin = true); static LIAPI bool hasPlugin(std::string name, bool includeScriptPlugin = true); - static LIAPI std::unordered_map getAllPlugins(bool includeScriptPlugin = true); + static LIAPI std::unordered_map getAllPlugins(bool includeScriptPlugin = true); static bool loadPlugin(std::string pluginFilePath, bool outputStatus = false, bool isHotLoad = false); static bool unloadPlugin(std::string pluginName, bool outputStatus = false); @@ -28,7 +27,7 @@ public: static LIAPI bool unRegisterPlugin(std::string name); }; -} // namespace LL +} // namespace ll -LIAPI bool RegisterPlugin(HMODULE handle, std::string name, std::string desc, LL::Version version, +LIAPI bool RegisterPlugin(HMODULE handle, std::string name, std::string desc, ll::Version version, std::map others); diff --git a/LiteLoader/Main/Version.h b/LiteLoader/include/liteloader/Version.h similarity index 96% rename from LiteLoader/Main/Version.h rename to LiteLoader/include/liteloader/Version.h index 9b0ec4c..7a8c335 100644 --- a/LiteLoader/Main/Version.h +++ b/LiteLoader/include/liteloader/Version.h @@ -12,7 +12,7 @@ #define TARGET_BDS_PROTOCOL_VERSION 408 -#define LITELOADER_VERSION LL::getLoaderVersion() +#define LITELOADER_VERSION ll::getLoaderVersion() #define __TO_VERSION_STRING(ver) #ver diff --git a/LiteLoader/Header/AllowListAPI.h b/LiteLoader/include/llapi/AllowListAPI.h similarity index 97% rename from LiteLoader/Header/AllowListAPI.h rename to LiteLoader/include/llapi/AllowListAPI.h index 84f4a43..546f545 100644 --- a/LiteLoader/Header/AllowListAPI.h +++ b/LiteLoader/include/llapi/AllowListAPI.h @@ -1,6 +1,6 @@ #pragma once #include "Global.h" -#include "third-party/Nlohmann/json.hpp" +#include "Nlohmann/json.hpp" ////////////////////////////////////////////////////// // For managing AllowList diff --git a/LiteLoader/Header/DynamicCommandAPI.h b/LiteLoader/include/llapi/DynamicCommandAPI.h similarity index 98% rename from LiteLoader/Header/DynamicCommandAPI.h rename to LiteLoader/include/llapi/DynamicCommandAPI.h index d19b617..a9a9a15 100644 --- a/LiteLoader/Header/DynamicCommandAPI.h +++ b/LiteLoader/include/llapi/DynamicCommandAPI.h @@ -3,15 +3,15 @@ class Actor; #define USE_PARSE_ENUM_STRING //#define ENABLE_PARAMETER_TYPE_POSTFIX - #include "MC/Command.hpp" - #include "MC/CommandOrigin.hpp" - #include "MC/CommandOutput.hpp" - #include "MC/CommandParameterData.hpp" - #include "MC/CommandRegistry.hpp" - #include "MC/CommandSelector.hpp" - #include "MC/CommandPosition.hpp" - #include "Utils/WinHelper.h" - #include + #include "llapi/mc/Command.hpp" + #include "llapi/mc/CommandOrigin.hpp" + #include "llapi/mc/CommandOutput.hpp" + #include "llapi/mc/CommandParameterData.hpp" + #include "llapi/mc/CommandRegistry.hpp" + #include "llapi/mc/CommandSelector.hpp" + #include "llapi/mc/CommandPosition.hpp" + #include "llapi/utils/WinHelper.h" + #include "magic_enum/magic_enum.hpp" /////////////////////////////////////////////////////// // Dynamic Command Registry diff --git a/LiteLoader/Header/EventAPI.h b/LiteLoader/include/llapi/EventAPI.h similarity index 98% rename from LiteLoader/Header/EventAPI.h rename to LiteLoader/include/llapi/EventAPI.h index 37de7ac..cfe92c9 100644 --- a/LiteLoader/Header/EventAPI.h +++ b/LiteLoader/include/llapi/EventAPI.h @@ -26,18 +26,17 @@ // //////////////////////////////////////////////////////////////////////// - -#include "Global.h" -#include "LoggerAPI.h" -#include "MC/BlockInstance.hpp" -#include "MC/MCRESULT.hpp" #include #include #include #include #include -#include -#include +#include "Global.h" +#include "LoggerAPI.h" +#include "llapi/mc/BlockInstance.hpp" +#include "llapi/mc/MCRESULT.hpp" +#include "LLAPI.h" +#include "utils/WinHelper.h" class Actor; class ServerPlayer; @@ -96,12 +95,12 @@ template class EventTemplate { public: static EventListener subscribe(std::function callback) { - auto plugin = LL::getPlugin(GetCurrentModule()); + auto plugin = ll::getPlugin(GetCurrentModule()); return EventListener(EventManager::addEventListener(plugin ? plugin->name : "", callback)); } static EventListener subscribe_ref(std::function callback) { - auto plugin = LL::getPlugin(GetCurrentModule()); + auto plugin = ll::getPlugin(GetCurrentModule()); return EventListener(EventManager::addEventListenerRef(plugin ? plugin->name : "", callback)); } diff --git a/LiteLoader/Header/FormUI.h b/LiteLoader/include/llapi/FormUI.h similarity index 100% rename from LiteLoader/Header/FormUI.h rename to LiteLoader/include/llapi/FormUI.h diff --git a/LiteLoader/Header/Global.h b/LiteLoader/include/llapi/Global.h similarity index 83% rename from LiteLoader/Header/Global.h rename to LiteLoader/include/llapi/Global.h index 3c6ebfe..bd32f82 100644 --- a/LiteLoader/Header/Global.h +++ b/LiteLoader/include/llapi/Global.h @@ -56,20 +56,20 @@ // windows types #include -#include "third-party/entt/entt.hpp" -#include "third-party/gsl/gsl" -#include "third-party/seh_exception/seh_exception.hpp" -#include "third-party/FMT/chrono.h" -#include "third-party/FMT/color.h" -#include "third-party/FMT/core.h" -#include "third-party/FMT/os.h" -#include "third-party/FMT/printf.h" +#include "entt/entt.hpp" +#include "gsl/gsl" +#include +#include "FMT/chrono.h" +#include "FMT/color.h" +#include "FMT/core.h" +#include "FMT/os.h" +#include "FMT/printf.h" #include "GlobalServiceAPI.h" -#include "Utils/Optional.h" +#include "llapi/utils/Optional.h" // basic mc types -#include "MC/Types.hpp" +#include "llapi/mc/Types.hpp" // clang-format off #define M_E 2.71828182845904523536 // e #define M_LOG2E 1.44269504088896340736 // log2(e) diff --git a/LiteLoader/Header/GlobalServiceAPI.h b/LiteLoader/include/llapi/GlobalServiceAPI.h similarity index 100% rename from LiteLoader/Header/GlobalServiceAPI.h rename to LiteLoader/include/llapi/GlobalServiceAPI.h diff --git a/LiteLoader/Header/HookAPI.h b/LiteLoader/include/llapi/HookAPI.h similarity index 99% rename from LiteLoader/Header/HookAPI.h rename to LiteLoader/include/llapi/HookAPI.h index 63fd816..49d05f1 100644 --- a/LiteLoader/Header/HookAPI.h +++ b/LiteLoader/include/llapi/HookAPI.h @@ -1,10 +1,10 @@ #pragma once #include "Global.h" -#include "Utils/Hash.h" +#include "utils/Hash.h" +#include #include #include #include -#include "third-party/ModUtils/ModUtils.h" // The core api of the hook function //__declspec(dllimport) int HookFunction(void* oldfunc, void** poutold, void* newfunc); diff --git a/LiteLoader/Header/I18nAPI.h b/LiteLoader/include/llapi/I18nAPI.h similarity index 97% rename from LiteLoader/Header/I18nAPI.h rename to LiteLoader/include/llapi/I18nAPI.h index 8619c67..ce5c99e 100644 --- a/LiteLoader/Header/I18nAPI.h +++ b/LiteLoader/include/llapi/I18nAPI.h @@ -35,13 +35,13 @@ #include "Global.h" #include "LLAPI.h" -#include "Utils/FileHelper.h" -#include "Utils/PluginOwnData.h" -#include "third-party/Nlohmann/json.hpp" -#include "third-party/FMT/core.h" -#include "third-party/FMT/os.h" +#include "llapi/utils/FileHelper.h" +#include "llapi/utils/PluginOwnData.h" +#include "Nlohmann/json.hpp" +#include "FMT/core.h" +#include "FMT/os.h" #include -#include "Utils/StringHelper.h" +#include "llapi/utils/StringHelper.h" /** * @brief I18nBase API class. @@ -189,7 +189,7 @@ public: }; #ifdef UNICODE -#include "third-party/compact_enc_det/compact_enc_det.h" +#include #define UNICODE #else #include "third-party/compact_enc_det/compact_enc_det.h" @@ -338,8 +338,8 @@ inline I18nBase* load(Args&&... args) { * @return I18nBase* The pointer to the I18nBase object in PluginOwnData, null if failed */ inline I18nBase* loadFrom(const std::string& plugin) { - if (LL::hasPlugin(plugin)) { - auto p = LL::getPlugin(plugin); + if (ll::hasPlugin(plugin)) { + auto p = ll::getPlugin(plugin); if (p) { return loadFromImpl(GetCurrentModule(), p->handle); } diff --git a/LiteLoader/Header/KVDBAPI.h b/LiteLoader/include/llapi/KVDBAPI.h similarity index 86% rename from LiteLoader/Header/KVDBAPI.h rename to LiteLoader/include/llapi/KVDBAPI.h index c8ba608..acdee4f 100644 --- a/LiteLoader/Header/KVDBAPI.h +++ b/LiteLoader/include/llapi/KVDBAPI.h @@ -1,10 +1,10 @@ #pragma once -#include "third-party/leveldb/c.h" -#include "third-party/leveldb/cache.h" -#include "third-party/leveldb/db.h" -#include "third-party/leveldb/filter_policy.h" -#include "third-party/leveldb/iterator.h" -#include +#include "leveldb/c.h" +#include "leveldb/cache.h" +#include "leveldb/db.h" +#include "leveldb/filter_policy.h" +#include "leveldb/iterator.h" +#include "Global.h" #include #include #include diff --git a/LiteLoader/Header/LLAPI.h b/LiteLoader/include/llapi/LLAPI.h similarity index 81% rename from LiteLoader/Header/LLAPI.h rename to LiteLoader/include/llapi/LLAPI.h index a192e1c..7bda1c7 100644 --- a/LiteLoader/Header/LLAPI.h +++ b/LiteLoader/include/llapi/LLAPI.h @@ -11,14 +11,14 @@ #define NOMINMAX #endif -#include +#include #include "Global.h" -#include "Utils/WinHelper.h" -#include "Utils/PluginOwnData.h" +#include "llapi/utils/WinHelper.h" +#include "llapi/utils/PluginOwnData.h" // LL types -namespace LL { +namespace ll { struct Version { enum Status { @@ -67,23 +67,23 @@ struct Plugin { } }; -} // namespace LL -inline bool operator<=(LL::Version a, LL::Version b) { +} // namespace ll +inline bool operator<=(ll::Version a, ll::Version b) { return a < b || a == b; } -inline bool operator>(LL::Version a, LL::Version b) { +inline bool operator>(ll::Version a, ll::Version b) { return b < a; } -inline bool operator>=(LL::Version a, LL::Version b) { +inline bool operator>=(ll::Version a, ll::Version b) { return b < a || b == a; } // helper -LIAPI bool RegisterPlugin(HMODULE hPlugin, std::string name, std::string desc, LL::Version version, +LIAPI bool RegisterPlugin(HMODULE hPlugin, std::string name, std::string desc, ll::Version version, std::map others); // Loader APIs -namespace LL { +namespace ll { /** * @brief Get the loader version as a string @@ -94,7 +94,7 @@ LIAPI std::string getLoaderVersionString(); /** * @brief Get the loader version as a Version object * - * @return LL::Version The loader version + * @return ll::Version The loader version */ LIAPI Version getLoaderVersion(); /** @@ -117,14 +117,14 @@ LIAPI std::string getDataPath(const std::string& pluginName); * * @param name The name of the plugin * @param desc The description(introduction) of the plugin - * @param version The version of the plugin(LL::Version) + * @param version The version of the plugin(ll::Version) * @param git The git information of the plugin * @param license The license of the plugin * @param website The website * @return bool True if the plugin is registered successfully * @note The implementation of this function must be in header file(because of `GetCurrentModule`) */ -inline bool registerPlugin(std::string name, std::string desc, LL::Version version, +inline bool registerPlugin(std::string name, std::string desc, ll::Version version, std::string git = "", std::string license = "", std::string website = "") { std::map others; if (!git.empty()) @@ -141,17 +141,17 @@ inline bool registerPlugin(std::string name, std::string desc, LL::Version versi * * @param name The name of the plugin * @param desc The descirption(introduction) of the plugin - * @param version The version of the plugin(LL::Version) + * @param version The version of the plugin(ll::Version) * @param others The other information of the plugin(key-value) * @return bool True if the plugin is registered successfully * @note The implementation of this function must be in header file(because of `GetCurrentModule`) * * @par Example * @code - * LL::registerPlugin("Test", "A test plugin", Version(0, 0, 1, Version::Dev), {{"Note","This is Note"}}); + * ll::registerPlugin("Test", "A test plugin", Version(0, 0, 1, Version::Dev), {{"Note","This is Note"}}); * @endcode */ -inline bool registerPlugin(std::string name, std::string desc, LL::Version version, +inline bool registerPlugin(std::string name, std::string desc, ll::Version version, std::map others) { return ::RegisterPlugin(GetCurrentModule(), name, desc, version, others); } @@ -160,16 +160,16 @@ inline bool registerPlugin(std::string name, std::string desc, LL::Version versi * @brief Get a loaded plugin by name * * @param name The name of the plugin - * @return LL::Plugin* The plugin(nullptr if not found) + * @return ll::Plugin* The plugin(nullptr if not found) */ -LIAPI LL::Plugin* getPlugin(std::string name); +LIAPI ll::Plugin* getPlugin(std::string name); /** * @brief Get a loaded plugin by HMODULE handle * * @param name The name of the plugin - * @return LL::Plugin* The plugin(nullptr if not found) + * @return ll::Plugin* The plugin(nullptr if not found) */ -LIAPI LL::Plugin* getPlugin(HMODULE handle); +LIAPI ll::Plugin* getPlugin(HMODULE handle); /** * @brief Get whether the plugin is loaded @@ -182,9 +182,9 @@ LIAPI bool hasPlugin(std::string name); /** * @brief Get the All the loaded plugins * - * @return std::unordered_map The loaded plugins(name-plugin) + * @return std::unordered_map The loaded plugins(name-plugin) */ -LIAPI std::unordered_map getAllPlugins(); +LIAPI std::unordered_map getAllPlugins(); /** * @breif Get the handle of LiteLoader.dll. @@ -209,4 +209,4 @@ LIAPI bool isServerStopping(); * @return std::string Language(such as: en, zh_CN, ja, ru) */ std::string getLanguage(); -}; // namespace LL +}; // namespace ll diff --git a/LiteLoader/Header/LoggerAPI.h b/LiteLoader/include/llapi/LoggerAPI.h similarity index 94% rename from LiteLoader/Header/LoggerAPI.h rename to LiteLoader/include/llapi/LoggerAPI.h index 06e68cb..b7ff80c 100644 --- a/LiteLoader/Header/LoggerAPI.h +++ b/LiteLoader/include/llapi/LoggerAPI.h @@ -30,16 +30,16 @@ #endif #include -#include "third-party/FMT/chrono.h" -#include "third-party/FMT/color.h" -#include "third-party/FMT/core.h" -#include "third-party/FMT/os.h" -#include "third-party/FMT/printf.h" -#include "Utils/CsLock.h" -#include "Utils/WinHelper.h" -#include "Utils/FileHelper.h" -#include "Utils/PluginOwnData.h" -#include "Utils/StringHelper.h" +#include "FMT/chrono.h" +#include "FMT/color.h" +#include "FMT/core.h" +#include "FMT/os.h" +#include "FMT/printf.h" +#include "llapi/utils/CsLock.h" +#include "llapi/utils/WinHelper.h" +#include "llapi/utils/FileHelper.h" +#include "llapi/utils/PluginOwnData.h" +#include "llapi/utils/StringHelper.h" #include "I18nAPI.h" #include #include diff --git a/LiteLoader/Header/ParticleAPI.h b/LiteLoader/include/llapi/ParticleAPI.h similarity index 99% rename from LiteLoader/Header/ParticleAPI.h rename to LiteLoader/include/llapi/ParticleAPI.h index 878d486..0317515 100644 --- a/LiteLoader/Header/ParticleAPI.h +++ b/LiteLoader/include/llapi/ParticleAPI.h @@ -7,7 +7,7 @@ * */ #pragma once -#include +#include "LLAPI.h" #include "Global.h" class ParticleAPI { @@ -37,7 +37,7 @@ public: void inline init(HMODULE hModule = nullptr) { if (!hModule) { - auto pPtr = LL::getPlugin("ParticleAPI"); + auto pPtr = ll::getPlugin("ParticleAPI"); if (!pPtr) { throw std::runtime_error("Cannot get ParticleAPI.dll"); } diff --git a/LiteLoader/Header/PermissionAPI.h b/LiteLoader/include/llapi/PermissionAPI.h similarity index 99% rename from LiteLoader/Header/PermissionAPI.h rename to LiteLoader/include/llapi/PermissionAPI.h index 7189dea..09eea4a 100644 --- a/LiteLoader/Header/PermissionAPI.h +++ b/LiteLoader/include/llapi/PermissionAPI.h @@ -7,7 +7,7 @@ * */ #pragma once -#include +#include "LLAPI.h" #include "PERM/Role.hpp" /** @@ -60,7 +60,7 @@ public: */ void init(HMODULE hModule = nullptr) { if (!hModule) { - auto pPtr = LL::getPlugin("PermissionAPI"); + auto pPtr = ll::getPlugin("PermissionAPI"); if (!pPtr) { throw std::runtime_error("Cannot get the plugin object"); } diff --git a/LiteLoader/Header/PlayerInfoAPI.h b/LiteLoader/include/llapi/PlayerInfoAPI.h similarity index 97% rename from LiteLoader/Header/PlayerInfoAPI.h rename to LiteLoader/include/llapi/PlayerInfoAPI.h index 1636699..c2ba410 100644 --- a/LiteLoader/Header/PlayerInfoAPI.h +++ b/LiteLoader/include/llapi/PlayerInfoAPI.h @@ -7,7 +7,7 @@ * */ #pragma once -#include +#include "Global.h" #include namespace PlayerInfo { diff --git a/LiteLoader/Header/RegCommandAPI.h b/LiteLoader/include/llapi/RegCommandAPI.h similarity index 87% rename from LiteLoader/Header/RegCommandAPI.h rename to LiteLoader/include/llapi/RegCommandAPI.h index 150d661..1aed1b5 100644 --- a/LiteLoader/Header/RegCommandAPI.h +++ b/LiteLoader/include/llapi/RegCommandAPI.h @@ -1,14 +1,14 @@ #pragma once #include "Global.h" -#include "MC/Actor.hpp" -#include "MC/Player.hpp" -#include "MC/Command.hpp" -#include "MC/CommandMessage.hpp" -#include "MC/CommandOutput.hpp" -#include "MC/CommandParameterData.hpp" -#include "MC/CommandPosition.hpp" -#include "MC/CommandSelector.hpp" -#include "MC/CommandRegistry.hpp" +#include "llapi/mc/Actor.hpp" +#include "llapi/mc/Player.hpp" +#include "llapi/mc/Command.hpp" +#include "llapi/mc/CommandMessage.hpp" +#include "llapi/mc/CommandOutput.hpp" +#include "llapi/mc/CommandParameterData.hpp" +#include "llapi/mc/CommandPosition.hpp" +#include "llapi/mc/CommandSelector.hpp" +#include "llapi/mc/CommandRegistry.hpp" #include namespace RegisterCommandHelper { diff --git a/LiteLoader/Header/RemoteCallAPI.h b/LiteLoader/include/llapi/RemoteCallAPI.h similarity index 98% rename from LiteLoader/Header/RemoteCallAPI.h rename to LiteLoader/include/llapi/RemoteCallAPI.h index 5e4ecfc..8d543a1 100644 --- a/LiteLoader/Header/RemoteCallAPI.h +++ b/LiteLoader/include/llapi/RemoteCallAPI.h @@ -1,15 +1,15 @@ #pragma once #include "Global.h" -#include "Utils/WinHelper.h" -#include "third-party/Nlohmann/json.hpp" -#include "MC/CompoundTag.hpp" -#include "MC/Container.hpp" -#include "MC/ItemStack.hpp" -#include "MC/BlockInstance.hpp" -#include "MC/VanillaDimensions.hpp" -#include "MC/Player.hpp" -#include "MC/Block.hpp" -#include "MC/BlockActor.hpp" +#include "llapi/utils/WinHelper.h" +#include "Nlohmann/json.hpp" +#include "llapi/mc/CompoundTag.hpp" +#include "llapi/mc/Container.hpp" +#include "llapi/mc/ItemStack.hpp" +#include "llapi/mc/BlockInstance.hpp" +#include "llapi/mc/VanillaDimensions.hpp" +#include "llapi/mc/Player.hpp" +#include "llapi/mc/Block.hpp" +#include "llapi/mc/BlockActor.hpp" #define TEST_NEW_VALUE_TYPE /////////////////////////////////////////////////////// diff --git a/LiteLoader/Header/ScheduleAPI.h b/LiteLoader/include/llapi/ScheduleAPI.h similarity index 96% rename from LiteLoader/Header/ScheduleAPI.h rename to LiteLoader/include/llapi/ScheduleAPI.h index 8162bd1..51fc018 100644 --- a/LiteLoader/Header/ScheduleAPI.h +++ b/LiteLoader/include/llapi/ScheduleAPI.h @@ -1,7 +1,7 @@ #pragma once #include "Global.h" #include -#include "Utils/WinHelper.h" +#include "llapi/utils/WinHelper.h" /////////////////////////////////////////////////////// // Schedule future callback plans diff --git a/LiteLoader/Header/SendPacketAPI.h b/LiteLoader/include/llapi/SendPacketAPI.h similarity index 93% rename from LiteLoader/Header/SendPacketAPI.h rename to LiteLoader/include/llapi/SendPacketAPI.h index 2f12598..c83529d 100644 --- a/LiteLoader/Header/SendPacketAPI.h +++ b/LiteLoader/include/llapi/SendPacketAPI.h @@ -1,6 +1,6 @@ #pragma once -#include "MC/BinaryStream.hpp" -#include "MC/Packet.hpp" +#include "llapi/mc/BinaryStream.hpp" +#include "llapi/mc/Packet.hpp" template class NetworkPacket : public Packet { diff --git a/LiteLoader/Header/ServerAPI.h b/LiteLoader/include/llapi/ServerAPI.h similarity index 74% rename from LiteLoader/Header/ServerAPI.h rename to LiteLoader/include/llapi/ServerAPI.h index a00f284..ce1f863 100644 --- a/LiteLoader/Header/ServerAPI.h +++ b/LiteLoader/include/llapi/ServerAPI.h @@ -1,9 +1,9 @@ #pragma once #include -#include +#include "Global.h" -namespace LL { +namespace ll { LIAPI std::string getBdsVersion(); LIAPI int getServerProtocolVersion(); LIAPI bool setServerMotd(const std::string& motd); -} // namespace LL +} // namespace ll diff --git a/LiteLoader/Header/TranslationAPI.h b/LiteLoader/include/llapi/TranslationAPI.h similarity index 100% rename from LiteLoader/Header/TranslationAPI.h rename to LiteLoader/include/llapi/TranslationAPI.h diff --git a/LiteLoader/Header/DB/Any.h b/LiteLoader/include/llapi/db/Any.h similarity index 97% rename from LiteLoader/Header/DB/Any.h rename to LiteLoader/include/llapi/db/Any.h index f944d55..0461858 100644 --- a/LiteLoader/Header/DB/Any.h +++ b/LiteLoader/include/llapi/db/Any.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#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 - * @return DB::Date The value - * @throws std::bad_cast If the value cannot be converted to DB::Date + * @tparam T = db::Date + * @return db::Date The value + * @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 - * @return DB::Time The value - * @throws std::bad_cast If the value cannot be converted to DB::Time + * @tparam T = db::Time + * @return db::Time The value + * @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 - * @return DB::DateTime The value - * @throws std::bad_cast If the value cannot be converted to DB::DateTime + * @tparam T = db::DateTime + * @return db::DateTime The value + * @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 - * @return DB::ByteArray The value - * @throws std::bad_cast If the value cannot be converted to DB::ByteArray + * @tparam T = db::ByteArray + * @return db::ByteArray The value + * @throws std::bad_cast If the value cannot be converted to db::ByteArray */ template <> ByteArray get() const @@ -725,4 +725,4 @@ public: }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/ConnParams.h b/LiteLoader/include/llapi/db/ConnParams.h similarity index 99% rename from LiteLoader/Header/DB/ConnParams.h rename to LiteLoader/include/llapi/db/ConnParams.h index c6dda03..bce49bb 100644 --- a/LiteLoader/Header/DB/ConnParams.h +++ b/LiteLoader/include/llapi/db/ConnParams.h @@ -137,4 +137,4 @@ public: } }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Impl/MySQL/Session.h b/LiteLoader/include/llapi/db/Impl/mysql/Session.h similarity index 95% rename from LiteLoader/Header/DB/Impl/MySQL/Session.h rename to LiteLoader/include/llapi/db/Impl/mysql/Session.h index ea5850f..aa1c1f8 100644 --- a/LiteLoader/Header/DB/Impl/MySQL/Session.h +++ b/LiteLoader/include/llapi/db/Impl/mysql/Session.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Session.h" +#include "llapi/db/Session.h" struct MYSQL; @@ -37,4 +37,4 @@ public: }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Impl/MySQL/Stmt.h b/LiteLoader/include/llapi/db/Impl/mysql/Stmt.h similarity index 97% rename from LiteLoader/Header/DB/Impl/MySQL/Stmt.h rename to LiteLoader/include/llapi/db/Impl/mysql/Stmt.h index 28b3e45..1be61a7 100644 --- a/LiteLoader/Header/DB/Impl/MySQL/Stmt.h +++ b/LiteLoader/include/llapi/db/Impl/mysql/Stmt.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Stmt.h" +#include "llapi/db/Stmt.h" struct MYSQL_STMT; @@ -68,4 +68,4 @@ public: LIAPI static SharedPointer create(const std::weak_ptr& sess, const std::string& sql, bool autoExecute = false); }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Impl/SQLite/Session.h b/LiteLoader/include/llapi/db/Impl/sqlite/Session.h similarity index 94% rename from LiteLoader/Header/DB/Impl/SQLite/Session.h rename to LiteLoader/include/llapi/db/Impl/sqlite/Session.h index ee52a3c..6dfcc2b 100644 --- a/LiteLoader/Header/DB/Impl/SQLite/Session.h +++ b/LiteLoader/include/llapi/db/Impl/sqlite/Session.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Session.h" +#include "llapi/db/Session.h" struct sqlite3; namespace DB @@ -31,4 +31,4 @@ public: friend class SQLiteStmt; }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Impl/SQLite/Stmt.h b/LiteLoader/include/llapi/db/Impl/sqlite/Stmt.h similarity index 96% rename from LiteLoader/Header/DB/Impl/SQLite/Stmt.h rename to LiteLoader/include/llapi/db/Impl/sqlite/Stmt.h index 64058f6..f94c1ae 100644 --- a/LiteLoader/Header/DB/Impl/SQLite/Stmt.h +++ b/LiteLoader/include/llapi/db/Impl/sqlite/Stmt.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Stmt.h" +#include "llapi/db/Stmt.h" struct sqlite3_stmt; @@ -54,4 +54,4 @@ public: LIAPI static SharedPointer create(const std::weak_ptr& sess, const std::string& sql, bool autoExecute = false); }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Pointer.h b/LiteLoader/include/llapi/db/Pointer.h similarity index 99% rename from LiteLoader/Header/DB/Pointer.h rename to LiteLoader/include/llapi/db/Pointer.h index 8021c19..276b2a6 100644 --- a/LiteLoader/Header/DB/Pointer.h +++ b/LiteLoader/include/llapi/db/Pointer.h @@ -65,4 +65,4 @@ public: }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Row.h b/LiteLoader/include/llapi/db/Row.h similarity index 99% rename from LiteLoader/Header/DB/Row.h rename to LiteLoader/include/llapi/db/Row.h index 0eab378..fca8e93 100644 --- a/LiteLoader/Header/DB/Row.h +++ b/LiteLoader/include/llapi/db/Row.h @@ -247,7 +247,7 @@ public: LIAPI void forEach(std::function cb) const; }; -} // namespace DB +} // namespace db /** * @brief Function to convert a row to T. diff --git a/LiteLoader/Header/DB/RowSet.h b/LiteLoader/include/llapi/db/RowSet.h similarity index 99% rename from LiteLoader/Header/DB/RowSet.h rename to LiteLoader/include/llapi/db/RowSet.h index 5a6cc32..1796193 100644 --- a/LiteLoader/Header/DB/RowSet.h +++ b/LiteLoader/include/llapi/db/RowSet.h @@ -75,4 +75,4 @@ public: using ResultSet = RowSet; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Session.h b/LiteLoader/include/llapi/db/Session.h similarity index 98% rename from LiteLoader/Header/DB/Session.h rename to LiteLoader/include/llapi/db/Session.h index 6d8af65..5a3fbfa 100644 --- a/LiteLoader/Header/DB/Session.h +++ b/LiteLoader/include/llapi/db/Session.h @@ -143,7 +143,7 @@ public: * ResultSet res; * session << "SELECT * FROM table WHERE id = ?", bind(114514), into(res); * @endcode - * @note It is not recommended to store the DB::Stmt reference returned by this method, + * @note It is not recommended to store the db::Stmt reference returned by this method, * it will be closed on the next execution. */ virtual SharedPointer operator<<(const std::string& query); @@ -228,4 +228,4 @@ public: }; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Stmt.h b/LiteLoader/include/llapi/db/Stmt.h similarity index 95% rename from LiteLoader/Header/DB/Stmt.h rename to LiteLoader/include/llapi/db/Stmt.h index 214bb07..1b0ae5e 100644 --- a/LiteLoader/Header/DB/Stmt.h +++ b/LiteLoader/include/llapi/db/Stmt.h @@ -17,7 +17,7 @@ class Session; * @brief Structure to store a single value to bind to a prepared statement. * * @tparam T Type of sequence container, must have begin() and end() methods - * @tparam The value type of the container must be DB::Any. + * @tparam The value type of the container must be db::Any. */ struct BindType { @@ -31,13 +31,13 @@ struct BindType * to bind multiple parameters at once. * * @tparam T Type of sequence container, must have begin() and end() methods - * @tparam The value type of the container must be DB::Any. + * @tparam The value type of the container must be db::Any. */ template struct BindSequenceType { T values; - static_assert(std::is_same::value, "Container value type must be DB::Any"); + static_assert(std::is_same::value, "Container value type must be db::Any"); }; /** * @brief Structure to store a map(relevance) container @@ -45,14 +45,14 @@ struct BindSequenceType * * @tparam T Type of map container, must have begin() and end() methods * @note The key type of the map must be std::string, - * and the value type of the map must be DB::Any. + * and the value type of the map must be db::Any. */ template struct BindMapType { T values; static_assert(std::is_same::value, "Map key type must be std::string"); - static_assert(std::is_same::value, "Map value type must be DB::Any"); + static_assert(std::is_same::value, "Map value type must be db::Any"); }; template @@ -401,7 +401,7 @@ public: /** * @brief Get the session type * - * @return DB::DBType The database type + * @return db::DBType The database type * * @par Impletementation * @see SQLiteStmt::getType @@ -458,14 +458,14 @@ public: /** * @brief Operator, to bind single values. * - * @param b The return value of DB::use + * @param b The return value of db::use * @return SharedPointer this */ virtual SharedPointer operator,(const BindType& b); /** * @brief Operator, to bind a sequence container. * - * @param b The return value of DB::use + * @param b The return value of db::use * @return SharedPointer this */ template @@ -480,7 +480,7 @@ public: /** * @brief Operator, to bind a row. * - * @param b The return value of DB::use + * @param b The return value of db::use * @return SharedPointer this */ template <> @@ -505,7 +505,7 @@ public: /** * @brief Operator, to bind a map container. * - * @param b The return value of DB::bind + * @param b The return value of db::bind * @return SharedPointer this */ template @@ -520,7 +520,7 @@ public: /** * @brief Operator, to store a row of results. * - * @param i The return value of DB::into + * @param i The return value of db::into * @return SharedPointer this */ template @@ -532,7 +532,7 @@ public: /** * @brief Operator, to store a set of results. * - * @param i The return value of DB::into + * @param i The return value of db::into * @return SharedPointer this */ template @@ -544,7 +544,7 @@ public: /** * @brief Operator, to store a set of results. * - * @param i The return value of DB::into + * @param i The return value of db::into * @return SharedPointer this */ template <> @@ -556,7 +556,7 @@ public: /** * @brief Operator, to store a row of results. * - * @param i The return value of DB::into + * @param i The return value of db::into * @return SharedPointer this */ template <> @@ -670,4 +670,4 @@ inline IntoType into(T& out) return IntoType{out}; } -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/DB/Types.h b/LiteLoader/include/llapi/db/Types.h similarity index 96% rename from LiteLoader/Header/DB/Types.h rename to LiteLoader/include/llapi/db/Types.h index 5ccae49..2e1987c 100644 --- a/LiteLoader/Header/DB/Types.h +++ b/LiteLoader/include/llapi/db/Types.h @@ -41,4 +41,4 @@ struct Decimal using ByteArray = std::vector; -} // namespace DB \ No newline at end of file +} // namespace db \ No newline at end of file diff --git a/LiteLoader/Header/Impl/FormPacketHelper.h b/LiteLoader/include/llapi/impl/FormPacketHelper.h similarity index 89% rename from LiteLoader/Header/Impl/FormPacketHelper.h rename to LiteLoader/include/llapi/impl/FormPacketHelper.h index a5c1a88..5e02e98 100644 --- a/LiteLoader/Header/Impl/FormPacketHelper.h +++ b/LiteLoader/include/llapi/impl/FormPacketHelper.h @@ -1,9 +1,9 @@ #pragma once #include -#include "../Global.h" -#include "../FormUI.h" -#include +#include "llapi/Global.h" +#include "llapi/FormUI.h" +#include "llapi/mc/Player.hpp" LIAPI unsigned NewFormId(); diff --git a/LiteLoader/include/llapi/impl/ObjectivePacketHelper.h b/LiteLoader/include/llapi/impl/ObjectivePacketHelper.h new file mode 100644 index 0000000..44ec0c3 --- /dev/null +++ b/LiteLoader/include/llapi/impl/ObjectivePacketHelper.h @@ -0,0 +1,5 @@ +#pragma once + +#include "llapi/Global.h" + +LIAPI uint64_t NewScoreId(); \ No newline at end of file diff --git a/LiteLoader/Header/MC/AABB.hpp b/LiteLoader/include/llapi/mc/AABB.hpp similarity index 98% rename from LiteLoader/Header/MC/AABB.hpp rename to LiteLoader/include/llapi/mc/AABB.hpp index b29a030..af7e4db 100644 --- a/LiteLoader/Header/MC/AABB.hpp +++ b/LiteLoader/include/llapi/mc/AABB.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA @@ -12,6 +12,7 @@ class AABB { public: Vec3 min; Vec3 max; + bool empty; #define AFTER_EXTRA diff --git a/LiteLoader/Header/MC/AABBBucket.hpp b/LiteLoader/include/llapi/mc/AABBBucket.hpp similarity index 94% rename from LiteLoader/Header/MC/AABBBucket.hpp rename to LiteLoader/include/llapi/mc/AABBBucket.hpp index cca7558..4c8e8ab 100644 --- a/LiteLoader/Header/MC/AABBBucket.hpp +++ b/LiteLoader/include/llapi/mc/AABBBucket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AABBPred.hpp b/LiteLoader/include/llapi/mc/AABBPred.hpp similarity index 94% rename from LiteLoader/Header/MC/AABBPred.hpp rename to LiteLoader/include/llapi/mc/AABBPred.hpp index 48b52bf..bcf377b 100644 --- a/LiteLoader/Header/MC/AABBPred.hpp +++ b/LiteLoader/include/llapi/mc/AABBPred.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Abilities.hpp b/LiteLoader/include/llapi/mc/Abilities.hpp similarity index 96% rename from LiteLoader/Header/MC/Abilities.hpp rename to LiteLoader/include/llapi/mc/Abilities.hpp index 19c34c0..ec0e92d 100644 --- a/LiteLoader/Header/MC/Abilities.hpp +++ b/LiteLoader/include/llapi/mc/Abilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Ability.hpp b/LiteLoader/include/llapi/mc/Ability.hpp similarity index 94% rename from LiteLoader/Header/MC/Ability.hpp rename to LiteLoader/include/llapi/mc/Ability.hpp index fd25c66..813412e 100644 --- a/LiteLoader/Header/MC/Ability.hpp +++ b/LiteLoader/include/llapi/mc/Ability.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AbilityCommand.hpp b/LiteLoader/include/llapi/mc/AbilityCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/AbilityCommand.hpp rename to LiteLoader/include/llapi/mc/AbilityCommand.hpp index 51be37e..c73e110 100644 --- a/LiteLoader/Header/MC/AbilityCommand.hpp +++ b/LiteLoader/include/llapi/mc/AbilityCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AbsorptionMobEffect.hpp b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp similarity index 96% rename from LiteLoader/Header/MC/AbsorptionMobEffect.hpp rename to LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp index 09a7a17..d841c32 100644 --- a/LiteLoader/Header/MC/AbsorptionMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MobEffect.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AbstractArrow.hpp b/LiteLoader/include/llapi/mc/AbstractArrow.hpp similarity index 98% rename from LiteLoader/Header/MC/AbstractArrow.hpp rename to LiteLoader/include/llapi/mc/AbstractArrow.hpp index df20071..5d67776 100644 --- a/LiteLoader/Header/MC/AbstractArrow.hpp +++ b/LiteLoader/include/llapi/mc/AbstractArrow.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AcaciaTreeCanopy.hpp b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/AcaciaTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp index 7b02e22..5340164 100644 --- a/LiteLoader/Header/MC/AcaciaTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AcaciaTreeTrunk.hpp b/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp similarity index 97% rename from LiteLoader/Header/MC/AcaciaTreeTrunk.hpp rename to LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp index 34fd4ab..e95cafe 100644 --- a/LiteLoader/Header/MC/AcaciaTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AchievementData.hpp b/LiteLoader/include/llapi/mc/AchievementData.hpp similarity index 95% rename from LiteLoader/Header/MC/AchievementData.hpp rename to LiteLoader/include/llapi/mc/AchievementData.hpp index 4d4bbe2..df4a6ce 100644 --- a/LiteLoader/Header/MC/AchievementData.hpp +++ b/LiteLoader/include/llapi/mc/AchievementData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActivateToolDefinition.hpp b/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ActivateToolDefinition.hpp rename to LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp index c07f210..cf4d777 100644 --- a/LiteLoader/Header/MC/ActivateToolDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/ActivateToolNode.hpp b/LiteLoader/include/llapi/mc/ActivateToolNode.hpp similarity index 96% rename from LiteLoader/Header/MC/ActivateToolNode.hpp rename to LiteLoader/include/llapi/mc/ActivateToolNode.hpp index bc3ce81..23d3b79 100644 --- a/LiteLoader/Header/MC/ActivateToolNode.hpp +++ b/LiteLoader/include/llapi/mc/ActivateToolNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActivatorRailBlock.hpp b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ActivatorRailBlock.hpp rename to LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp index 4f99a5d..70892e6 100644 --- a/LiteLoader/Header/MC/ActivatorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseRailBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActiveDirectoryIdentity.hpp b/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp similarity index 97% rename from LiteLoader/Header/MC/ActiveDirectoryIdentity.hpp rename to LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp index 971b0d3..b0a3d55 100644 --- a/LiteLoader/Header/MC/ActiveDirectoryIdentity.hpp +++ b/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp similarity index 99% rename from LiteLoader/Header/MC/Actor.hpp rename to LiteLoader/include/llapi/mc/Actor.hpp index 85a6177..380456b 100644 --- a/LiteLoader/Header/MC/Actor.hpp +++ b/LiteLoader/include/llapi/mc/Actor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares diff --git a/LiteLoader/Header/MC/ActorAnimationController.hpp b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorAnimationController.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationController.hpp index d411413..0d3af7b 100644 --- a/LiteLoader/Header/MC/ActorAnimationController.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationControllerGroup.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorAnimationControllerGroup.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp index 9823d49..5bce9d6 100644 --- a/LiteLoader/Header/MC/ActorAnimationControllerGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "JsonUtil.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorAnimationControllerPlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp similarity index 99% rename from LiteLoader/Header/MC/ActorAnimationControllerPlayer.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp index c1bfd91..293cc86 100644 --- a/LiteLoader/Header/MC/ActorAnimationControllerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationControllerPtr.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorAnimationControllerPtr.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp index c6e5939..fa21039 100644 --- a/LiteLoader/Header/MC/ActorAnimationControllerPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationControllerState.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorAnimationControllerState.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp index 26270be..bcf0f03 100644 --- a/LiteLoader/Header/MC/ActorAnimationControllerState.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationControllerStatePlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorAnimationControllerStatePlayer.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp index 13c56b6..e064226 100644 --- a/LiteLoader/Header/MC/ActorAnimationControllerStatePlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationEvent.hpp b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorAnimationEvent.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp index f0c5650..82e11cf 100644 --- a/LiteLoader/Header/MC/ActorAnimationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationGroup.hpp b/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorAnimationGroup.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp index 549ba54..614877f 100644 --- a/LiteLoader/Header/MC/ActorAnimationGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorAnimationPlayer.hpp rename to LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp index 4b55dbc..9da2f2a 100644 --- a/LiteLoader/Header/MC/ActorAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorBlock.hpp b/LiteLoader/include/llapi/mc/ActorBlock.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorBlock.hpp rename to LiteLoader/include/llapi/mc/ActorBlock.hpp index 6e8067e..cfa3754 100644 --- a/LiteLoader/Header/MC/ActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorClassTree.hpp b/LiteLoader/include/llapi/mc/ActorClassTree.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorClassTree.hpp rename to LiteLoader/include/llapi/mc/ActorClassTree.hpp index 13692f9..dd6e9de 100644 --- a/LiteLoader/Header/MC/ActorClassTree.hpp +++ b/LiteLoader/include/llapi/mc/ActorClassTree.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp index f69ab38..58c312f 100644 --- a/LiteLoader/Header/MC/ActorCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/ActorComponentFactory.hpp b/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorComponentFactory.hpp rename to LiteLoader/include/llapi/mc/ActorComponentFactory.hpp index 8a00ba8..4669821 100644 --- a/LiteLoader/Header/MC/ActorComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDamageByActorSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorDamageByActorSource.hpp rename to LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp index 15a7dd6..8da6bd7 100644 --- a/LiteLoader/Header/MC/ActorDamageByActorSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorDamageSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDamageByBlockSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorDamageByBlockSource.hpp rename to LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp index d215d52..61acc66 100644 --- a/LiteLoader/Header/MC/ActorDamageByBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorDamageSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDamageByChildActorSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorDamageByChildActorSource.hpp rename to LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp index fe49d20..cf0b548 100644 --- a/LiteLoader/Header/MC/ActorDamageByChildActorSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorDamageByActorSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDamageSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageSource.hpp similarity index 99% rename from LiteLoader/Header/MC/ActorDamageSource.hpp rename to LiteLoader/include/llapi/mc/ActorDamageSource.hpp index a08781b..1e28d71 100644 --- a/LiteLoader/Header/MC/ActorDamageSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/ActorDefinition.hpp b/LiteLoader/include/llapi/mc/ActorDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorDefinition.hpp rename to LiteLoader/include/llapi/mc/ActorDefinition.hpp index 385134d..23d56aa 100644 --- a/LiteLoader/Header/MC/ActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDefinitionAttribute.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorDefinitionAttribute.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp index ae13be2..e2a2e27 100644 --- a/LiteLoader/Header/MC/ActorDefinitionAttribute.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDefinitionDescriptor.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorDefinitionDescriptor.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp index 1222960..5263dc4 100644 --- a/LiteLoader/Header/MC/ActorDefinitionDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDefinitionDiffList.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorDefinitionDiffList.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp index fcdcf7d..9aa7f40 100644 --- a/LiteLoader/Header/MC/ActorDefinitionDiffList.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDefinitionEventSubcomponent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorDefinitionEventSubcomponent.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp index ee7c8ec..cbf446d 100644 --- a/LiteLoader/Header/MC/ActorDefinitionEventSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp similarity index 99% rename from LiteLoader/Header/MC/ActorDefinitionGroup.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp index 55d6e23..3735d79 100644 --- a/LiteLoader/Header/MC/ActorDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorDefinitionIdentifier.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp index bcfeb13..b34a2db 100644 --- a/LiteLoader/Header/MC/ActorDefinitionIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp @@ -1,10 +1,10 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA -#include "MC/HashedString.hpp" +#include "HashedString.hpp" #undef BEFORE_EXTRA struct ActorDefinitionIdentifier { diff --git a/LiteLoader/Header/MC/ActorDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorDefinitionPtr.hpp rename to LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp index dc2849b..8d996d3 100644 --- a/LiteLoader/Header/MC/ActorDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp index da32284..2c8c01c 100644 --- a/LiteLoader/Header/MC/ActorEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorEventListener.hpp b/LiteLoader/include/llapi/mc/ActorEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorEventListener.hpp rename to LiteLoader/include/llapi/mc/ActorEventListener.hpp index e83fd0e..6bd40cf 100644 --- a/LiteLoader/Header/MC/ActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorEventPacket.hpp b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorEventPacket.hpp rename to LiteLoader/include/llapi/mc/ActorEventPacket.hpp index 68f19ee..e423d87 100644 --- a/LiteLoader/Header/MC/ActorEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorFactory.hpp b/LiteLoader/include/llapi/mc/ActorFactory.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorFactory.hpp rename to LiteLoader/include/llapi/mc/ActorFactory.hpp index baf839d..e1ed909 100644 --- a/LiteLoader/Header/MC/ActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorFactoryData.hpp b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorFactoryData.hpp rename to LiteLoader/include/llapi/mc/ActorFactoryData.hpp index e99fc35..51530ad 100644 --- a/LiteLoader/Header/MC/ActorFactoryData.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorFallPacket.hpp b/LiteLoader/include/llapi/mc/ActorFallPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorFallPacket.hpp rename to LiteLoader/include/llapi/mc/ActorFallPacket.hpp index 969255f..1ca9488 100644 --- a/LiteLoader/Header/MC/ActorFallPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorFallPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorFilterGroup.hpp b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorFilterGroup.hpp rename to LiteLoader/include/llapi/mc/ActorFilterGroup.hpp index fbc4b8e..07f229f 100644 --- a/LiteLoader/Header/MC/ActorFilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterGroup.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasAbilityTest.hpp b/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasAbilityTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp index 54273d1..1e3b04c 100644 --- a/LiteLoader/Header/MC/ActorHasAbilityTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasComponentTest.hpp b/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasComponentTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp index d66455c..25ed4fd 100644 --- a/LiteLoader/Header/MC/ActorHasComponentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasContainerOpenTest.hpp b/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasContainerOpenTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp index 60401ef..562fb5f 100644 --- a/LiteLoader/Header/MC/ActorHasContainerOpenTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasDamageTest.hpp b/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasDamageTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp index 86fefe0..79c9467 100644 --- a/LiteLoader/Header/MC/ActorHasDamageTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasEquipmentTest.hpp b/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorHasEquipmentTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp index 156a590..d20f2f9 100644 --- a/LiteLoader/Header/MC/ActorHasEquipmentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasMobEffect.hpp b/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorHasMobEffect.hpp rename to LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp index 040af89..99f2414 100644 --- a/LiteLoader/Header/MC/ActorHasMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasRangedWeaponTest.hpp b/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasRangedWeaponTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp index 39c08c0..9f2c1d5 100644 --- a/LiteLoader/Header/MC/ActorHasRangedWeaponTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasTagTest.hpp b/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasTagTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasTagTest.hpp index 238786e..99a5d30 100644 --- a/LiteLoader/Header/MC/ActorHasTagTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorHasTargetTest.hpp b/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorHasTargetTest.hpp rename to LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp index e4df3d4..f610091 100644 --- a/LiteLoader/Header/MC/ActorHasTargetTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInCaravanTest.hpp b/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInCaravanTest.hpp rename to LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp index 1913cdb..db77fdc 100644 --- a/LiteLoader/Header/MC/ActorInCaravanTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInCloudsTest.hpp b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInCloudsTest.hpp rename to LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp index 1a435ae..d1d01aa 100644 --- a/LiteLoader/Header/MC/ActorInCloudsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInLavaTest.hpp b/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInLavaTest.hpp rename to LiteLoader/include/llapi/mc/ActorInLavaTest.hpp index c7db392..f64fc89 100644 --- a/LiteLoader/Header/MC/ActorInLavaTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInNetherTest.hpp b/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInNetherTest.hpp rename to LiteLoader/include/llapi/mc/ActorInNetherTest.hpp index 5cc9836..1ec2728 100644 --- a/LiteLoader/Header/MC/ActorInNetherTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInVillageTest.hpp b/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInVillageTest.hpp rename to LiteLoader/include/llapi/mc/ActorInVillageTest.hpp index 463f044..9ed0ad1 100644 --- a/LiteLoader/Header/MC/ActorInVillageTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInWaterOrRainTest.hpp b/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInWaterOrRainTest.hpp rename to LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp index 5638544..504987d 100644 --- a/LiteLoader/Header/MC/ActorInWaterOrRainTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInWaterTest.hpp b/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInWaterTest.hpp rename to LiteLoader/include/llapi/mc/ActorInWaterTest.hpp index 22b4496..07bb191 100644 --- a/LiteLoader/Header/MC/ActorInWaterTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInWeatherTest.hpp b/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorInWeatherTest.hpp rename to LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp index 71418c8..3f47065 100644 --- a/LiteLoader/Header/MC/ActorInWeatherTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInactivityTimerTest.hpp b/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorInactivityTimerTest.hpp rename to LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp index 29c51ad..7dd1f87 100644 --- a/LiteLoader/Header/MC/ActorInactivityTimerTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorInfo.hpp b/LiteLoader/include/llapi/mc/ActorInfo.hpp similarity index 94% rename from LiteLoader/Header/MC/ActorInfo.hpp rename to LiteLoader/include/llapi/mc/ActorInfo.hpp index 3307113..fce3273 100644 --- a/LiteLoader/Header/MC/ActorInfo.hpp +++ b/LiteLoader/include/llapi/mc/ActorInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorInfoRegistry.hpp b/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorInfoRegistry.hpp rename to LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp index b0b4760..f5a3d10 100644 --- a/LiteLoader/Header/MC/ActorInfoRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorInteraction.hpp b/LiteLoader/include/llapi/mc/ActorInteraction.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorInteraction.hpp rename to LiteLoader/include/llapi/mc/ActorInteraction.hpp index d8c8fab..a902d9c 100644 --- a/LiteLoader/Header/MC/ActorInteraction.hpp +++ b/LiteLoader/include/llapi/mc/ActorInteraction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorIsAvoidingMobsTest.hpp b/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsAvoidingMobsTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp index 98111cf..ac1e024 100644 --- a/LiteLoader/Header/MC/ActorIsAvoidingMobsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsClimbingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsClimbingTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp index b14cd06..f5bf52e 100644 --- a/LiteLoader/Header/MC/ActorIsClimbingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsColorTest.hpp b/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsColorTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsColorTest.hpp index 4a9b9f2..f953fb5 100644 --- a/LiteLoader/Header/MC/ActorIsColorTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsFamilyTest.hpp b/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsFamilyTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp index bf6e8bf..fb772e4 100644 --- a/LiteLoader/Header/MC/ActorIsFamilyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsImmobileTest.hpp b/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsImmobileTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp index ab68b1a..00c6cc9 100644 --- a/LiteLoader/Header/MC/ActorIsImmobileTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsLeashedTest.hpp b/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsLeashedTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp index 63daeda..8b7bf77 100644 --- a/LiteLoader/Header/MC/ActorIsLeashedTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsLeashedToTest.hpp b/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsLeashedToTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp index 5ff2287..396f6b3 100644 --- a/LiteLoader/Header/MC/ActorIsLeashedToTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsMarkVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsMarkVariantTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp index 3d3d6d0..77104e3 100644 --- a/LiteLoader/Header/MC/ActorIsMarkVariantTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsMovingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsMovingTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp index ae87702..32ac178 100644 --- a/LiteLoader/Header/MC/ActorIsMovingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsOwnerTest.hpp b/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsOwnerTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp index 174f545..ee320a0 100644 --- a/LiteLoader/Header/MC/ActorIsOwnerTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsPersistentTest.hpp b/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsPersistentTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp index 96bcad1..6e537f6 100644 --- a/LiteLoader/Header/MC/ActorIsPersistentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsRidingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsRidingTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp index 5d75be4..f7ce00a 100644 --- a/LiteLoader/Header/MC/ActorIsRidingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsSkinIDTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsSkinIDTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp index 67f6e34..e814811 100644 --- a/LiteLoader/Header/MC/ActorIsSkinIDTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsSleepingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsSleepingTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp index 35576b6..6899c34 100644 --- a/LiteLoader/Header/MC/ActorIsSleepingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsSneakingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsSneakingTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp index 7099610..76212a6 100644 --- a/LiteLoader/Header/MC/ActorIsSneakingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsTargetTest.hpp b/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsTargetTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp index ccab613..6341a2f 100644 --- a/LiteLoader/Header/MC/ActorIsTargetTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsVariantTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp index a32a0e2..d2975ec 100644 --- a/LiteLoader/Header/MC/ActorIsVariantTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorIsVisibleTest.hpp b/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorIsVisibleTest.hpp rename to LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp index de297d4..b45c24b 100644 --- a/LiteLoader/Header/MC/ActorIsVisibleTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorLegacySaveConverter.hpp b/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorLegacySaveConverter.hpp rename to LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp index 39cf172..30eb01a 100644 --- a/LiteLoader/Header/MC/ActorLegacySaveConverter.hpp +++ b/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorMapping.hpp b/LiteLoader/include/llapi/mc/ActorMapping.hpp similarity index 95% rename from LiteLoader/Header/MC/ActorMapping.hpp rename to LiteLoader/include/llapi/mc/ActorMapping.hpp index bbe76e6..4e0ca9f 100644 --- a/LiteLoader/Header/MC/ActorMapping.hpp +++ b/LiteLoader/include/llapi/mc/ActorMapping.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorOnGroundTest.hpp b/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorOnGroundTest.hpp rename to LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp index b50bed9..da34247 100644 --- a/LiteLoader/Header/MC/ActorOnGroundTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorOnLadderTest.hpp b/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorOnLadderTest.hpp rename to LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp index 8700cea..22fb7f8 100644 --- a/LiteLoader/Header/MC/ActorOnLadderTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorParticleEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorParticleEffectEvent.hpp rename to LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp index 7f94af2..1c51518 100644 --- a/LiteLoader/Header/MC/ActorParticleEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorPickRequestPacket.hpp rename to LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp index e235056..63d67d4 100644 --- a/LiteLoader/Header/MC/ActorPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorPlacerItem.hpp b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorPlacerItem.hpp rename to LiteLoader/include/llapi/mc/ActorPlacerItem.hpp index 230191c..0d2e7f7 100644 --- a/LiteLoader/Header/MC/ActorPlacerItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorRandomChanceTest.hpp b/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorRandomChanceTest.hpp rename to LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp index 4a1d5e7..7f44ebb 100644 --- a/LiteLoader/Header/MC/ActorRandomChanceTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorRiderCountTest.hpp b/LiteLoader/include/llapi/mc/ActorRiderCountTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorRiderCountTest.hpp rename to LiteLoader/include/llapi/mc/ActorRiderCountTest.hpp index 01a0cf5..3acd1f7 100644 --- a/LiteLoader/Header/MC/ActorRiderCountTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorRiderCountTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorServerCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp index c0e823c..6cd6dfc 100644 --- a/LiteLoader/Header/MC/ActorServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "ActorCommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/ActorSkeletalAnimation.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorSkeletalAnimation.hpp rename to LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp index cfcbb13..f493589 100644 --- a/LiteLoader/Header/MC/ActorSkeletalAnimation.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorSkeletalAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorSkeletalAnimationPlayer.hpp rename to LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp index 312d797..26c599c 100644 --- a/LiteLoader/Header/MC/ActorSkeletalAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorSkeletalAnimationPtr.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorSkeletalAnimationPtr.hpp rename to LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp index 084d477..070b60c 100644 --- a/LiteLoader/Header/MC/ActorSkeletalAnimationPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorSpawnRuleBase.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp similarity index 98% rename from LiteLoader/Header/MC/ActorSpawnRuleBase.hpp rename to LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp index acd2533..ce6e5cb 100644 --- a/LiteLoader/Header/MC/ActorSpawnRuleBase.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorSpawnRuleGroup.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorSpawnRuleGroup.hpp rename to LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp index f15481a..38c8ede 100644 --- a/LiteLoader/Header/MC/ActorSpawnRuleGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorSurfaceMobTest.hpp b/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorSurfaceMobTest.hpp rename to LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp index bc794e4..ac99dc9 100644 --- a/LiteLoader/Header/MC/ActorSurfaceMobTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorTargetFilter.hpp b/LiteLoader/include/llapi/mc/ActorTargetFilter.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorTargetFilter.hpp rename to LiteLoader/include/llapi/mc/ActorTargetFilter.hpp index d341fc2..beb699e 100644 --- a/LiteLoader/Header/MC/ActorTargetFilter.hpp +++ b/LiteLoader/include/llapi/mc/ActorTargetFilter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorTerrainInterlockData.hpp b/LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp similarity index 97% rename from LiteLoader/Header/MC/ActorTerrainInterlockData.hpp rename to LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp index 9603da6..57f5585 100644 --- a/LiteLoader/Header/MC/ActorTerrainInterlockData.hpp +++ b/LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ActorTrustsSubjectTest.hpp b/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorTrustsSubjectTest.hpp rename to LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp index e9593f0..0a3bf5c 100644 --- a/LiteLoader/Header/MC/ActorTrustsSubjectTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorUndergroundTest.hpp b/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorUndergroundTest.hpp rename to LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp index b490f8a..32e5f82 100644 --- a/LiteLoader/Header/MC/ActorUndergroundTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorUnderwaterTest.hpp b/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorUnderwaterTest.hpp rename to LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp index 7a34481..d7eb2b3 100644 --- a/LiteLoader/Header/MC/ActorUnderwaterTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ActorUniqueID.hpp b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp similarity index 96% rename from LiteLoader/Header/MC/ActorUniqueID.hpp rename to LiteLoader/include/llapi/mc/ActorUniqueID.hpp index e7b8176..d97000d 100644 --- a/LiteLoader/Header/MC/ActorUniqueID.hpp +++ b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddActorBasePacket.hpp b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp similarity index 95% rename from LiteLoader/Header/MC/AddActorBasePacket.hpp rename to LiteLoader/include/llapi/mc/AddActorBasePacket.hpp index c5f9f4a..bd9e401 100644 --- a/LiteLoader/Header/MC/AddActorBasePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddActorPacket.hpp b/LiteLoader/include/llapi/mc/AddActorPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddActorPacket.hpp rename to LiteLoader/include/llapi/mc/AddActorPacket.hpp index 25029f7..956ee03 100644 --- a/LiteLoader/Header/MC/AddActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddBehaviorTreePacket.hpp b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddBehaviorTreePacket.hpp rename to LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp index 99402c3..6ec940b 100644 --- a/LiteLoader/Header/MC/AddBehaviorTreePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddEntityPacket.hpp rename to LiteLoader/include/llapi/mc/AddEntityPacket.hpp index 4b00702..882ad54 100644 --- a/LiteLoader/Header/MC/AddEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddItemActorPacket.hpp b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddItemActorPacket.hpp rename to LiteLoader/include/llapi/mc/AddItemActorPacket.hpp index 8e9931f..adf2417 100644 --- a/LiteLoader/Header/MC/AddItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddOceanTemperatureLayer.hpp b/LiteLoader/include/llapi/mc/AddOceanTemperatureLayer.hpp similarity index 96% rename from LiteLoader/Header/MC/AddOceanTemperatureLayer.hpp rename to LiteLoader/include/llapi/mc/AddOceanTemperatureLayer.hpp index 3c8c677..1ca70be 100644 --- a/LiteLoader/Header/MC/AddOceanTemperatureLayer.hpp +++ b/LiteLoader/include/llapi/mc/AddOceanTemperatureLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddPaintingPacket.hpp b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddPaintingPacket.hpp rename to LiteLoader/include/llapi/mc/AddPaintingPacket.hpp index 58d2346..fcc3ca1 100644 --- a/LiteLoader/Header/MC/AddPaintingPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddPlayerPacket.hpp b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AddPlayerPacket.hpp rename to LiteLoader/include/llapi/mc/AddPlayerPacket.hpp index 4e6230b..2e80085 100644 --- a/LiteLoader/Header/MC/AddPlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AddRiderComponent.hpp b/LiteLoader/include/llapi/mc/AddRiderComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/AddRiderComponent.hpp rename to LiteLoader/include/llapi/mc/AddRiderComponent.hpp index 918765a..e22c19e 100644 --- a/LiteLoader/Header/MC/AddRiderComponent.hpp +++ b/LiteLoader/include/llapi/mc/AddRiderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AdmireItemComponent.hpp b/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/AdmireItemComponent.hpp rename to LiteLoader/include/llapi/mc/AdmireItemComponent.hpp index 2e9f08d..e3a6248 100644 --- a/LiteLoader/Header/MC/AdmireItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AdmireItemDefinition.hpp b/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AdmireItemDefinition.hpp rename to LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp index 58b9cbf..b74c456 100644 --- a/LiteLoader/Header/MC/AdmireItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AdmireItemGoal.hpp b/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/AdmireItemGoal.hpp rename to LiteLoader/include/llapi/mc/AdmireItemGoal.hpp index ee47b65..60ff0c6 100644 --- a/LiteLoader/Header/MC/AdmireItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AdventureSettingsPacket.hpp b/LiteLoader/include/llapi/mc/AdventureSettingsPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/AdventureSettingsPacket.hpp rename to LiteLoader/include/llapi/mc/AdventureSettingsPacket.hpp index 76c5264..1f5fddd 100644 --- a/LiteLoader/Header/MC/AdventureSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/AdventureSettingsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgeableComponent.hpp b/LiteLoader/include/llapi/mc/AgeableComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/AgeableComponent.hpp rename to LiteLoader/include/llapi/mc/AgeableComponent.hpp index b57e1ce..08df6ba 100644 --- a/LiteLoader/Header/MC/AgeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/AgeableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgeableDefinition.hpp b/LiteLoader/include/llapi/mc/AgeableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AgeableDefinition.hpp rename to LiteLoader/include/llapi/mc/AgeableDefinition.hpp index ab25044..e4aab22 100644 --- a/LiteLoader/Header/MC/AgeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AgeableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgeableSystem.hpp b/LiteLoader/include/llapi/mc/AgeableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/AgeableSystem.hpp rename to LiteLoader/include/llapi/mc/AgeableSystem.hpp index dd4cf06..d08bc12 100644 --- a/LiteLoader/Header/MC/AgeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgeableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Agent.hpp b/LiteLoader/include/llapi/mc/Agent.hpp similarity index 99% rename from LiteLoader/Header/MC/Agent.hpp rename to LiteLoader/include/llapi/mc/Agent.hpp index f9dedd4..3554802 100644 --- a/LiteLoader/Header/MC/Agent.hpp +++ b/LiteLoader/include/llapi/mc/Agent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/AgentBodyControl.hpp b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp similarity index 95% rename from LiteLoader/Header/MC/AgentBodyControl.hpp rename to LiteLoader/include/llapi/mc/AgentBodyControl.hpp index f19ec6c..1a0defa 100644 --- a/LiteLoader/Header/MC/AgentBodyControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgentCommand.hpp b/LiteLoader/include/llapi/mc/AgentCommand.hpp similarity index 98% rename from LiteLoader/Header/MC/AgentCommand.hpp rename to LiteLoader/include/llapi/mc/AgentCommand.hpp index 382996a..c4f2f72 100644 --- a/LiteLoader/Header/MC/AgentCommand.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgentCommandExecutionGoal.hpp b/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/AgentCommandExecutionGoal.hpp rename to LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp index 8c7b414..c3268e5 100644 --- a/LiteLoader/Header/MC/AgentCommandExecutionGoal.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgentCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/AgentCommandSystem.hpp rename to LiteLoader/include/llapi/mc/AgentCommandSystem.hpp index 03ff49c..9b710e3 100644 --- a/LiteLoader/Header/MC/AgentCommandSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AgentLookControl.hpp b/LiteLoader/include/llapi/mc/AgentLookControl.hpp similarity index 96% rename from LiteLoader/Header/MC/AgentLookControl.hpp rename to LiteLoader/include/llapi/mc/AgentLookControl.hpp index 5e6bc20..2e93675 100644 --- a/LiteLoader/Header/MC/AgentLookControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentLookControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AirBlock.hpp b/LiteLoader/include/llapi/mc/AirBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/AirBlock.hpp rename to LiteLoader/include/llapi/mc/AirBlock.hpp index eccf6eb..2b795dd 100644 --- a/LiteLoader/Header/MC/AirBlock.hpp +++ b/LiteLoader/include/llapi/mc/AirBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AirBlockItem.hpp b/LiteLoader/include/llapi/mc/AirBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/AirBlockItem.hpp rename to LiteLoader/include/llapi/mc/AirBlockItem.hpp index f4bc43d..1950eff 100644 --- a/LiteLoader/Header/MC/AirBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AirBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AllWorkerConfigurations.hpp b/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp similarity index 95% rename from LiteLoader/Header/MC/AllWorkerConfigurations.hpp rename to LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp index bc7ee78..71d011a 100644 --- a/LiteLoader/Header/MC/AllWorkerConfigurations.hpp +++ b/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AmbientSoundIntervalDescription.hpp b/LiteLoader/include/llapi/mc/AmbientSoundIntervalDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/AmbientSoundIntervalDescription.hpp rename to LiteLoader/include/llapi/mc/AmbientSoundIntervalDescription.hpp index f308a81..2057610 100644 --- a/LiteLoader/Header/MC/AmbientSoundIntervalDescription.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundIntervalDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AmphibiousMoveControl.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/AmphibiousMoveControl.hpp rename to LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp index 36daaa8..bfd16f9 100644 --- a/LiteLoader/Header/MC/AmphibiousMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AmphibiousMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/AmphibiousMoveControlDescription.hpp rename to LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp index a86716c..b12b0ce 100644 --- a/LiteLoader/Header/MC/AmphibiousMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Amplifier.hpp b/LiteLoader/include/llapi/mc/Amplifier.hpp similarity index 95% rename from LiteLoader/Header/MC/Amplifier.hpp rename to LiteLoader/include/llapi/mc/Amplifier.hpp index 2d37d88..e570fae 100644 --- a/LiteLoader/Header/MC/Amplifier.hpp +++ b/LiteLoader/include/llapi/mc/Amplifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AngryComponent.hpp b/LiteLoader/include/llapi/mc/AngryComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/AngryComponent.hpp rename to LiteLoader/include/llapi/mc/AngryComponent.hpp index 442996b..53e5339 100644 --- a/LiteLoader/Header/MC/AngryComponent.hpp +++ b/LiteLoader/include/llapi/mc/AngryComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AngryDefinition.hpp b/LiteLoader/include/llapi/mc/AngryDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AngryDefinition.hpp rename to LiteLoader/include/llapi/mc/AngryDefinition.hpp index 07a2240..6471db1 100644 --- a/LiteLoader/Header/MC/AngryDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AngryDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AngrySystem.hpp b/LiteLoader/include/llapi/mc/AngrySystem.hpp similarity index 96% rename from LiteLoader/Header/MC/AngrySystem.hpp rename to LiteLoader/include/llapi/mc/AngrySystem.hpp index ca096b2..5f823de 100644 --- a/LiteLoader/Header/MC/AngrySystem.hpp +++ b/LiteLoader/include/llapi/mc/AngrySystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Animal.hpp b/LiteLoader/include/llapi/mc/Animal.hpp similarity index 98% rename from LiteLoader/Header/MC/Animal.hpp rename to LiteLoader/include/llapi/mc/Animal.hpp index c9bde86..df7e306 100644 --- a/LiteLoader/Header/MC/Animal.hpp +++ b/LiteLoader/include/llapi/mc/Animal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/AnimatePacket.hpp b/LiteLoader/include/llapi/mc/AnimatePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/AnimatePacket.hpp rename to LiteLoader/include/llapi/mc/AnimatePacket.hpp index 44e8ab9..8653357 100644 --- a/LiteLoader/Header/MC/AnimatePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnimatedImageData.hpp b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp similarity index 95% rename from LiteLoader/Header/MC/AnimatedImageData.hpp rename to LiteLoader/include/llapi/mc/AnimatedImageData.hpp index 36039bd..67ef944 100644 --- a/LiteLoader/Header/MC/AnimatedImageData.hpp +++ b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "persona.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnimationComponent.hpp b/LiteLoader/include/llapi/mc/AnimationComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/AnimationComponent.hpp rename to LiteLoader/include/llapi/mc/AnimationComponent.hpp index b58ed58..79e6b6d 100644 --- a/LiteLoader/Header/MC/AnimationComponent.hpp +++ b/LiteLoader/include/llapi/mc/AnimationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnimationResourceDefinitionMap.hpp b/LiteLoader/include/llapi/mc/AnimationResourceDefinitionMap.hpp similarity index 96% rename from LiteLoader/Header/MC/AnimationResourceDefinitionMap.hpp rename to LiteLoader/include/llapi/mc/AnimationResourceDefinitionMap.hpp index 6952a38..e68a092 100644 --- a/LiteLoader/Header/MC/AnimationResourceDefinitionMap.hpp +++ b/LiteLoader/include/llapi/mc/AnimationResourceDefinitionMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnimationScriptsDescription.hpp b/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/AnimationScriptsDescription.hpp rename to LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp index 64e088a..f8ade17 100644 --- a/LiteLoader/Header/MC/AnimationScriptsDescription.hpp +++ b/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnimationsDescription.hpp b/LiteLoader/include/llapi/mc/AnimationsDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/AnimationsDescription.hpp rename to LiteLoader/include/llapi/mc/AnimationsDescription.hpp index d20f24c..80be0ea 100644 --- a/LiteLoader/Header/MC/AnimationsDescription.hpp +++ b/LiteLoader/include/llapi/mc/AnimationsDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnvilBlock.hpp b/LiteLoader/include/llapi/mc/AnvilBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/AnvilBlock.hpp rename to LiteLoader/include/llapi/mc/AnvilBlock.hpp index 276ff9a..3487943 100644 --- a/LiteLoader/Header/MC/AnvilBlock.hpp +++ b/LiteLoader/include/llapi/mc/AnvilBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnvilContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/AnvilContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp index 5b2d18a..80e4c92 100644 --- a/LiteLoader/Header/MC/AnvilContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AnvilDamagePacket.hpp b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/AnvilDamagePacket.hpp rename to LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp index 32c230a..b3ff0f0 100644 --- a/LiteLoader/Header/MC/AnvilDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AppConfigs.hpp b/LiteLoader/include/llapi/mc/AppConfigs.hpp similarity index 99% rename from LiteLoader/Header/MC/AppConfigs.hpp rename to LiteLoader/include/llapi/mc/AppConfigs.hpp index 513e5de..b399893 100644 --- a/LiteLoader/Header/MC/AppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/AppConfigs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp similarity index 99% rename from LiteLoader/Header/MC/AppPlatform.hpp rename to LiteLoader/include/llapi/mc/AppPlatform.hpp index 336b3ab..b13a979 100644 --- a/LiteLoader/Header/MC/AppPlatform.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AppPlatformListener.hpp b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp similarity index 97% rename from LiteLoader/Header/MC/AppPlatformListener.hpp rename to LiteLoader/include/llapi/mc/AppPlatformListener.hpp index 63e78b5..6fd3784 100644 --- a/LiteLoader/Header/MC/AppPlatformListener.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AppPlatformWindows.hpp b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp similarity index 98% rename from LiteLoader/Header/MC/AppPlatformWindows.hpp rename to LiteLoader/include/llapi/mc/AppPlatformWindows.hpp index e654913..b6c1459 100644 --- a/LiteLoader/Header/MC/AppPlatformWindows.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AppPlatform_win32.hpp b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp similarity index 99% rename from LiteLoader/Header/MC/AppPlatform_win32.hpp rename to LiteLoader/include/llapi/mc/AppPlatform_win32.hpp index 6f44713..8aa1abf 100644 --- a/LiteLoader/Header/MC/AppPlatform_win32.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ApplyItemBinding.hpp b/LiteLoader/include/llapi/mc/ApplyItemBinding.hpp similarity index 96% rename from LiteLoader/Header/MC/ApplyItemBinding.hpp rename to LiteLoader/include/llapi/mc/ApplyItemBinding.hpp index 8baae72..1b88258 100644 --- a/LiteLoader/Header/MC/ApplyItemBinding.hpp +++ b/LiteLoader/include/llapi/mc/ApplyItemBinding.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ApplyLegacyEntityBinding.hpp b/LiteLoader/include/llapi/mc/ApplyLegacyEntityBinding.hpp similarity index 96% rename from LiteLoader/Header/MC/ApplyLegacyEntityBinding.hpp rename to LiteLoader/include/llapi/mc/ApplyLegacyEntityBinding.hpp index 360b2d2..5f83d14 100644 --- a/LiteLoader/Header/MC/ApplyLegacyEntityBinding.hpp +++ b/LiteLoader/include/llapi/mc/ApplyLegacyEntityBinding.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ArbitraryBiomeComponent.hpp b/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ArbitraryBiomeComponent.hpp rename to LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp index 8dea2a8..57ec246 100644 --- a/LiteLoader/Header/MC/ArbitraryBiomeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AreaAttackComponent.hpp b/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/AreaAttackComponent.hpp rename to LiteLoader/include/llapi/mc/AreaAttackComponent.hpp index d824b8c..8d56087 100644 --- a/LiteLoader/Header/MC/AreaAttackComponent.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AreaAttackDefinition.hpp b/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AreaAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp index eda2fd1..0d03a06 100644 --- a/LiteLoader/Header/MC/AreaAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AreaAttackSystem.hpp b/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/AreaAttackSystem.hpp rename to LiteLoader/include/llapi/mc/AreaAttackSystem.hpp index 6c3516d..656a057 100644 --- a/LiteLoader/Header/MC/AreaAttackSystem.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AreaEffectCloud.hpp b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp similarity index 98% rename from LiteLoader/Header/MC/AreaEffectCloud.hpp rename to LiteLoader/include/llapi/mc/AreaEffectCloud.hpp index 6bcc646..8160a37 100644 --- a/LiteLoader/Header/MC/AreaEffectCloud.hpp +++ b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ArmorItem.hpp b/LiteLoader/include/llapi/mc/ArmorItem.hpp similarity index 99% rename from LiteLoader/Header/MC/ArmorItem.hpp rename to LiteLoader/include/llapi/mc/ArmorItem.hpp index b834223..24587dc 100644 --- a/LiteLoader/Header/MC/ArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ArmorStand.hpp b/LiteLoader/include/llapi/mc/ArmorStand.hpp similarity index 98% rename from LiteLoader/Header/MC/ArmorStand.hpp rename to LiteLoader/include/llapi/mc/ArmorStand.hpp index 120f624..d156a4a 100644 --- a/LiteLoader/Header/MC/ArmorStand.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" @@ -12,7 +12,7 @@ class ArmorStand : public Mob { #define AFTER_EXTRA - +struct Pose; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ARMORSTAND public: diff --git a/LiteLoader/Header/MC/ArmorStandItem.hpp b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ArmorStandItem.hpp rename to LiteLoader/include/llapi/mc/ArmorStandItem.hpp index 19f556f..3d927de 100644 --- a/LiteLoader/Header/MC/ArmorStandItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Arrow.hpp b/LiteLoader/include/llapi/mc/Arrow.hpp similarity index 98% rename from LiteLoader/Header/MC/Arrow.hpp rename to LiteLoader/include/llapi/mc/Arrow.hpp index dd0cced..ddd28bf 100644 --- a/LiteLoader/Header/MC/Arrow.hpp +++ b/LiteLoader/include/llapi/mc/Arrow.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "AbstractArrow.hpp" diff --git a/LiteLoader/Header/MC/ArrowEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ArrowEffectSubcomponent.hpp rename to LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp index e39a910..166ce8a 100644 --- a/LiteLoader/Header/MC/ArrowEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "MobEffectSubcomponent.hpp" diff --git a/LiteLoader/Header/MC/ArrowItem.hpp b/LiteLoader/include/llapi/mc/ArrowItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ArrowItem.hpp rename to LiteLoader/include/llapi/mc/ArrowItem.hpp index 93665f0..cd5a439 100644 --- a/LiteLoader/Header/MC/ArrowItem.hpp +++ b/LiteLoader/include/llapi/mc/ArrowItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AsyncTracker.hpp b/LiteLoader/include/llapi/mc/AsyncTracker.hpp similarity index 95% rename from LiteLoader/Header/MC/AsyncTracker.hpp rename to LiteLoader/include/llapi/mc/AsyncTracker.hpp index b5c3ac4..d5495c8 100644 --- a/LiteLoader/Header/MC/AsyncTracker.hpp +++ b/LiteLoader/include/llapi/mc/AsyncTracker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AsynchronousIPResolver.hpp b/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp similarity index 95% rename from LiteLoader/Header/MC/AsynchronousIPResolver.hpp rename to LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp index a9407f3..537cc7a 100644 --- a/LiteLoader/Header/MC/AsynchronousIPResolver.hpp +++ b/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AtlasItemManager.hpp b/LiteLoader/include/llapi/mc/AtlasItemManager.hpp similarity index 95% rename from LiteLoader/Header/MC/AtlasItemManager.hpp rename to LiteLoader/include/llapi/mc/AtlasItemManager.hpp index 7138622..0b48b4a 100644 --- a/LiteLoader/Header/MC/AtlasItemManager.hpp +++ b/LiteLoader/include/llapi/mc/AtlasItemManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttackCooldownComponent.hpp b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/AttackCooldownComponent.hpp rename to LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp index cf111c6..5716f97 100644 --- a/LiteLoader/Header/MC/AttackCooldownComponent.hpp +++ b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttackCooldownSystem.hpp b/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/AttackCooldownSystem.hpp rename to LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp index 6a7b7a8..7753694 100644 --- a/LiteLoader/Header/MC/AttackCooldownSystem.hpp +++ b/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttackDamageMobEffect.hpp b/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp similarity index 96% rename from LiteLoader/Header/MC/AttackDamageMobEffect.hpp rename to LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp index a12bbe3..b2d3858 100644 --- a/LiteLoader/Header/MC/AttackDamageMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MobEffect.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttackDefinition.hpp b/LiteLoader/include/llapi/mc/AttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AttackDefinition.hpp rename to LiteLoader/include/llapi/mc/AttackDefinition.hpp index 6a37ea7..6a61a2f 100644 --- a/LiteLoader/Header/MC/AttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/AttackDescription.hpp b/LiteLoader/include/llapi/mc/AttackDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/AttackDescription.hpp rename to LiteLoader/include/llapi/mc/AttackDescription.hpp index f2d0374..749ed45 100644 --- a/LiteLoader/Header/MC/AttackDescription.hpp +++ b/LiteLoader/include/llapi/mc/AttackDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttackNode.hpp b/LiteLoader/include/llapi/mc/AttackNode.hpp similarity index 95% rename from LiteLoader/Header/MC/AttackNode.hpp rename to LiteLoader/include/llapi/mc/AttackNode.hpp index 0804852..8c3b735 100644 --- a/LiteLoader/Header/MC/AttackNode.hpp +++ b/LiteLoader/include/llapi/mc/AttackNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Attribute.hpp b/LiteLoader/include/llapi/mc/Attribute.hpp similarity index 96% rename from LiteLoader/Header/MC/Attribute.hpp rename to LiteLoader/include/llapi/mc/Attribute.hpp index 41ba48e..8b8526e 100644 --- a/LiteLoader/Header/MC/Attribute.hpp +++ b/LiteLoader/include/llapi/mc/Attribute.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttributeBuff.hpp b/LiteLoader/include/llapi/mc/AttributeBuff.hpp similarity index 96% rename from LiteLoader/Header/MC/AttributeBuff.hpp rename to LiteLoader/include/llapi/mc/AttributeBuff.hpp index 6a41c9f..cceeb0c 100644 --- a/LiteLoader/Header/MC/AttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/AttributeBuff.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttributeCollection.hpp b/LiteLoader/include/llapi/mc/AttributeCollection.hpp similarity index 95% rename from LiteLoader/Header/MC/AttributeCollection.hpp rename to LiteLoader/include/llapi/mc/AttributeCollection.hpp index cd236d0..310325c 100644 --- a/LiteLoader/Header/MC/AttributeCollection.hpp +++ b/LiteLoader/include/llapi/mc/AttributeCollection.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp similarity index 99% rename from LiteLoader/Header/MC/AttributeInstance.hpp rename to LiteLoader/include/llapi/mc/AttributeInstance.hpp index ac047d1..e915c61 100644 --- a/LiteLoader/Header/MC/AttributeInstance.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AttributeInstanceDelegate.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AttributeInstanceDelegate.hpp b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp similarity index 93% rename from LiteLoader/Header/MC/AttributeInstanceDelegate.hpp rename to LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp index 928f318..9171146 100644 --- a/LiteLoader/Header/MC/AttributeInstanceDelegate.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp @@ -1,12 +1,13 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA class BaseAttributeMap; -struct AttributeInstanceHandle +class AttributeInstanceHandle { +public: unsigned int mAttributeID; BaseAttributeMap *mAttributeMap; }; diff --git a/LiteLoader/Header/MC/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp similarity index 96% rename from LiteLoader/Header/MC/AttributeModifier.hpp rename to LiteLoader/include/llapi/mc/AttributeModifier.hpp index fce7f93..5e0af78 100644 --- a/LiteLoader/Header/MC/AttributeModifier.hpp +++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AutomaticFeatureRules.hpp b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp similarity index 93% rename from LiteLoader/Header/MC/AutomaticFeatureRules.hpp rename to LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp index 2e186b6..e7b2415 100644 --- a/LiteLoader/Header/MC/AutomaticFeatureRules.hpp +++ b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Automation.hpp b/LiteLoader/include/llapi/mc/Automation.hpp similarity index 95% rename from LiteLoader/Header/MC/Automation.hpp rename to LiteLoader/include/llapi/mc/Automation.hpp index df764c8..b2a2ae8 100644 --- a/LiteLoader/Header/MC/Automation.hpp +++ b/LiteLoader/include/llapi/mc/Automation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AutomationClientConnectPacket.hpp b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/AutomationClientConnectPacket.hpp rename to LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp index 3f25f5a..da88761 100644 --- a/LiteLoader/Header/MC/AutomationClientConnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AutomationPlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/AutomationPlayerCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp index dd2fb9c..b6c536e 100644 --- a/LiteLoader/Header/MC/AutomationPlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "PlayerCommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/AuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/AuxDataBlockItem.hpp rename to LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp index a054767..7e766b7 100644 --- a/LiteLoader/Header/MC/AuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AvailableActorIdentifiersPacket.hpp b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/AvailableActorIdentifiersPacket.hpp rename to LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp index 58c9bbe..54f898b 100644 --- a/LiteLoader/Header/MC/AvailableActorIdentifiersPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AvailableCommandsPacket.hpp b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp similarity index 99% rename from LiteLoader/Header/MC/AvailableCommandsPacket.hpp rename to LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp index 0fe9535..546a007 100644 --- a/LiteLoader/Header/MC/AvailableCommandsPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AvoidBlockGoal.hpp b/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/AvoidBlockGoal.hpp rename to LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp index 7989e51..0d0b8c3 100644 --- a/LiteLoader/Header/MC/AvoidBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AvoidMobTypeDefinition.hpp b/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/AvoidMobTypeDefinition.hpp rename to LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp index eb60fff..6fd96bb 100644 --- a/LiteLoader/Header/MC/AvoidMobTypeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/AvoidMobTypeGoal.hpp b/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/AvoidMobTypeGoal.hpp rename to LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp index 0c363d0..0f2e7d4 100644 --- a/LiteLoader/Header/MC/AvoidMobTypeGoal.hpp +++ b/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BackgroundTask.hpp b/LiteLoader/include/llapi/mc/BackgroundTask.hpp similarity index 98% rename from LiteLoader/Header/MC/BackgroundTask.hpp rename to LiteLoader/include/llapi/mc/BackgroundTask.hpp index a101e6c..28e273b 100644 --- a/LiteLoader/Header/MC/BackgroundTask.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTask.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BackgroundTaskQueue.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp similarity index 96% rename from LiteLoader/Header/MC/BackgroundTaskQueue.hpp rename to LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp index eea28b4..9df0527 100644 --- a/LiteLoader/Header/MC/BackgroundTaskQueue.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BackgroundWorker.hpp b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp similarity index 97% rename from LiteLoader/Header/MC/BackgroundWorker.hpp rename to LiteLoader/include/llapi/mc/BackgroundWorker.hpp index d61e2f6..e361ada 100644 --- a/LiteLoader/Header/MC/BackgroundWorker.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BackwardsCompatTextureGroup.hpp b/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp similarity index 96% rename from LiteLoader/Header/MC/BackwardsCompatTextureGroup.hpp rename to LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp index 589c00f..c0a4aa4 100644 --- a/LiteLoader/Header/MC/BackwardsCompatTextureGroup.hpp +++ b/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Balloon.hpp b/LiteLoader/include/llapi/mc/Balloon.hpp similarity index 98% rename from LiteLoader/Header/MC/Balloon.hpp rename to LiteLoader/include/llapi/mc/Balloon.hpp index 5665246..3029f4a 100644 --- a/LiteLoader/Header/MC/Balloon.hpp +++ b/LiteLoader/include/llapi/mc/Balloon.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BalloonComponent.hpp b/LiteLoader/include/llapi/mc/BalloonComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/BalloonComponent.hpp rename to LiteLoader/include/llapi/mc/BalloonComponent.hpp index a78683a..591caec 100644 --- a/LiteLoader/Header/MC/BalloonComponent.hpp +++ b/LiteLoader/include/llapi/mc/BalloonComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BalloonItem.hpp b/LiteLoader/include/llapi/mc/BalloonItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BalloonItem.hpp rename to LiteLoader/include/llapi/mc/BalloonItem.hpp index c9ea32f..2b8362b 100644 --- a/LiteLoader/Header/MC/BalloonItem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BalloonSystem.hpp b/LiteLoader/include/llapi/mc/BalloonSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BalloonSystem.hpp rename to LiteLoader/include/llapi/mc/BalloonSystem.hpp index 443ab20..d2aa039 100644 --- a/LiteLoader/Header/MC/BalloonSystem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BalloonableComponent.hpp b/LiteLoader/include/llapi/mc/BalloonableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BalloonableComponent.hpp rename to LiteLoader/include/llapi/mc/BalloonableComponent.hpp index 2bb6d81..6b34732 100644 --- a/LiteLoader/Header/MC/BalloonableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BalloonableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BalloonableDefinition.hpp b/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BalloonableDefinition.hpp rename to LiteLoader/include/llapi/mc/BalloonableDefinition.hpp index fd46470..d306b26 100644 --- a/LiteLoader/Header/MC/BalloonableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BambooBlock.hpp b/LiteLoader/include/llapi/mc/BambooBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BambooBlock.hpp rename to LiteLoader/include/llapi/mc/BambooBlock.hpp index 10af52f..f815c9d 100644 --- a/LiteLoader/Header/MC/BambooBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BambooBlockItem.hpp b/LiteLoader/include/llapi/mc/BambooBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BambooBlockItem.hpp rename to LiteLoader/include/llapi/mc/BambooBlockItem.hpp index d210d93..aa90c5c 100644 --- a/LiteLoader/Header/MC/BambooBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BambooBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BambooFeature.hpp b/LiteLoader/include/llapi/mc/BambooFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/BambooFeature.hpp rename to LiteLoader/include/llapi/mc/BambooFeature.hpp index bc1fbe0..5f871a3 100644 --- a/LiteLoader/Header/MC/BambooFeature.hpp +++ b/LiteLoader/include/llapi/mc/BambooFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BambooSapling.hpp b/LiteLoader/include/llapi/mc/BambooSapling.hpp similarity index 99% rename from LiteLoader/Header/MC/BambooSapling.hpp rename to LiteLoader/include/llapi/mc/BambooSapling.hpp index 0f7e897..9293936 100644 --- a/LiteLoader/Header/MC/BambooSapling.hpp +++ b/LiteLoader/include/llapi/mc/BambooSapling.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Sapling.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerAddPatternRecipe.hpp b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/BannerAddPatternRecipe.hpp rename to LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp index aba200e..668f218 100644 --- a/LiteLoader/Header/MC/BannerAddPatternRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerBlock.hpp b/LiteLoader/include/llapi/mc/BannerBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BannerBlock.hpp rename to LiteLoader/include/llapi/mc/BannerBlock.hpp index 85ecc53..af62760 100644 --- a/LiteLoader/Header/MC/BannerBlock.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerBlockActor.hpp b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/BannerBlockActor.hpp rename to LiteLoader/include/llapi/mc/BannerBlockActor.hpp index 4495121..becc265 100644 --- a/LiteLoader/Header/MC/BannerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerDuplicateRecipe.hpp b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/BannerDuplicateRecipe.hpp rename to LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp index b84f1cd..9f7fd16 100644 --- a/LiteLoader/Header/MC/BannerDuplicateRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerItem.hpp b/LiteLoader/include/llapi/mc/BannerItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BannerItem.hpp rename to LiteLoader/include/llapi/mc/BannerItem.hpp index f0273d1..21e4e20 100644 --- a/LiteLoader/Header/MC/BannerItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerPattern.hpp b/LiteLoader/include/llapi/mc/BannerPattern.hpp similarity index 96% rename from LiteLoader/Header/MC/BannerPattern.hpp rename to LiteLoader/include/llapi/mc/BannerPattern.hpp index 4a76e64..9333fdd 100644 --- a/LiteLoader/Header/MC/BannerPattern.hpp +++ b/LiteLoader/include/llapi/mc/BannerPattern.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BannerPatternItem.hpp b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BannerPatternItem.hpp rename to LiteLoader/include/llapi/mc/BannerPatternItem.hpp index 10bd772..f03a311 100644 --- a/LiteLoader/Header/MC/BannerPatternItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarrelBlock.hpp b/LiteLoader/include/llapi/mc/BarrelBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BarrelBlock.hpp rename to LiteLoader/include/llapi/mc/BarrelBlock.hpp index 9d8a46e..12779b7 100644 --- a/LiteLoader/Header/MC/BarrelBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarrelBlockActor.hpp b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp similarity index 96% rename from LiteLoader/Header/MC/BarrelBlockActor.hpp rename to LiteLoader/include/llapi/mc/BarrelBlockActor.hpp index 17951f5..cfa3989 100644 --- a/LiteLoader/Header/MC/BarrelBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarrierBlock.hpp b/LiteLoader/include/llapi/mc/BarrierBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BarrierBlock.hpp rename to LiteLoader/include/llapi/mc/BarrierBlock.hpp index 9508a74..aa8ab5a 100644 --- a/LiteLoader/Header/MC/BarrierBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrierBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarterComponent.hpp b/LiteLoader/include/llapi/mc/BarterComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/BarterComponent.hpp rename to LiteLoader/include/llapi/mc/BarterComponent.hpp index 61273e5..f691540 100644 --- a/LiteLoader/Header/MC/BarterComponent.hpp +++ b/LiteLoader/include/llapi/mc/BarterComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarterDefinition.hpp b/LiteLoader/include/llapi/mc/BarterDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BarterDefinition.hpp rename to LiteLoader/include/llapi/mc/BarterDefinition.hpp index 15de372..c54e978 100644 --- a/LiteLoader/Header/MC/BarterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BarterDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BarterGoal.hpp b/LiteLoader/include/llapi/mc/BarterGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/BarterGoal.hpp rename to LiteLoader/include/llapi/mc/BarterGoal.hpp index 90b5a8a..4dfd51f 100644 --- a/LiteLoader/Header/MC/BarterGoal.hpp +++ b/LiteLoader/include/llapi/mc/BarterGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BasaltColumnsFeature.hpp b/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/BasaltColumnsFeature.hpp rename to LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp index 21c147f..19155f8 100644 --- a/LiteLoader/Header/MC/BasaltColumnsFeature.hpp +++ b/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BasaltPillarFeature.hpp b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/BasaltPillarFeature.hpp rename to LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp index b9f6a1c..de16657 100644 --- a/LiteLoader/Header/MC/BasaltPillarFeature.hpp +++ b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseAttributeMap.hpp b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp similarity index 96% rename from LiteLoader/Header/MC/BaseAttributeMap.hpp rename to LiteLoader/include/llapi/mc/BaseAttributeMap.hpp index e54992a..84f5458 100644 --- a/LiteLoader/Header/MC/BaseAttributeMap.hpp +++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseCircuitComponent.hpp b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/BaseCircuitComponent.hpp rename to LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp index 0672ec8..6789a21 100644 --- a/LiteLoader/Header/MC/BaseCircuitComponent.hpp +++ b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseCommandBlock.hpp b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp similarity index 97% rename from LiteLoader/Header/MC/BaseCommandBlock.hpp rename to LiteLoader/include/llapi/mc/BaseCommandBlock.hpp index 7460ff6..79e0469 100644 --- a/LiteLoader/Header/MC/BaseCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseContainerMenu.hpp b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp similarity index 97% rename from LiteLoader/Header/MC/BaseContainerMenu.hpp rename to LiteLoader/include/llapi/mc/BaseContainerMenu.hpp index 968b5be..2271094 100644 --- a/LiteLoader/Header/MC/BaseContainerMenu.hpp +++ b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseGamePackSlices.hpp b/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp similarity index 95% rename from LiteLoader/Header/MC/BaseGamePackSlices.hpp rename to LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp index da52e5f..330097c 100644 --- a/LiteLoader/Header/MC/BaseGamePackSlices.hpp +++ b/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp similarity index 97% rename from LiteLoader/Header/MC/BaseGameVersion.hpp rename to LiteLoader/include/llapi/mc/BaseGameVersion.hpp index ad0584e..cc30f82 100644 --- a/LiteLoader/Header/MC/BaseGameVersion.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SemVersion.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseGameVersioning.hpp b/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp similarity index 93% rename from LiteLoader/Header/MC/BaseGameVersioning.hpp rename to LiteLoader/include/llapi/mc/BaseGameVersioning.hpp index 1ecb57e..6e20e88 100644 --- a/LiteLoader/Header/MC/BaseGameVersioning.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseGoalDefinition.hpp b/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BaseGoalDefinition.hpp rename to LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp index 7e119ca..257ceb2 100644 --- a/LiteLoader/Header/MC/BaseGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseMobSpawner.hpp b/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp similarity index 97% rename from LiteLoader/Header/MC/BaseMobSpawner.hpp rename to LiteLoader/include/llapi/mc/BaseMobSpawner.hpp index a960be8..28d8160 100644 --- a/LiteLoader/Header/MC/BaseMobSpawner.hpp +++ b/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseMoveToBlockGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/BaseMoveToBlockGoal.hpp rename to LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp index 355b405..0f37742 100644 --- a/LiteLoader/Header/MC/BaseMoveToBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseMoveToGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/BaseMoveToGoal.hpp rename to LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp index 4908073..560d70d 100644 --- a/LiteLoader/Header/MC/BaseMoveToGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BasePressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BasePressurePlateBlock.hpp rename to LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp index e3ce883..0ad6350 100644 --- a/LiteLoader/Header/MC/BasePressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseRailBlock.hpp b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BaseRailBlock.hpp rename to LiteLoader/include/llapi/mc/BaseRailBlock.hpp index 46f59ea..545b116 100644 --- a/LiteLoader/Header/MC/BaseRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BaseRailTransporter.hpp b/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp similarity index 97% rename from LiteLoader/Header/MC/BaseRailTransporter.hpp rename to LiteLoader/include/llapi/mc/BaseRailTransporter.hpp index 9cd328c..5c49be1 100644 --- a/LiteLoader/Header/MC/BaseRailTransporter.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseCircuitComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BasicTimer.hpp b/LiteLoader/include/llapi/mc/BasicTimer.hpp similarity index 95% rename from LiteLoader/Header/MC/BasicTimer.hpp rename to LiteLoader/include/llapi/mc/BasicTimer.hpp index 46b5b36..624d490 100644 --- a/LiteLoader/Header/MC/BasicTimer.hpp +++ b/LiteLoader/include/llapi/mc/BasicTimer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BastionFeature.hpp b/LiteLoader/include/llapi/mc/BastionFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/BastionFeature.hpp rename to LiteLoader/include/llapi/mc/BastionFeature.hpp index ea536c0..a8ad290 100644 --- a/LiteLoader/Header/MC/BastionFeature.hpp +++ b/LiteLoader/include/llapi/mc/BastionFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BastionPiece.hpp b/LiteLoader/include/llapi/mc/BastionPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/BastionPiece.hpp rename to LiteLoader/include/llapi/mc/BastionPiece.hpp index 02bcd96..40b5615 100644 --- a/LiteLoader/Header/MC/BastionPiece.hpp +++ b/LiteLoader/include/llapi/mc/BastionPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PoolElementStructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BastionStart.hpp b/LiteLoader/include/llapi/mc/BastionStart.hpp similarity index 96% rename from LiteLoader/Header/MC/BastionStart.hpp rename to LiteLoader/include/llapi/mc/BastionStart.hpp index 54c0a12..6af97ab 100644 --- a/LiteLoader/Header/MC/BastionStart.hpp +++ b/LiteLoader/include/llapi/mc/BastionStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Bat.hpp b/LiteLoader/include/llapi/mc/Bat.hpp similarity index 98% rename from LiteLoader/Header/MC/Bat.hpp rename to LiteLoader/include/llapi/mc/Bat.hpp index 52aa2b0..3926cf6 100644 --- a/LiteLoader/Header/MC/Bat.hpp +++ b/LiteLoader/include/llapi/mc/Bat.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/BatchedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp similarity index 97% rename from LiteLoader/Header/MC/BatchedNetworkPeer.hpp rename to LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp index f00072c..bf118cf 100644 --- a/LiteLoader/Header/MC/BatchedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetworkPeer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeaconBlock.hpp b/LiteLoader/include/llapi/mc/BeaconBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BeaconBlock.hpp rename to LiteLoader/include/llapi/mc/BeaconBlock.hpp index 8404b9b..23a892d 100644 --- a/LiteLoader/Header/MC/BeaconBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeaconBlockActor.hpp b/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/BeaconBlockActor.hpp rename to LiteLoader/include/llapi/mc/BeaconBlockActor.hpp index d59f21b..2414402 100644 --- a/LiteLoader/Header/MC/BeaconBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeaconContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/BeaconContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp index 06a1dda..792a6c2 100644 --- a/LiteLoader/Header/MC/BeaconContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeardAndShaverDescription.hpp b/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/BeardAndShaverDescription.hpp rename to LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp index 6f1b1dd..cf4c4c6 100644 --- a/LiteLoader/Header/MC/BeardAndShaverDescription.hpp +++ b/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeardAndShaverStorage.hpp b/LiteLoader/include/llapi/mc/BeardAndShaverStorage.hpp similarity index 96% rename from LiteLoader/Header/MC/BeardAndShaverStorage.hpp rename to LiteLoader/include/llapi/mc/BeardAndShaverStorage.hpp index 945eca4..0c1d9e0 100644 --- a/LiteLoader/Header/MC/BeardAndShaverStorage.hpp +++ b/LiteLoader/include/llapi/mc/BeardAndShaverStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeardKernel.hpp b/LiteLoader/include/llapi/mc/BeardKernel.hpp similarity index 95% rename from LiteLoader/Header/MC/BeardKernel.hpp rename to LiteLoader/include/llapi/mc/BeardKernel.hpp index f08af7e..a23b2d4 100644 --- a/LiteLoader/Header/MC/BeardKernel.hpp +++ b/LiteLoader/include/llapi/mc/BeardKernel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedBlock.hpp b/LiteLoader/include/llapi/mc/BedBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BedBlock.hpp rename to LiteLoader/include/llapi/mc/BedBlock.hpp index bb3b746..1d699ff 100644 --- a/LiteLoader/Header/MC/BedBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedBlockActor.hpp b/LiteLoader/include/llapi/mc/BedBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/BedBlockActor.hpp rename to LiteLoader/include/llapi/mc/BedBlockActor.hpp index 9f83f94..728ce67 100644 --- a/LiteLoader/Header/MC/BedBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BedBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedItem.hpp b/LiteLoader/include/llapi/mc/BedItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BedItem.hpp rename to LiteLoader/include/llapi/mc/BedItem.hpp index bc58b83..9f6a226 100644 --- a/LiteLoader/Header/MC/BedItem.hpp +++ b/LiteLoader/include/llapi/mc/BedItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp similarity index 98% rename from LiteLoader/Header/MC/Bedrock.hpp rename to LiteLoader/include/llapi/mc/Bedrock.hpp index 00c6d9e..9ace3a6 100644 --- a/LiteLoader/Header/MC/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedrockBlock.hpp b/LiteLoader/include/llapi/mc/BedrockBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BedrockBlock.hpp rename to LiteLoader/include/llapi/mc/BedrockBlock.hpp index 08ed53e..b457cc1 100644 --- a/LiteLoader/Header/MC/BedrockBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedrockBlockTypes.hpp b/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp similarity index 90% rename from LiteLoader/Header/MC/BedrockBlockTypes.hpp rename to LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp index df62ce3..92fd241 100644 --- a/LiteLoader/Header/MC/BedrockBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedrockBlocks.hpp b/LiteLoader/include/llapi/mc/BedrockBlocks.hpp similarity index 89% rename from LiteLoader/Header/MC/BedrockBlocks.hpp rename to LiteLoader/include/llapi/mc/BedrockBlocks.hpp index cf39a41..5c5fd70 100644 --- a/LiteLoader/Header/MC/BedrockBlocks.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlocks.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedrockItems.hpp b/LiteLoader/include/llapi/mc/BedrockItems.hpp similarity index 95% rename from LiteLoader/Header/MC/BedrockItems.hpp rename to LiteLoader/include/llapi/mc/BedrockItems.hpp index 2af154c..0583623 100644 --- a/LiteLoader/Header/MC/BedrockItems.hpp +++ b/LiteLoader/include/llapi/mc/BedrockItems.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BedrockLog.hpp b/LiteLoader/include/llapi/mc/BedrockLog.hpp similarity index 98% rename from LiteLoader/Header/MC/BedrockLog.hpp rename to LiteLoader/include/llapi/mc/BedrockLog.hpp index 25603b7..c68edab 100644 --- a/LiteLoader/Header/MC/BedrockLog.hpp +++ b/LiteLoader/include/llapi/mc/BedrockLog.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Bee.hpp b/LiteLoader/include/llapi/mc/Bee.hpp similarity index 98% rename from LiteLoader/Header/MC/Bee.hpp rename to LiteLoader/include/llapi/mc/Bee.hpp index fc0ee33..335379e 100644 --- a/LiteLoader/Header/MC/Bee.hpp +++ b/LiteLoader/include/llapi/mc/Bee.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/BeehiveBlock.hpp b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BeehiveBlock.hpp rename to LiteLoader/include/llapi/mc/BeehiveBlock.hpp index 96e947e..1301705 100644 --- a/LiteLoader/Header/MC/BeehiveBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeehiveBlockActor.hpp b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/BeehiveBlockActor.hpp rename to LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp index ceafa27..61e561d 100644 --- a/LiteLoader/Header/MC/BeehiveBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BeetrootBlock.hpp b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BeetrootBlock.hpp rename to LiteLoader/include/llapi/mc/BeetrootBlock.hpp index 120b469..a9d46e5 100644 --- a/LiteLoader/Header/MC/BeetrootBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "CropBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BegGoal.hpp b/LiteLoader/include/llapi/mc/BegGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/BegGoal.hpp rename to LiteLoader/include/llapi/mc/BegGoal.hpp index bc3bfbc..cb3d3d3 100644 --- a/LiteLoader/Header/MC/BegGoal.hpp +++ b/LiteLoader/include/llapi/mc/BegGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorComponent.hpp b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/BehaviorComponent.hpp rename to LiteLoader/include/llapi/mc/BehaviorComponent.hpp index 4489d05..e16f95d 100644 --- a/LiteLoader/Header/MC/BehaviorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorData.hpp b/LiteLoader/include/llapi/mc/BehaviorData.hpp similarity index 95% rename from LiteLoader/Header/MC/BehaviorData.hpp rename to LiteLoader/include/llapi/mc/BehaviorData.hpp index 65b88d1..bf2bd1f 100644 --- a/LiteLoader/Header/MC/BehaviorData.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorDefinition.hpp b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BehaviorDefinition.hpp rename to LiteLoader/include/llapi/mc/BehaviorDefinition.hpp index dc8ab7f..9583d14 100644 --- a/LiteLoader/Header/MC/BehaviorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorFactory.hpp b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp similarity index 97% rename from LiteLoader/Header/MC/BehaviorFactory.hpp rename to LiteLoader/include/llapi/mc/BehaviorFactory.hpp index 4bc2acc..7472b22 100644 --- a/LiteLoader/Header/MC/BehaviorFactory.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorNode.hpp b/LiteLoader/include/llapi/mc/BehaviorNode.hpp similarity index 95% rename from LiteLoader/Header/MC/BehaviorNode.hpp rename to LiteLoader/include/llapi/mc/BehaviorNode.hpp index 64b4f3c..7f6f1d5 100644 --- a/LiteLoader/Header/MC/BehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorNodeUtils.hpp b/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp similarity index 91% rename from LiteLoader/Header/MC/BehaviorNodeUtils.hpp rename to LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp index fbf8a93..57c4e3f 100644 --- a/LiteLoader/Header/MC/BehaviorNodeUtils.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorSystem.hpp b/LiteLoader/include/llapi/mc/BehaviorSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BehaviorSystem.hpp rename to LiteLoader/include/llapi/mc/BehaviorSystem.hpp index ecdbe48..6e86d86 100644 --- a/LiteLoader/Header/MC/BehaviorSystem.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorTreeDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp similarity index 96% rename from LiteLoader/Header/MC/BehaviorTreeDefinitionPtr.hpp rename to LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp index bf95302..2fbab56 100644 --- a/LiteLoader/Header/MC/BehaviorTreeDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorTreeDescription.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/BehaviorTreeDescription.hpp rename to LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp index b35ce53..198eccf 100644 --- a/LiteLoader/Header/MC/BehaviorTreeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BehaviorTreeGroup.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp similarity index 96% rename from LiteLoader/Header/MC/BehaviorTreeGroup.hpp rename to LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp index 9b1d453..4d560f7 100644 --- a/LiteLoader/Header/MC/BehaviorTreeGroup.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BellBlock.hpp b/LiteLoader/include/llapi/mc/BellBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BellBlock.hpp rename to LiteLoader/include/llapi/mc/BellBlock.hpp index c2a8b78..d755b7a 100644 --- a/LiteLoader/Header/MC/BellBlock.hpp +++ b/LiteLoader/include/llapi/mc/BellBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BellBlockActor.hpp b/LiteLoader/include/llapi/mc/BellBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/BellBlockActor.hpp rename to LiteLoader/include/llapi/mc/BellBlockActor.hpp index 4525547..c3affd4 100644 --- a/LiteLoader/Header/MC/BellBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Direction.hpp" #include "BlockActor.hpp" diff --git a/LiteLoader/Header/MC/BellBlockItem.hpp b/LiteLoader/include/llapi/mc/BellBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/BellBlockItem.hpp rename to LiteLoader/include/llapi/mc/BellBlockItem.hpp index 29ba74b..3be194b 100644 --- a/LiteLoader/Header/MC/BellBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BigEndianStringByteInput.hpp b/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp similarity index 97% rename from LiteLoader/Header/MC/BigEndianStringByteInput.hpp rename to LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp index c88378a..0f343ec 100644 --- a/LiteLoader/Header/MC/BigEndianStringByteInput.hpp +++ b/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StringByteInput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BinaryHeap.hpp b/LiteLoader/include/llapi/mc/BinaryHeap.hpp similarity index 95% rename from LiteLoader/Header/MC/BinaryHeap.hpp rename to LiteLoader/include/llapi/mc/BinaryHeap.hpp index a42db59..00f5bc8 100644 --- a/LiteLoader/Header/MC/BinaryHeap.hpp +++ b/LiteLoader/include/llapi/mc/BinaryHeap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BinaryStream.hpp b/LiteLoader/include/llapi/mc/BinaryStream.hpp similarity index 98% rename from LiteLoader/Header/MC/BinaryStream.hpp rename to LiteLoader/include/llapi/mc/BinaryStream.hpp index d70f75b..b0f2ae6 100644 --- a/LiteLoader/Header/MC/BinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ReadOnlyBinaryStream.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Biome.hpp b/LiteLoader/include/llapi/mc/Biome.hpp similarity index 98% rename from LiteLoader/Header/MC/Biome.hpp rename to LiteLoader/include/llapi/mc/Biome.hpp index 52d628e..2c9c10a 100644 --- a/LiteLoader/Header/MC/Biome.hpp +++ b/LiteLoader/include/llapi/mc/Biome.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/BiomeArea.hpp b/LiteLoader/include/llapi/mc/BiomeArea.hpp similarity index 95% rename from LiteLoader/Header/MC/BiomeArea.hpp rename to LiteLoader/include/llapi/mc/BiomeArea.hpp index 2d8c5a6..814f145 100644 --- a/LiteLoader/Header/MC/BiomeArea.hpp +++ b/LiteLoader/include/llapi/mc/BiomeArea.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeClimateSelectorLayer.hpp b/LiteLoader/include/llapi/mc/BiomeClimateSelectorLayer.hpp similarity index 97% rename from LiteLoader/Header/MC/BiomeClimateSelectorLayer.hpp rename to LiteLoader/include/llapi/mc/BiomeClimateSelectorLayer.hpp index cc9d0a0..c52e493 100644 --- a/LiteLoader/Header/MC/BiomeClimateSelectorLayer.hpp +++ b/LiteLoader/include/llapi/mc/BiomeClimateSelectorLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeComponentLoading.hpp b/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp similarity index 94% rename from LiteLoader/Header/MC/BiomeComponentLoading.hpp rename to LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp index cacf314..9942c19 100644 --- a/LiteLoader/Header/MC/BiomeComponentLoading.hpp +++ b/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeDecorationFeature.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/BiomeDecorationFeature.hpp rename to LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp index a769501..98e2023 100644 --- a/LiteLoader/Header/MC/BiomeDecorationFeature.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeDecorationSystem.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp similarity index 97% rename from LiteLoader/Header/MC/BiomeDecorationSystem.hpp rename to LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp index 06be007..3a7ef30 100644 --- a/LiteLoader/Header/MC/BiomeDecorationSystem.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/BiomeDefinitionListPacket.hpp rename to LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp index b06d7a6..f38ce10 100644 --- a/LiteLoader/Header/MC/BiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeFilterGroup.hpp b/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp similarity index 96% rename from LiteLoader/Header/MC/BiomeFilterGroup.hpp rename to LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp index d8737a1..1dbd661 100644 --- a/LiteLoader/Header/MC/BiomeFilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterGroup.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/BiomeIdCompatibility.hpp b/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp similarity index 92% rename from LiteLoader/Header/MC/BiomeIdCompatibility.hpp rename to LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp index 73d6009..b25766d 100644 --- a/LiteLoader/Header/MC/BiomeIdCompatibility.hpp +++ b/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeMetadata.hpp b/LiteLoader/include/llapi/mc/BiomeMetadata.hpp similarity index 94% rename from LiteLoader/Header/MC/BiomeMetadata.hpp rename to LiteLoader/include/llapi/mc/BiomeMetadata.hpp index e22f936..8616491 100644 --- a/LiteLoader/Header/MC/BiomeMetadata.hpp +++ b/LiteLoader/include/llapi/mc/BiomeMetadata.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeRegistry.hpp b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp similarity index 98% rename from LiteLoader/Header/MC/BiomeRegistry.hpp rename to LiteLoader/include/llapi/mc/BiomeRegistry.hpp index acee590..d09749c 100644 --- a/LiteLoader/Header/MC/BiomeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeRegistryMergeStrategy.hpp b/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp similarity index 96% rename from LiteLoader/Header/MC/BiomeRegistryMergeStrategy.hpp rename to LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp index 2922c9a..3ecaed2 100644 --- a/LiteLoader/Header/MC/BiomeRegistryMergeStrategy.hpp +++ b/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BiomeSurfaceSystem.hpp b/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp similarity index 93% rename from LiteLoader/Header/MC/BiomeSurfaceSystem.hpp rename to LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp index 8cb7c19..e4f63af 100644 --- a/LiteLoader/Header/MC/BiomeSurfaceSystem.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Blacklist.hpp b/LiteLoader/include/llapi/mc/Blacklist.hpp similarity index 97% rename from LiteLoader/Header/MC/Blacklist.hpp rename to LiteLoader/include/llapi/mc/Blacklist.hpp index e54b138..0b4e8d7 100644 --- a/LiteLoader/Header/MC/Blacklist.hpp +++ b/LiteLoader/include/llapi/mc/Blacklist.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlastFurnaceBlock.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BlastFurnaceBlock.hpp rename to LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp index f9788b3..43e2bc1 100644 --- a/LiteLoader/Header/MC/BlastFurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FurnaceBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlastFurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp similarity index 95% rename from LiteLoader/Header/MC/BlastFurnaceBlockActor.hpp rename to LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp index 7dfb53d..7396547 100644 --- a/LiteLoader/Header/MC/BlastFurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlastFurnaceContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp similarity index 96% rename from LiteLoader/Header/MC/BlastFurnaceContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp index 0e14101..1dd8dae 100644 --- a/LiteLoader/Header/MC/BlastFurnaceContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FurnaceContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Blaze.hpp b/LiteLoader/include/llapi/mc/Blaze.hpp similarity index 98% rename from LiteLoader/Header/MC/Blaze.hpp rename to LiteLoader/include/llapi/mc/Blaze.hpp index f583452..8c04982 100644 --- a/LiteLoader/Header/MC/Blaze.hpp +++ b/LiteLoader/include/llapi/mc/Blaze.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp similarity index 70% rename from LiteLoader/Header/MC/Block.hpp rename to LiteLoader/include/llapi/mc/Block.hpp index fa71030..dfcdd76 100644 --- a/LiteLoader/Header/MC/Block.hpp +++ b/LiteLoader/include/llapi/mc/Block.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares @@ -14,6 +14,12 @@ class Block { #define AFTER_EXTRA // Add new members to class public: + const unsigned short mData; + WeakPtr mLegacyBlock; + CompoundTag mSerializationId; + unsigned int mRuntimeId; + bool mHasRuntimeId; + LIAPI static Block* create(const string& str, unsigned short tileData); LIAPI static Block* create(CompoundTag* nbt); @@ -32,22 +38,27 @@ public: }; inline bool operator==(class Block const& a2) const { - __int64 v2; // r8 - __int64 v3; // rax - v2 = *(__int64*)(this + 16); - if (!v2 || (v3 = *(__int64*)(&a2 + 16)) == 0) - return false; - return v2 == v3 && *(unsigned short*)(this + 8) == *(unsigned short*)(&a2 + 8); +// __int64 v2; // r8 +// __int64 v3; // rax +// v2 = *(__int64*)(this + 16); +// if (!v2 || (v3 = *(__int64*)(&a2 + 16)) == 0) +// return false; +// return v2 == v3 && *(unsigned short*)(this + 8) == *(unsigned short*)(&a2 + 8); + return !(*this != a2); } inline bool operator!=(class Block const& a2) const { - __int64 v2; // r8 - __int64 v3; // rax - - v2 = *(__int64*)(this + 16); - if (!v2 || (v3 = *(__int64*)(&a2 + 16)) == 0) - return false; - return v2 != v3 || *(unsigned short*)(this + 8) != *(unsigned short*)(&a2 + 8); +// __int64 v2; // r8 +// __int64 v3; // rax +// +// v2 = *(__int64*)(this + 16); +// if (!v2 || (v3 = *(__int64*)(&a2 + 16)) == 0) +// return false; +// return v2 != v3 || *(unsigned short*)(this + 8) != *(unsigned short*)(&a2 + 8); + auto& rhs = a2.getLegacyBlock(); + if(this->getLegacyBlock() == rhs) + return this->mData != a2.mData; + return true; } #undef AFTER_EXTRA diff --git a/LiteLoader/Header/MC/BlockActor.hpp b/LiteLoader/include/llapi/mc/BlockActor.hpp similarity index 75% rename from LiteLoader/Header/MC/BlockActor.hpp rename to LiteLoader/include/llapi/mc/BlockActor.hpp index e41afde..28e9a3d 100644 --- a/LiteLoader/Header/MC/BlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlockActor.hpp @@ -1,26 +1,72 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares #include "BlockActorDataPacket.hpp" +#include "ActorTerrainInterlockData.hpp" class Block; class Container; class CompoundTag; class BlockSource; +enum BlockActorRendererId : int +{ + TR_DEFAULT_RENDERER = 0x0, + TR_CHEST_RENDERER = 0x1, + TR_SIGN_RENDERER = 0x2, + TR_MOBSPAWNER_RENDERER = 0x3, + TR_SKULL_RENDERER = 0x4, + TR_ENCHANTER_RENDERER = 0x5, + TR_PISTONARM_RENDERER = 0x6, + TR_ITEMFRAME_RENDERER = 0x7, + TR_MOVINGBLOCK_RENDERER = 0x8, + TR_CHALKBOARD_RENDERER = 0x9, + TR_BEACON_RENDERER = 0xA, + TR_ENDGATEWAY_RENDERER = 0xB, + TR_ENDERCHEST_RENDERER = 0xC, + TR_SHULKERBOX_RENDERER = 0xD, + TR_COMMANDBLOCK_RENDERER = 0xE, + TR_BED_RENDERER = 0xF, + TR_BANNER_RENDERER = 0x10, + TR_CONDUIT_RENDERER = 0x11, + TR_LECTERN_RENDERER = 0x12, + TR_BELL_RENDERER = 0x13, + TR_CAMPFIRE_RENDERER = 0x14, +}; + #undef BEFORE_EXTRA class BlockActor { #define AFTER_EXTRA // Add new members to class +public: + int mTickCount; + const Block *mBlock; + float mDestroyTimer; + Vec3 mDestroyDirection; + float mDestroyProgress; + BlockPos mPosition; + AABB mBB; + const BlockActorType mType; + BlockActorRendererId mRendererId; + std::string mCustomName; + std::string mFilteredCustomName; + int mRepairCost; + bool mClientSideOnly; + bool mIsMovable; + bool mSaveCustomName; + bool mCanRenderCustomName; + const float signShadowRadius; + ActorTerrainInterlockData mTerrainInterlockData; + bool mChanged; public: LIAPI bool refreshData(); - LIAPI bool refreshData(BlockSource* bs); + LIAPI bool refreshData(BlockSource* bs); LIAPI std::unique_ptr getNbt(); LIAPI bool setNbt(CompoundTag* nbt); LIAPI bool setNbt(CompoundTag* nbt, BlockSource* bs); @@ -28,16 +74,19 @@ public: inline void setChanged(){ //EndGatewayBlockActor::teleportEntity Line115 - dAccess(this) = 1; + //dAccess(this) = 1; + this->mChanged = true; } inline BlockPos const & getPosition() const{ //EndGatewayBlockActor::teleportEntity Line114 - return dAccess(this,44); + //return dAccess(this,44); + return this->mPosition; }; inline enum BlockActorType getType(){ //FlowerPotBlock::playerWillDestroy Line16 - return dAccess(this,21); + //return dAccess(this,21*4); + return this->mType; } inline std::unique_ptr getServerUpdatePacket(BlockSource &bs){ diff --git a/LiteLoader/Header/MC/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockActorDataPacket.hpp rename to LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp index e36237e..dce1ae4 100644 --- a/LiteLoader/Header/MC/BlockActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockActorFactory.hpp b/LiteLoader/include/llapi/mc/BlockActorFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockActorFactory.hpp rename to LiteLoader/include/llapi/mc/BlockActorFactory.hpp index 2d9f7ef..c3eb882 100644 --- a/LiteLoader/Header/MC/BlockActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockActorLevelListener.hpp b/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockActorLevelListener.hpp rename to LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp index a4399bb..87261b8 100644 --- a/LiteLoader/Header/MC/BlockActorLevelListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockBlobFeature.hpp b/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockBlobFeature.hpp rename to LiteLoader/include/llapi/mc/BlockBlobFeature.hpp index 8904d6e..6941b49 100644 --- a/LiteLoader/Header/MC/BlockBlobFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockBreakSensorComponent.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockBreakSensorComponent.hpp rename to LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp index d9ac285..8a3f92b 100644 --- a/LiteLoader/Header/MC/BlockBreakSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockBreakSensorDefinition.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockBreakSensorDefinition.hpp rename to LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp index be56002..4292e8c 100644 --- a/LiteLoader/Header/MC/BlockBreakSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockBreakSensorSystem.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockBreakSensorSystem.hpp rename to LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp index 851de8d..974f8ef 100644 --- a/LiteLoader/Header/MC/BlockBreakSensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockColorUtil.hpp b/LiteLoader/include/llapi/mc/BlockColorUtil.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockColorUtil.hpp rename to LiteLoader/include/llapi/mc/BlockColorUtil.hpp index 362107a..c427939 100644 --- a/LiteLoader/Header/MC/BlockColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/BlockColorUtil.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp index 45aa9dd..183a657 100644 --- a/LiteLoader/Header/MC/BlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/BlockComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockComponentDescription.hpp rename to LiteLoader/include/llapi/mc/BlockComponentDescription.hpp index a881e6f..a914b72 100644 --- a/LiteLoader/Header/MC/BlockComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockComponentFactory.hpp b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockComponentFactory.hpp rename to LiteLoader/include/llapi/mc/BlockComponentFactory.hpp index 1352887..82f8873 100644 --- a/LiteLoader/Header/MC/BlockComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockDefinition.hpp b/LiteLoader/include/llapi/mc/BlockDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockDefinition.hpp rename to LiteLoader/include/llapi/mc/BlockDefinition.hpp index 13f40a2..c768a1b 100644 --- a/LiteLoader/Header/MC/BlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockDefinitionGroup.hpp rename to LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp index 27778c1..48c8e15 100644 --- a/LiteLoader/Header/MC/BlockDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/BlockDescription.hpp b/LiteLoader/include/llapi/mc/BlockDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockDescription.hpp rename to LiteLoader/include/llapi/mc/BlockDescription.hpp index dc50bfd..f3456df 100644 --- a/LiteLoader/Header/MC/BlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockDestroyTimeDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestroyTimeDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockDestroyTimeDescription.hpp rename to LiteLoader/include/llapi/mc/BlockDestroyTimeDescription.hpp index a41f10c..5d040d0 100644 --- a/LiteLoader/Header/MC/BlockDestroyTimeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestroyTimeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockEventCoordinator.hpp b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp index 66a2c80..83ae737 100644 --- a/LiteLoader/Header/MC/BlockEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockEventDispatcher.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockEventDispatcher.hpp rename to LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp index d289816..9f0fbce 100644 --- a/LiteLoader/Header/MC/BlockEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockEventDispatcherToken.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockEventDispatcherToken.hpp rename to LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp index 20ab8f2..1dc4fa8 100644 --- a/LiteLoader/Header/MC/BlockEventDispatcherToken.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockEventListener.hpp b/LiteLoader/include/llapi/mc/BlockEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockEventListener.hpp rename to LiteLoader/include/llapi/mc/BlockEventListener.hpp index 2782fcb..2b8874e 100644 --- a/LiteLoader/Header/MC/BlockEventListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockEventPacket.hpp rename to LiteLoader/include/llapi/mc/BlockEventPacket.hpp index 9e1b368..c3886ad 100644 --- a/LiteLoader/Header/MC/BlockEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockExplodeableDescription.hpp b/LiteLoader/include/llapi/mc/BlockExplodeableDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockExplodeableDescription.hpp rename to LiteLoader/include/llapi/mc/BlockExplodeableDescription.hpp index c971db2..76de8eb 100644 --- a/LiteLoader/Header/MC/BlockExplodeableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockExplodeableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockFlammableDescription.hpp b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockFlammableDescription.hpp rename to LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp index 50acafa..193f2ef 100644 --- a/LiteLoader/Header/MC/BlockFlammableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockFrictionDescription.hpp b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockFrictionDescription.hpp rename to LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp index 6ac5eca..35f4863 100644 --- a/LiteLoader/Header/MC/BlockFrictionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockGraphics.hpp b/LiteLoader/include/llapi/mc/BlockGraphics.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockGraphics.hpp rename to LiteLoader/include/llapi/mc/BlockGraphics.hpp index 91e10cb..45a4ba4 100644 --- a/LiteLoader/Header/MC/BlockGraphics.hpp +++ b/LiteLoader/include/llapi/mc/BlockGraphics.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockID.hpp b/LiteLoader/include/llapi/mc/BlockID.hpp similarity index 94% rename from LiteLoader/Header/MC/BlockID.hpp rename to LiteLoader/include/llapi/mc/BlockID.hpp index 32bdf48..159e5b5 100644 --- a/LiteLoader/Header/MC/BlockID.hpp +++ b/LiteLoader/include/llapi/mc/BlockID.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockInstance.hpp b/LiteLoader/include/llapi/mc/BlockInstance.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockInstance.hpp rename to LiteLoader/include/llapi/mc/BlockInstance.hpp index e572e3c..d3ab5c9 100644 --- a/LiteLoader/Header/MC/BlockInstance.hpp +++ b/LiteLoader/include/llapi/mc/BlockInstance.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" class BlockSource; class Block; class ItemStack; diff --git a/LiteLoader/Header/MC/BlockIntersectionConstraint.hpp b/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockIntersectionConstraint.hpp rename to LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp index 71cf177..7021405 100644 --- a/LiteLoader/Header/MC/BlockIntersectionConstraint.hpp +++ b/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockIsNameTest.hpp b/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockIsNameTest.hpp rename to LiteLoader/include/llapi/mc/BlockIsNameTest.hpp index 049dbcc..621e621 100644 --- a/LiteLoader/Header/MC/BlockIsNameTest.hpp +++ b/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/BlockItem.hpp b/LiteLoader/include/llapi/mc/BlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockItem.hpp rename to LiteLoader/include/llapi/mc/BlockItem.hpp index 2f97d52..f6a6648 100644 --- a/LiteLoader/Header/MC/BlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockLegacy.hpp b/LiteLoader/include/llapi/mc/BlockLegacy.hpp similarity index 81% rename from LiteLoader/Header/MC/BlockLegacy.hpp rename to LiteLoader/include/llapi/mc/BlockLegacy.hpp index f973fe1..80c7a8a 100644 --- a/LiteLoader/Header/MC/BlockLegacy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp @@ -1,14 +1,96 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares +#include "SemVersion.hpp" +#include "Types.hpp" +#include "Brightness.hpp" +#include "LootComponent.hpp" +#include "ItemStateInstance.hpp" +#include "HashedString.hpp" + class Block; class BlockSource; class ItemStack; +class Material; +enum BlockRenderLayer : int +{ + RENDERLAYER_DOUBLE_SIDED = 0x0, + RENDERLAYER_BLEND_WATER = 0x1, + RENDERLAYER_ALPHATEST_MICRO_BLOCK = 0x2, + RENDERLAYER_RAY_TRACED_WATER = 0x3, + RENDERLAYER_BLEND = 0x4, + RENDERLAYER_OPAQUE = 0x5, + RENDERLAYER_OPTIONAL_ALPHATEST = 0x6, + RENDERLAYER_ALPHATEST = 0x7, + RENDERLAYER_SEASONS_OPAQUE = 0x8, + RENDERLAYER_SEASONS_OPTIONAL_ALPHATEST = 0x9, + RENDERLAYER_ALPHATEST_SINGLE_SIDE = 0xA, + RENDERLAYER_ENDPORTAL = 0xB, + RENDERLAYER_BARRIER = 0xC, + RENDERLAYER_STRUCTURE_VOID = 0xD, + _RENDERLAYER_COUNT = 0xE, +}; + +enum BlockProperty : __int64 +{ + None_43 = 0x0, + Stair = 0x1, + HalfSlab = 0x2, + Hopper_0 = 0x4, + TopSnow_0 = 0x8, + FenceGate = 0x10, + Leaf = 0x20, + ThinConnects2D = 0x40, + Connects2D = 0x80, + Carpet_0 = 0x100, + Button_0 = 0x200, + Door = 0x400, + Portal_3 = 0x800, + Heavy = 0x1000, + Snow_1 = 0x2000, + Trap = 0x4000, + Sign_0 = 0x8000, + Walkable = 0x10000, + PressurePlate = 0x20000, + PistonBlockGrabber = 0x40000, + TopSolidBlocking = 0x80000, + SolidBlocking = 0x100000, + CubeShaped = 0x200000, + Power_NO = 0x400000, + Power_BlockDown = 0x800000, + Immovable = 0x1000000, + BreakOnPush = 0x2000000, + Piston_1 = 0x4000000, + InfiniBurn = 0x8000000, + RequiresWorldBuilder = 0x10000000, + CausesDamage = 0x20000000, + BreaksWhenFallenOnByHeavy = 0x40000000, + OnlyPistonPush = 0x80000000, + Liquid_0 = 0x100000000, + CanBeBuiltOver = 0x200000000, + SnowRecoverable = 0x400000000, + Scaffolding = 0x800000000, + CanSupportCenterHangingBlock = 0x1000000000, + BreaksWhenHitByArrow = 0x2000000000, + Unwalkable = 0x4000000000, + Impenetrable = 0x8000000000, + Hollow = 0x10000000000, + OperatorBlock = 0x20000000000, + SupportedByFlowerPot = 0x40000000000, + PreventsJumping = 0x80000000000, + ContainsHoney = 0x100000000000, + Slime_2 = 0x200000000000, +}; + +class BaseGameVersion +{ + SemVersion mSemVersion; +}; #undef BEFORE_EXTRA class BlockLegacy { @@ -16,7 +98,63 @@ class BlockLegacy { #define AFTER_EXTRA // Add new members to class public: - struct NameInfo; +// std::string mDescriptionId; +// std::string mRawNameId; +// HashedString mNamespace; +// std::string mFullName; +// bool mFancy; +// BlockRenderLayer mRenderLayer; +// bool mRenderLayerCanRenderAsOpaque; +// BlockProperty mProperties; +// BlockActorType mBlockEntityType; +// bool mAnimatedTexture; +// float mBrightnessGamma; +// float mThickness; +// bool mCanSlide; +// bool mCanInstatick; +// bool mIsInteraction; +// float mGravity; +// const Material *mMaterial; +// Color mMapColor; +// float mFriction; +// bool mHeavy; +// float mParticleQuantityScalar; +// float mDestroySpeed; +// float mExplosionResistance; +// CreativeItemCategory mCreativeCategory; +// bool mAllowsRunes; +// bool mCanBeBrokenFromFalling; +// bool mSolid; +// bool mPushesOutItems; +// bool mIgnoreBlockForInsideCubeRenderer; +// bool mIsTrapdoor; +// bool mIsDoor; +// float mTranslucency; +// Brightness mLightBlock; +// Brightness mLightEmission; +// bool mShouldRandomTick; +// bool mShouldRandomTickExtraLayer; +// int mFlameOdds; +// int mBurnOdds; +// bool mIsMobPiece; +// bool mCanBeExtraBlock; +// bool mCanPropagateBrightness; +// unsigned int mID; +// BaseGameVersion mMinRequiredBaseGameVersion; +// bool mExperimental; +// bool mIsVanilla; +// std::unique_ptr mLootComponent; +// AABB mVisualShape; +// unsigned int mBitsUsed; +// unsigned int mTotalBitsUsed; +// std::array mStates; +// std::vector> mBlockPermutations; +// const Block *mDefaultState; +// std::mutex mLegacyDataLookupTableMutex; +// std::vector mLegacyDataLookupTable; +// +// +// struct NameInfo; LIAPI Block* toBlock(unsigned short tileData); LIAPI string getTypeName(); @@ -26,6 +164,7 @@ public: inline int getBlockItemId() const{ //ItemStackBase::init(ItemStackBase *this, const struct BlockLegacy *a2, int a3) Line14 unsigned int id = dAccess(this,268);//mID + // unsigned int id = this->mID; if(id < 256u) return id; else @@ -33,11 +172,12 @@ public: }; inline bool hasBlockEntity() const{ // LevelChunk::_removeCallbacks Line28 - return getBlockEntityType(); + return getBlockEntityType() == BlockActorType::UnKnow; } inline enum BlockActorType getBlockEntityType() const{ // LevelChunk::_removeCallbacks Line28 - return dAccess(this,168);; + return dAccess(this,168); + //return this->mBlockEntityType; }; #undef AFTER_EXTRA diff --git a/LiteLoader/Header/MC/BlockLightDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockLightDescription.hpp rename to LiteLoader/include/llapi/mc/BlockLightDescription.hpp index e193fb1..d3ec17b 100644 --- a/LiteLoader/Header/MC/BlockLightDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockLightEmissionDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockLightEmissionDescription.hpp rename to LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp index b0babb2..27a9fba 100644 --- a/LiteLoader/Header/MC/BlockLightEmissionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockListEventMap.hpp b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockListEventMap.hpp rename to LiteLoader/include/llapi/mc/BlockListEventMap.hpp index b9a819e..db68f79 100644 --- a/LiteLoader/Header/MC/BlockListEventMap.hpp +++ b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockListSerializer.hpp b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockListSerializer.hpp rename to LiteLoader/include/llapi/mc/BlockListSerializer.hpp index 4327535..f2ccb6e 100644 --- a/LiteLoader/Header/MC/BlockListSerializer.hpp +++ b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockMapColorDescription.hpp b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockMapColorDescription.hpp rename to LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp index 9ce05a5..745d4d3 100644 --- a/LiteLoader/Header/MC/BlockMapColorDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockPalette.hpp b/LiteLoader/include/llapi/mc/BlockPalette.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockPalette.hpp rename to LiteLoader/include/llapi/mc/BlockPalette.hpp index 2b1b91a..4928faf 100644 --- a/LiteLoader/Header/MC/BlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/BlockPalette.hpp @@ -1,11 +1,11 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA class BlockLegacy; -#include +#include "Bedrock.hpp" #undef BEFORE_EXTRA class BlockPalette { diff --git a/LiteLoader/Header/MC/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockPatternBuilder.hpp rename to LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp index fc270ca..8878843 100644 --- a/LiteLoader/Header/MC/BlockPatternBuilder.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockPickRequestPacket.hpp rename to LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp index 2193bfe..f4c96ea 100644 --- a/LiteLoader/Header/MC/BlockPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockPileFeature.hpp b/LiteLoader/include/llapi/mc/BlockPileFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockPileFeature.hpp rename to LiteLoader/include/llapi/mc/BlockPileFeature.hpp index 6876b25..32cb65c 100644 --- a/LiteLoader/Header/MC/BlockPileFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlockPileFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockPlanterItem.hpp b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockPlanterItem.hpp rename to LiteLoader/include/llapi/mc/BlockPlanterItem.hpp index 64499ed..247261c 100644 --- a/LiteLoader/Header/MC/BlockPlanterItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockPos.hpp b/LiteLoader/include/llapi/mc/BlockPos.hpp similarity index 99% rename from LiteLoader/Header/MC/BlockPos.hpp rename to LiteLoader/include/llapi/mc/BlockPos.hpp index 8e52ae3..1bcd96e 100644 --- a/LiteLoader/Header/MC/BlockPos.hpp +++ b/LiteLoader/include/llapi/mc/BlockPos.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" class Vec3; diff --git a/LiteLoader/Header/MC/BlockReducer.hpp b/LiteLoader/include/llapi/mc/BlockReducer.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockReducer.hpp rename to LiteLoader/include/llapi/mc/BlockReducer.hpp index 35b2fbb..3e74824 100644 --- a/LiteLoader/Header/MC/BlockReducer.hpp +++ b/LiteLoader/include/llapi/mc/BlockReducer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockSelector.hpp b/LiteLoader/include/llapi/mc/BlockSelector.hpp similarity index 94% rename from LiteLoader/Header/MC/BlockSelector.hpp rename to LiteLoader/include/llapi/mc/BlockSelector.hpp index 020b0b2..d45fd0e 100644 --- a/LiteLoader/Header/MC/BlockSelector.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockSerializationUtils.hpp b/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockSerializationUtils.hpp rename to LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp index 54fc9c8..3278f05 100644 --- a/LiteLoader/Header/MC/BlockSerializationUtils.hpp +++ b/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockSet.hpp b/LiteLoader/include/llapi/mc/BlockSet.hpp similarity index 94% rename from LiteLoader/Header/MC/BlockSet.hpp rename to LiteLoader/include/llapi/mc/BlockSet.hpp index d6542b1..08387dc 100644 --- a/LiteLoader/Header/MC/BlockSet.hpp +++ b/LiteLoader/include/llapi/mc/BlockSet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp similarity index 99% rename from LiteLoader/Header/MC/BlockSource.hpp rename to LiteLoader/include/llapi/mc/BlockSource.hpp index ea72848..9c996a1 100644 --- a/LiteLoader/Header/MC/BlockSource.hpp +++ b/LiteLoader/include/llapi/mc/BlockSource.hpp @@ -1,15 +1,15 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "BlockInstance.hpp" #include "Dimension.hpp" #undef BEFORE_EXTRA -#include "MC/LevelChunk.hpp" -#include "MC/ChunkPos.hpp" +#include "LevelChunk.hpp" +#include "ChunkPos.hpp" class BlockSource { #define AFTER_EXTRA diff --git a/LiteLoader/Header/MC/BlockSourceListener.hpp b/LiteLoader/include/llapi/mc/BlockSourceListener.hpp similarity index 98% rename from LiteLoader/Header/MC/BlockSourceListener.hpp rename to LiteLoader/include/llapi/mc/BlockSourceListener.hpp index 9edc69d..84791b2 100644 --- a/LiteLoader/Header/MC/BlockSourceListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockSourceListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockTickingQueue.hpp b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockTickingQueue.hpp rename to LiteLoader/include/llapi/mc/BlockTickingQueue.hpp index 7d57688..de5f372 100644 --- a/LiteLoader/Header/MC/BlockTickingQueue.hpp +++ b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/BlockTypeRegistry.hpp rename to LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp index 6236699..7f93389 100644 --- a/LiteLoader/Header/MC/BlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockUtils.hpp b/LiteLoader/include/llapi/mc/BlockUtils.hpp similarity index 95% rename from LiteLoader/Header/MC/BlockUtils.hpp rename to LiteLoader/include/llapi/mc/BlockUtils.hpp index 2e07458..34d0a4a 100644 --- a/LiteLoader/Header/MC/BlockUtils.hpp +++ b/LiteLoader/include/llapi/mc/BlockUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlockVolume.hpp b/LiteLoader/include/llapi/mc/BlockVolume.hpp similarity index 96% rename from LiteLoader/Header/MC/BlockVolume.hpp rename to LiteLoader/include/llapi/mc/BlockVolume.hpp index 57dd8f9..a73949c 100644 --- a/LiteLoader/Header/MC/BlockVolume.hpp +++ b/LiteLoader/include/llapi/mc/BlockVolume.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlueFireBlock.hpp b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BlueFireBlock.hpp rename to LiteLoader/include/llapi/mc/BlueFireBlock.hpp index 8717cdf..e137224 100644 --- a/LiteLoader/Header/MC/BlueFireBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlueIceBlock.hpp b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BlueIceBlock.hpp rename to LiteLoader/include/llapi/mc/BlueIceBlock.hpp index 70b575d..6f721c5 100644 --- a/LiteLoader/Header/MC/BlueIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BlueIceFeature.hpp b/LiteLoader/include/llapi/mc/BlueIceFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/BlueIceFeature.hpp rename to LiteLoader/include/llapi/mc/BlueIceFeature.hpp index 656ff28..fdd047a 100644 --- a/LiteLoader/Header/MC/BlueIceFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Boat.hpp b/LiteLoader/include/llapi/mc/Boat.hpp similarity index 99% rename from LiteLoader/Header/MC/Boat.hpp rename to LiteLoader/include/llapi/mc/Boat.hpp index 287da4e..97085e1 100644 --- a/LiteLoader/Header/MC/Boat.hpp +++ b/LiteLoader/include/llapi/mc/Boat.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoatFrictionHelper.hpp b/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp similarity index 91% rename from LiteLoader/Header/MC/BoatFrictionHelper.hpp rename to LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp index f2855fe..bafd4bd 100644 --- a/LiteLoader/Header/MC/BoatFrictionHelper.hpp +++ b/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoatItem.hpp b/LiteLoader/include/llapi/mc/BoatItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BoatItem.hpp rename to LiteLoader/include/llapi/mc/BoatItem.hpp index 313fc64..8283c29 100644 --- a/LiteLoader/Header/MC/BoatItem.hpp +++ b/LiteLoader/include/llapi/mc/BoatItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BodyControl.hpp b/LiteLoader/include/llapi/mc/BodyControl.hpp similarity index 95% rename from LiteLoader/Header/MC/BodyControl.hpp rename to LiteLoader/include/llapi/mc/BodyControl.hpp index 1253b88..1354419 100644 --- a/LiteLoader/Header/MC/BodyControl.hpp +++ b/LiteLoader/include/llapi/mc/BodyControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BodyControlSystem.hpp b/LiteLoader/include/llapi/mc/BodyControlSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BodyControlSystem.hpp rename to LiteLoader/include/llapi/mc/BodyControlSystem.hpp index 69cc1e9..12a4520 100644 --- a/LiteLoader/Header/MC/BodyControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/BodyControlSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoneAnimationChannel.hpp b/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp similarity index 95% rename from LiteLoader/Header/MC/BoneAnimationChannel.hpp rename to LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp index c789fdc..dcbebca 100644 --- a/LiteLoader/Header/MC/BoneAnimationChannel.hpp +++ b/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoneOrientation.hpp b/LiteLoader/include/llapi/mc/BoneOrientation.hpp similarity index 94% rename from LiteLoader/Header/MC/BoneOrientation.hpp rename to LiteLoader/include/llapi/mc/BoneOrientation.hpp index 862f8e4..8175a60 100644 --- a/LiteLoader/Header/MC/BoneOrientation.hpp +++ b/LiteLoader/include/llapi/mc/BoneOrientation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoneOrientationTransform.hpp b/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp similarity index 95% rename from LiteLoader/Header/MC/BoneOrientationTransform.hpp rename to LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp index 23b6682..4824016 100644 --- a/LiteLoader/Header/MC/BoneOrientationTransform.hpp +++ b/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BonusChestFeature.hpp b/LiteLoader/include/llapi/mc/BonusChestFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/BonusChestFeature.hpp rename to LiteLoader/include/llapi/mc/BonusChestFeature.hpp index f071006..387e9a2 100644 --- a/LiteLoader/Header/MC/BonusChestFeature.hpp +++ b/LiteLoader/include/llapi/mc/BonusChestFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BookCloningRecipe.hpp b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/BookCloningRecipe.hpp rename to LiteLoader/include/llapi/mc/BookCloningRecipe.hpp index d3bdc52..db0b1a2 100644 --- a/LiteLoader/Header/MC/BookCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/BookEditPacket.hpp rename to LiteLoader/include/llapi/mc/BookEditPacket.hpp index dbebfe2..b1da118 100644 --- a/LiteLoader/Header/MC/BookEditPacket.hpp +++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BookshelfBlock.hpp b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BookshelfBlock.hpp rename to LiteLoader/include/llapi/mc/BookshelfBlock.hpp index ef68655..5bc73f7 100644 --- a/LiteLoader/Header/MC/BookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoolOption.hpp b/LiteLoader/include/llapi/mc/BoolOption.hpp similarity index 96% rename from LiteLoader/Header/MC/BoolOption.hpp rename to LiteLoader/include/llapi/mc/BoolOption.hpp index 3023a39..8bc44b2 100644 --- a/LiteLoader/Header/MC/BoolOption.hpp +++ b/LiteLoader/include/llapi/mc/BoolOption.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Option.hpp" diff --git a/LiteLoader/Header/MC/BoostItem.hpp b/LiteLoader/include/llapi/mc/BoostItem.hpp similarity index 95% rename from LiteLoader/Header/MC/BoostItem.hpp rename to LiteLoader/include/llapi/mc/BoostItem.hpp index e705f36..243fadf 100644 --- a/LiteLoader/Header/MC/BoostItem.hpp +++ b/LiteLoader/include/llapi/mc/BoostItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoostableComponent.hpp b/LiteLoader/include/llapi/mc/BoostableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BoostableComponent.hpp rename to LiteLoader/include/llapi/mc/BoostableComponent.hpp index f887cf9..1ebe8f3 100644 --- a/LiteLoader/Header/MC/BoostableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BoostableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoostableDefinition.hpp b/LiteLoader/include/llapi/mc/BoostableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BoostableDefinition.hpp rename to LiteLoader/include/llapi/mc/BoostableDefinition.hpp index 1a2ffea..fe642cf 100644 --- a/LiteLoader/Header/MC/BoostableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BoostableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoostableSystem.hpp b/LiteLoader/include/llapi/mc/BoostableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BoostableSystem.hpp rename to LiteLoader/include/llapi/mc/BoostableSystem.hpp index c2c6053..09732cf 100644 --- a/LiteLoader/Header/MC/BoostableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BoostableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BorderBlock.hpp b/LiteLoader/include/llapi/mc/BorderBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BorderBlock.hpp rename to LiteLoader/include/llapi/mc/BorderBlock.hpp index 3eeb953..74bd7ed 100644 --- a/LiteLoader/Header/MC/BorderBlock.hpp +++ b/LiteLoader/include/llapi/mc/BorderBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "WallBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BossComponent.hpp b/LiteLoader/include/llapi/mc/BossComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BossComponent.hpp rename to LiteLoader/include/llapi/mc/BossComponent.hpp index 3a3d2b0..cb71598 100644 --- a/LiteLoader/Header/MC/BossComponent.hpp +++ b/LiteLoader/include/llapi/mc/BossComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BossDefinition.hpp b/LiteLoader/include/llapi/mc/BossDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/BossDefinition.hpp rename to LiteLoader/include/llapi/mc/BossDefinition.hpp index 9516e7e..9ed794b 100644 --- a/LiteLoader/Header/MC/BossDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BossDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BossEventPacket.hpp b/LiteLoader/include/llapi/mc/BossEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/BossEventPacket.hpp rename to LiteLoader/include/llapi/mc/BossEventPacket.hpp index 8a58ea3..d5c4905 100644 --- a/LiteLoader/Header/MC/BossEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BossEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BossSystem.hpp b/LiteLoader/include/llapi/mc/BossSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BossSystem.hpp rename to LiteLoader/include/llapi/mc/BossSystem.hpp index 032ad4a..384faa7 100644 --- a/LiteLoader/Header/MC/BossSystem.hpp +++ b/LiteLoader/include/llapi/mc/BossSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BottleItem.hpp b/LiteLoader/include/llapi/mc/BottleItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BottleItem.hpp rename to LiteLoader/include/llapi/mc/BottleItem.hpp index 311b2e0..d8c74b9 100644 --- a/LiteLoader/Header/MC/BottleItem.hpp +++ b/LiteLoader/include/llapi/mc/BottleItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BoundingBox.hpp b/LiteLoader/include/llapi/mc/BoundingBox.hpp similarity index 99% rename from LiteLoader/Header/MC/BoundingBox.hpp rename to LiteLoader/include/llapi/mc/BoundingBox.hpp index 3e14146..cc80966 100644 --- a/LiteLoader/Header/MC/BoundingBox.hpp +++ b/LiteLoader/include/llapi/mc/BoundingBox.hpp @@ -1,6 +1,6 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once -#include "../Global.h" +#include "llapi/Global.h" class BoundingBox { diff --git a/LiteLoader/Header/MC/Bounds.hpp b/LiteLoader/include/llapi/mc/Bounds.hpp similarity index 95% rename from LiteLoader/Header/MC/Bounds.hpp rename to LiteLoader/include/llapi/mc/Bounds.hpp index 4b20eb8..88e4a9c 100644 --- a/LiteLoader/Header/MC/Bounds.hpp +++ b/LiteLoader/include/llapi/mc/Bounds.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BowEnchant.hpp b/LiteLoader/include/llapi/mc/BowEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/BowEnchant.hpp rename to LiteLoader/include/llapi/mc/BowEnchant.hpp index d4187a1..21cfd08 100644 --- a/LiteLoader/Header/MC/BowEnchant.hpp +++ b/LiteLoader/include/llapi/mc/BowEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BowItem.hpp b/LiteLoader/include/llapi/mc/BowItem.hpp similarity index 98% rename from LiteLoader/Header/MC/BowItem.hpp rename to LiteLoader/include/llapi/mc/BowItem.hpp index 8a1324b..4e8c349 100644 --- a/LiteLoader/Header/MC/BowItem.hpp +++ b/LiteLoader/include/llapi/mc/BowItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakBlockDefinition.hpp b/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp index 92157d4..488f583 100644 --- a/LiteLoader/Header/MC/BreakBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/BreakBlockNode.hpp b/LiteLoader/include/llapi/mc/BreakBlockNode.hpp similarity index 95% rename from LiteLoader/Header/MC/BreakBlockNode.hpp rename to LiteLoader/include/llapi/mc/BreakBlockNode.hpp index b5c9801..3a31d47 100644 --- a/LiteLoader/Header/MC/BreakBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlockNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakBlocksComponent.hpp b/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakBlocksComponent.hpp rename to LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp index 5974a79..3a91442 100644 --- a/LiteLoader/Header/MC/BreakBlocksComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakBlocksDescription.hpp b/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakBlocksDescription.hpp rename to LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp index 1e4e5dc..5a639ac 100644 --- a/LiteLoader/Header/MC/BreakBlocksDescription.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakBlocksSystem.hpp b/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BreakBlocksSystem.hpp rename to LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp index 27d54d7..0e410a5 100644 --- a/LiteLoader/Header/MC/BreakBlocksSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakDoorAnnotationComponent.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakDoorAnnotationComponent.hpp rename to LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp index 4bf790c..15858e0 100644 --- a/LiteLoader/Header/MC/BreakDoorAnnotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakDoorAnnotationDescription.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakDoorAnnotationDescription.hpp rename to LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp index 7f78634..7cded82 100644 --- a/LiteLoader/Header/MC/BreakDoorAnnotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakDoorAnnotationSystem.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakDoorAnnotationSystem.hpp rename to LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp index 588c4ec..341778b 100644 --- a/LiteLoader/Header/MC/BreakDoorAnnotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreakDoorGoal.hpp b/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/BreakDoorGoal.hpp rename to LiteLoader/include/llapi/mc/BreakDoorGoal.hpp index 60bc3c8..87b9503 100644 --- a/LiteLoader/Header/MC/BreakDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreathableComponent.hpp b/LiteLoader/include/llapi/mc/BreathableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BreathableComponent.hpp rename to LiteLoader/include/llapi/mc/BreathableComponent.hpp index 3429271..2793dde 100644 --- a/LiteLoader/Header/MC/BreathableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreathableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreathableDefinition.hpp b/LiteLoader/include/llapi/mc/BreathableDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/BreathableDefinition.hpp rename to LiteLoader/include/llapi/mc/BreathableDefinition.hpp index 06c2f97..1507795 100644 --- a/LiteLoader/Header/MC/BreathableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreathableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreathableSystem.hpp b/LiteLoader/include/llapi/mc/BreathableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BreathableSystem.hpp rename to LiteLoader/include/llapi/mc/BreathableSystem.hpp index 0c53181..3af0713 100644 --- a/LiteLoader/Header/MC/BreathableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreathableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreatheAirGoal.hpp b/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/BreatheAirGoal.hpp rename to LiteLoader/include/llapi/mc/BreatheAirGoal.hpp index 04f9389..893d49a 100644 --- a/LiteLoader/Header/MC/BreatheAirGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreedGoal.hpp b/LiteLoader/include/llapi/mc/BreedGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/BreedGoal.hpp rename to LiteLoader/include/llapi/mc/BreedGoal.hpp index da82280..e37871e 100644 --- a/LiteLoader/Header/MC/BreedGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreedGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreedableComponent.hpp b/LiteLoader/include/llapi/mc/BreedableComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/BreedableComponent.hpp rename to LiteLoader/include/llapi/mc/BreedableComponent.hpp index b6b3633..2fedf94 100644 --- a/LiteLoader/Header/MC/BreedableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreedableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreedableDefinition.hpp b/LiteLoader/include/llapi/mc/BreedableDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/BreedableDefinition.hpp rename to LiteLoader/include/llapi/mc/BreedableDefinition.hpp index 2bdccfa..d7094c6 100644 --- a/LiteLoader/Header/MC/BreedableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreedableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreedableSystem.hpp b/LiteLoader/include/llapi/mc/BreedableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BreedableSystem.hpp rename to LiteLoader/include/llapi/mc/BreedableSystem.hpp index c4c9d3d..c60985e 100644 --- a/LiteLoader/Header/MC/BreedableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreedableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BreedableType.hpp b/LiteLoader/include/llapi/mc/BreedableType.hpp similarity index 94% rename from LiteLoader/Header/MC/BreedableType.hpp rename to LiteLoader/include/llapi/mc/BreedableType.hpp index 7359893..a9d586c 100644 --- a/LiteLoader/Header/MC/BreedableType.hpp +++ b/LiteLoader/include/llapi/mc/BreedableType.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BrewingStandBlock.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BrewingStandBlock.hpp rename to LiteLoader/include/llapi/mc/BrewingStandBlock.hpp index ff0ebe6..9ec0154 100644 --- a/LiteLoader/Header/MC/BrewingStandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BrewingStandBlockActor.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/BrewingStandBlockActor.hpp rename to LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp index f14f954..b21cf4f 100644 --- a/LiteLoader/Header/MC/BrewingStandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BrewingStandContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/BrewingStandContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp index e3f8f16..22eb363 100644 --- a/LiteLoader/Header/MC/BrewingStandContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BribeableComponent.hpp b/LiteLoader/include/llapi/mc/BribeableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BribeableComponent.hpp rename to LiteLoader/include/llapi/mc/BribeableComponent.hpp index a8af4c5..cb689b9 100644 --- a/LiteLoader/Header/MC/BribeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BribeableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BribeableDefinition.hpp b/LiteLoader/include/llapi/mc/BribeableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/BribeableDefinition.hpp rename to LiteLoader/include/llapi/mc/BribeableDefinition.hpp index 9f26164..02a3712 100644 --- a/LiteLoader/Header/MC/BribeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BribeableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BribeableSystem.hpp b/LiteLoader/include/llapi/mc/BribeableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BribeableSystem.hpp rename to LiteLoader/include/llapi/mc/BribeableSystem.hpp index b4d9b50..90b5b2b 100644 --- a/LiteLoader/Header/MC/BribeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BribeableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Brightness.hpp b/LiteLoader/include/llapi/mc/Brightness.hpp similarity index 95% rename from LiteLoader/Header/MC/Brightness.hpp rename to LiteLoader/include/llapi/mc/Brightness.hpp index 4a9bf74..f631b15 100644 --- a/LiteLoader/Header/MC/Brightness.hpp +++ b/LiteLoader/include/llapi/mc/Brightness.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BubbleColumnBlock.hpp b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/BubbleColumnBlock.hpp rename to LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp index 884e1e0..4dc2984 100644 --- a/LiteLoader/Header/MC/BubbleColumnBlock.hpp +++ b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BucketItem.hpp b/LiteLoader/include/llapi/mc/BucketItem.hpp similarity index 99% rename from LiteLoader/Header/MC/BucketItem.hpp rename to LiteLoader/include/llapi/mc/BucketItem.hpp index 908e59e..b2fd93b 100644 --- a/LiteLoader/Header/MC/BucketItem.hpp +++ b/LiteLoader/include/llapi/mc/BucketItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BucketableComponent.hpp b/LiteLoader/include/llapi/mc/BucketableComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/BucketableComponent.hpp rename to LiteLoader/include/llapi/mc/BucketableComponent.hpp index f7dff9e..e9d19be 100644 --- a/LiteLoader/Header/MC/BucketableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BucketableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BucketableDescription.hpp b/LiteLoader/include/llapi/mc/BucketableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/BucketableDescription.hpp rename to LiteLoader/include/llapi/mc/BucketableDescription.hpp index 68d9c27..94d937e 100644 --- a/LiteLoader/Header/MC/BucketableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BucketableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BuoyancyComponent.hpp b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/BuoyancyComponent.hpp rename to LiteLoader/include/llapi/mc/BuoyancyComponent.hpp index 48f61fc..730170c 100644 --- a/LiteLoader/Header/MC/BuoyancyComponent.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BuoyancyDefinition.hpp b/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/BuoyancyDefinition.hpp rename to LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp index 5563596..b9718c2 100644 --- a/LiteLoader/Header/MC/BuoyancyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/BuoyancySystem.hpp b/LiteLoader/include/llapi/mc/BuoyancySystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BuoyancySystem.hpp rename to LiteLoader/include/llapi/mc/BuoyancySystem.hpp index 32edf46..065f9d4 100644 --- a/LiteLoader/Header/MC/BuoyancySystem.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancySystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BuriedTreasureFeature.hpp b/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/BuriedTreasureFeature.hpp rename to LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp index 54af08a..571d90e 100644 --- a/LiteLoader/Header/MC/BuriedTreasureFeature.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BuriedTreasurePiece.hpp b/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp similarity index 97% rename from LiteLoader/Header/MC/BuriedTreasurePiece.hpp rename to LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp index 2a05db7..8a192b9 100644 --- a/LiteLoader/Header/MC/BuriedTreasurePiece.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BuriedTreasureStart.hpp b/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp similarity index 96% rename from LiteLoader/Header/MC/BuriedTreasureStart.hpp rename to LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp index 4bb24c8..78cf825 100644 --- a/LiteLoader/Header/MC/BuriedTreasureStart.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BurnsInDaylightSystem.hpp b/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/BurnsInDaylightSystem.hpp rename to LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp index 982234b..49f13b3 100644 --- a/LiteLoader/Header/MC/BurnsInDaylightSystem.hpp +++ b/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BurstReactionComponent.hpp b/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/BurstReactionComponent.hpp rename to LiteLoader/include/llapi/mc/BurstReactionComponent.hpp index 4a9883b..696a373 100644 --- a/LiteLoader/Header/MC/BurstReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BushBlock.hpp b/LiteLoader/include/llapi/mc/BushBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/BushBlock.hpp rename to LiteLoader/include/llapi/mc/BushBlock.hpp index ef8343b..056c7d2 100644 --- a/LiteLoader/Header/MC/BushBlock.hpp +++ b/LiteLoader/include/llapi/mc/BushBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ButtonBlock.hpp b/LiteLoader/include/llapi/mc/ButtonBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ButtonBlock.hpp rename to LiteLoader/include/llapi/mc/ButtonBlock.hpp index cddf850..edfb34a 100644 --- a/LiteLoader/Header/MC/ButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/ButtonBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ByteArrayTag.hpp b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp similarity index 98% rename from LiteLoader/Header/MC/ByteArrayTag.hpp rename to LiteLoader/include/llapi/mc/ByteArrayTag.hpp index 8db3025..b5f3ee2 100644 --- a/LiteLoader/Header/MC/ByteArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ByteTag.hpp b/LiteLoader/include/llapi/mc/ByteTag.hpp similarity index 97% rename from LiteLoader/Header/MC/ByteTag.hpp rename to LiteLoader/include/llapi/mc/ByteTag.hpp index a3d14cd..84c8aff 100644 --- a/LiteLoader/Header/MC/ByteTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BytesDataInput.hpp b/LiteLoader/include/llapi/mc/BytesDataInput.hpp similarity index 96% rename from LiteLoader/Header/MC/BytesDataInput.hpp rename to LiteLoader/include/llapi/mc/BytesDataInput.hpp index cc6e467..affcb6f 100644 --- a/LiteLoader/Header/MC/BytesDataInput.hpp +++ b/LiteLoader/include/llapi/mc/BytesDataInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/BytesDataOutput.hpp b/LiteLoader/include/llapi/mc/BytesDataOutput.hpp similarity index 96% rename from LiteLoader/Header/MC/BytesDataOutput.hpp rename to LiteLoader/include/llapi/mc/BytesDataOutput.hpp index a54fe26..47fedc8 100644 --- a/LiteLoader/Header/MC/BytesDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/BytesDataOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CDScopedEvent.hpp b/LiteLoader/include/llapi/mc/CDScopedEvent.hpp similarity index 94% rename from LiteLoader/Header/MC/CDScopedEvent.hpp rename to LiteLoader/include/llapi/mc/CDScopedEvent.hpp index 478c00d..e4514a0 100644 --- a/LiteLoader/Header/MC/CDScopedEvent.hpp +++ b/LiteLoader/include/llapi/mc/CDScopedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CSHA1.hpp b/LiteLoader/include/llapi/mc/CSHA1.hpp similarity index 95% rename from LiteLoader/Header/MC/CSHA1.hpp rename to LiteLoader/include/llapi/mc/CSHA1.hpp index 9782401..f7b37d1 100644 --- a/LiteLoader/Header/MC/CSHA1.hpp +++ b/LiteLoader/include/llapi/mc/CSHA1.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CactusBlock.hpp b/LiteLoader/include/llapi/mc/CactusBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CactusBlock.hpp rename to LiteLoader/include/llapi/mc/CactusBlock.hpp index a00111a..d1a77ff 100644 --- a/LiteLoader/Header/MC/CactusBlock.hpp +++ b/LiteLoader/include/llapi/mc/CactusBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CactusFeature.hpp b/LiteLoader/include/llapi/mc/CactusFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/CactusFeature.hpp rename to LiteLoader/include/llapi/mc/CactusFeature.hpp index 4d4c5c3..d778a07 100644 --- a/LiteLoader/Header/MC/CactusFeature.hpp +++ b/LiteLoader/include/llapi/mc/CactusFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CakeBlock.hpp b/LiteLoader/include/llapi/mc/CakeBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CakeBlock.hpp rename to LiteLoader/include/llapi/mc/CakeBlock.hpp index aecf86f..c446921 100644 --- a/LiteLoader/Header/MC/CakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CakeBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CameraBlock.hpp b/LiteLoader/include/llapi/mc/CameraBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CameraBlock.hpp rename to LiteLoader/include/llapi/mc/CameraBlock.hpp index 73bf929..ab5a6f3 100644 --- a/LiteLoader/Header/MC/CameraBlock.hpp +++ b/LiteLoader/include/llapi/mc/CameraBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CameraItem.hpp b/LiteLoader/include/llapi/mc/CameraItem.hpp similarity index 97% rename from LiteLoader/Header/MC/CameraItem.hpp rename to LiteLoader/include/llapi/mc/CameraItem.hpp index e065a54..54fdb5b 100644 --- a/LiteLoader/Header/MC/CameraItem.hpp +++ b/LiteLoader/include/llapi/mc/CameraItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CameraItemComponent.hpp b/LiteLoader/include/llapi/mc/CameraItemComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/CameraItemComponent.hpp rename to LiteLoader/include/llapi/mc/CameraItemComponent.hpp index 71f8b52..163e3d7 100644 --- a/LiteLoader/Header/MC/CameraItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/CameraItemComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CameraPacket.hpp b/LiteLoader/include/llapi/mc/CameraPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CameraPacket.hpp rename to LiteLoader/include/llapi/mc/CameraPacket.hpp index f02c008..1eee4fe 100644 --- a/LiteLoader/Header/MC/CameraPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CampfireBlock.hpp b/LiteLoader/include/llapi/mc/CampfireBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CampfireBlock.hpp rename to LiteLoader/include/llapi/mc/CampfireBlock.hpp index d70c67d..e2afbcb 100644 --- a/LiteLoader/Header/MC/CampfireBlock.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CampfireBlockActor.hpp b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/CampfireBlockActor.hpp rename to LiteLoader/include/llapi/mc/CampfireBlockActor.hpp index 32d38e9..16551a5 100644 --- a/LiteLoader/Header/MC/CampfireBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CanClimbDescription.hpp b/LiteLoader/include/llapi/mc/CanClimbDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/CanClimbDescription.hpp rename to LiteLoader/include/llapi/mc/CanClimbDescription.hpp index 2739082..a3468db 100644 --- a/LiteLoader/Header/MC/CanClimbDescription.hpp +++ b/LiteLoader/include/llapi/mc/CanClimbDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CanFlyDescription.hpp b/LiteLoader/include/llapi/mc/CanFlyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/CanFlyDescription.hpp rename to LiteLoader/include/llapi/mc/CanFlyDescription.hpp index 954791f..a7fcf54 100644 --- a/LiteLoader/Header/MC/CanFlyDescription.hpp +++ b/LiteLoader/include/llapi/mc/CanFlyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CanPowerJumpDescription.hpp b/LiteLoader/include/llapi/mc/CanPowerJumpDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/CanPowerJumpDescription.hpp rename to LiteLoader/include/llapi/mc/CanPowerJumpDescription.hpp index 3abe516..adf2ca7 100644 --- a/LiteLoader/Header/MC/CanPowerJumpDescription.hpp +++ b/LiteLoader/include/llapi/mc/CanPowerJumpDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CanyonFeature.hpp b/LiteLoader/include/llapi/mc/CanyonFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/CanyonFeature.hpp rename to LiteLoader/include/llapi/mc/CanyonFeature.hpp index 3fd2a7a..2efd9b3 100644 --- a/LiteLoader/Header/MC/CanyonFeature.hpp +++ b/LiteLoader/include/llapi/mc/CanyonFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CapacitorComponent.hpp b/LiteLoader/include/llapi/mc/CapacitorComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/CapacitorComponent.hpp rename to LiteLoader/include/llapi/mc/CapacitorComponent.hpp index 479acdd..5f23f2d 100644 --- a/LiteLoader/Header/MC/CapacitorComponent.hpp +++ b/LiteLoader/include/llapi/mc/CapacitorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CarrotBlock.hpp b/LiteLoader/include/llapi/mc/CarrotBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CarrotBlock.hpp rename to LiteLoader/include/llapi/mc/CarrotBlock.hpp index 7ed98b1..6f66061 100644 --- a/LiteLoader/Header/MC/CarrotBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarrotBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "CropBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CarrotOnAStickItem.hpp b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CarrotOnAStickItem.hpp rename to LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp index 5783483..86c7edc 100644 --- a/LiteLoader/Header/MC/CarrotOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CartographyContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/CartographyContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp index cfed539..394ec9b 100644 --- a/LiteLoader/Header/MC/CartographyContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CartographyTableBlock.hpp b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CartographyTableBlock.hpp rename to LiteLoader/include/llapi/mc/CartographyTableBlock.hpp index 51ef95c..46aea93 100644 --- a/LiteLoader/Header/MC/CartographyTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Cat.hpp b/LiteLoader/include/llapi/mc/Cat.hpp similarity index 98% rename from LiteLoader/Header/MC/Cat.hpp rename to LiteLoader/include/llapi/mc/Cat.hpp index 52f28d0..a0478eb 100644 --- a/LiteLoader/Header/MC/Cat.hpp +++ b/LiteLoader/include/llapi/mc/Cat.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/CatchFireSubcomponent.hpp b/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/CatchFireSubcomponent.hpp rename to LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp index 22c60d9..27fb373 100644 --- a/LiteLoader/Header/MC/CatchFireSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CauldronBlock.hpp b/LiteLoader/include/llapi/mc/CauldronBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CauldronBlock.hpp rename to LiteLoader/include/llapi/mc/CauldronBlock.hpp index 84ff695..e291f7a 100644 --- a/LiteLoader/Header/MC/CauldronBlock.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MinecraftEventing.hpp" #include "ActorBlock.hpp" diff --git a/LiteLoader/Header/MC/CauldronBlockActor.hpp b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/CauldronBlockActor.hpp rename to LiteLoader/include/llapi/mc/CauldronBlockActor.hpp index ef49876..152f556 100644 --- a/LiteLoader/Header/MC/CauldronBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CaveSpider.hpp b/LiteLoader/include/llapi/mc/CaveSpider.hpp similarity index 98% rename from LiteLoader/Header/MC/CaveSpider.hpp rename to LiteLoader/include/llapi/mc/CaveSpider.hpp index 75b50e6..1d97dc1 100644 --- a/LiteLoader/Header/MC/CaveSpider.hpp +++ b/LiteLoader/include/llapi/mc/CaveSpider.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Spider.hpp" diff --git a/LiteLoader/Header/MC/CelebrateHuntDefinition.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/CelebrateHuntDefinition.hpp rename to LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp index d30bdb6..9638b6b 100644 --- a/LiteLoader/Header/MC/CelebrateHuntDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CelebrateHuntSystem.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/CelebrateHuntSystem.hpp rename to LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp index 42ed00c..c97c78c 100644 --- a/LiteLoader/Header/MC/CelebrateHuntSystem.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CelebrateHuntSystemInternal.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp similarity index 94% rename from LiteLoader/Header/MC/CelebrateHuntSystemInternal.hpp rename to LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp index 01e77e4..12b4350 100644 --- a/LiteLoader/Header/MC/CelebrateHuntSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CentralSpikedFeature.hpp b/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/CentralSpikedFeature.hpp rename to LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp index 73c1274..27fae26 100644 --- a/LiteLoader/Header/MC/CentralSpikedFeature.hpp +++ b/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Certificate.hpp b/LiteLoader/include/llapi/mc/Certificate.hpp similarity index 96% rename from LiteLoader/Header/MC/Certificate.hpp rename to LiteLoader/include/llapi/mc/Certificate.hpp index b60c104..164a20f 100644 --- a/LiteLoader/Header/MC/Certificate.hpp +++ b/LiteLoader/include/llapi/mc/Certificate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChainBlock.hpp b/LiteLoader/include/llapi/mc/ChainBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ChainBlock.hpp rename to LiteLoader/include/llapi/mc/ChainBlock.hpp index afcd9cc..a7bac39 100644 --- a/LiteLoader/Header/MC/ChainBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChainBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChalkboardBlockActor.hpp b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ChalkboardBlockActor.hpp rename to LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp index cabc678..1bfadd4 100644 --- a/LiteLoader/Header/MC/ChalkboardBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChanceInformation.hpp b/LiteLoader/include/llapi/mc/ChanceInformation.hpp similarity index 95% rename from LiteLoader/Header/MC/ChanceInformation.hpp rename to LiteLoader/include/llapi/mc/ChanceInformation.hpp index 5c75243..969b0af 100644 --- a/LiteLoader/Header/MC/ChanceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ChanceInformation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChangeDimensionPacket.hpp b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ChangeDimensionPacket.hpp rename to LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp index 302f4df..78f90fb 100644 --- a/LiteLoader/Header/MC/ChangeDimensionPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChangeSettingCommand.hpp b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ChangeSettingCommand.hpp rename to LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp index d585ac2..4da8a8d 100644 --- a/LiteLoader/Header/MC/ChangeSettingCommand.hpp +++ b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChargeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ChargeAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp index d2de680..8193dd7 100644 --- a/LiteLoader/Header/MC/ChargeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChargeAttackGoal.hpp b/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ChargeAttackGoal.hpp rename to LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp index 724304e..1fb9cb1 100644 --- a/LiteLoader/Header/MC/ChargeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChargeHeldItemDefinition.hpp b/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/ChargeHeldItemDefinition.hpp rename to LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp index ece5da3..5fc725c 100644 --- a/LiteLoader/Header/MC/ChargeHeldItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChargeHeldItemGoal.hpp b/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ChargeHeldItemGoal.hpp rename to LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp index 7a1042b..ba2211d 100644 --- a/LiteLoader/Header/MC/ChargeHeldItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemicalHeatBlock.hpp b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ChemicalHeatBlock.hpp rename to LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp index 0e9243a..24eaf3b 100644 --- a/LiteLoader/Header/MC/ChemicalHeatBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryAuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ChemistryAuxDataBlockItem.hpp rename to LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp index b11a3a1..5c67734 100644 --- a/LiteLoader/Header/MC/ChemistryAuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AuxDataBlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryIngredient.hpp b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp similarity index 95% rename from LiteLoader/Header/MC/ChemistryIngredient.hpp rename to LiteLoader/include/llapi/mc/ChemistryIngredient.hpp index 92efffe..fb23f7a 100644 --- a/LiteLoader/Header/MC/ChemistryIngredient.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryItem.hpp b/LiteLoader/include/llapi/mc/ChemistryItem.hpp similarity index 97% rename from LiteLoader/Header/MC/ChemistryItem.hpp rename to LiteLoader/include/llapi/mc/ChemistryItem.hpp index af6e475..dd8a1e8 100644 --- a/LiteLoader/Header/MC/ChemistryItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryRecipes.hpp b/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp similarity index 95% rename from LiteLoader/Header/MC/ChemistryRecipes.hpp rename to LiteLoader/include/llapi/mc/ChemistryRecipes.hpp index 93b6e59..d30e9f9 100644 --- a/LiteLoader/Header/MC/ChemistryRecipes.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryStickItem.hpp b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ChemistryStickItem.hpp rename to LiteLoader/include/llapi/mc/ChemistryStickItem.hpp index 333f404..a3fab71 100644 --- a/LiteLoader/Header/MC/ChemistryStickItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryTableBlock.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ChemistryTableBlock.hpp rename to LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp index cec5295..1ef6d6d 100644 --- a/LiteLoader/Header/MC/ChemistryTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChemistryTableBlockActor.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ChemistryTableBlockActor.hpp rename to LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp index 1385bb0..19d1b1f 100644 --- a/LiteLoader/Header/MC/ChemistryTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChestBlock.hpp b/LiteLoader/include/llapi/mc/ChestBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ChestBlock.hpp rename to LiteLoader/include/llapi/mc/ChestBlock.hpp index dde9197..149e3e7 100644 --- a/LiteLoader/Header/MC/ChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChestBlockActor.hpp b/LiteLoader/include/llapi/mc/ChestBlockActor.hpp similarity index 99% rename from LiteLoader/Header/MC/ChestBlockActor.hpp rename to LiteLoader/include/llapi/mc/ChestBlockActor.hpp index 630841e..7ef4cc5 100644 --- a/LiteLoader/Header/MC/ChestBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChestContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/ChestContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp index d7fa577..a4db67b 100644 --- a/LiteLoader/Header/MC/ChestContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Chicken.hpp b/LiteLoader/include/llapi/mc/Chicken.hpp similarity index 98% rename from LiteLoader/Header/MC/Chicken.hpp rename to LiteLoader/include/llapi/mc/Chicken.hpp index 7d7bcda..16579b4 100644 --- a/LiteLoader/Header/MC/Chicken.hpp +++ b/LiteLoader/include/llapi/mc/Chicken.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/ChorusFlowerBlock.hpp b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ChorusFlowerBlock.hpp rename to LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp index 3171167..63a51ed 100644 --- a/LiteLoader/Header/MC/ChorusFlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChorusPlantBlock.hpp b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ChorusPlantBlock.hpp rename to LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp index c2c87ef..24e60e1 100644 --- a/LiteLoader/Header/MC/ChorusPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkBlockPos.hpp b/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp similarity index 98% rename from LiteLoader/Header/MC/ChunkBlockPos.hpp rename to LiteLoader/include/llapi/mc/ChunkBlockPos.hpp index ba52ff8..8de77d8 100644 --- a/LiteLoader/Header/MC/ChunkBlockPos.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp @@ -5,7 +5,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/ChunkBuildOrderPolicy.hpp b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp similarity index 97% rename from LiteLoader/Header/MC/ChunkBuildOrderPolicy.hpp rename to LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp index d8bc0e6..b51886e 100644 --- a/LiteLoader/Header/MC/ChunkBuildOrderPolicy.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkBuildOrderPolicyBase.hpp b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp similarity index 96% rename from LiteLoader/Header/MC/ChunkBuildOrderPolicyBase.hpp rename to LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp index 8b0e9bd..73ed832 100644 --- a/LiteLoader/Header/MC/ChunkBuildOrderPolicyBase.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkPos.hpp b/LiteLoader/include/llapi/mc/ChunkPos.hpp similarity index 96% rename from LiteLoader/Header/MC/ChunkPos.hpp rename to LiteLoader/include/llapi/mc/ChunkPos.hpp index 9288238..04159c3 100644 --- a/LiteLoader/Header/MC/ChunkPos.hpp +++ b/LiteLoader/include/llapi/mc/ChunkPos.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkRadiusUpdatedPacket.hpp b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ChunkRadiusUpdatedPacket.hpp rename to LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp index 2623ef8..e2166d8 100644 --- a/LiteLoader/Header/MC/ChunkRadiusUpdatedPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkSource.hpp b/LiteLoader/include/llapi/mc/ChunkSource.hpp similarity index 99% rename from LiteLoader/Header/MC/ChunkSource.hpp rename to LiteLoader/include/llapi/mc/ChunkSource.hpp index f879bb4..bc10f3f 100644 --- a/LiteLoader/Header/MC/ChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ChunkViewSource.hpp b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp similarity index 98% rename from LiteLoader/Header/MC/ChunkViewSource.hpp rename to LiteLoader/include/llapi/mc/ChunkViewSource.hpp index cb9d5f1..b9e2f0c 100644 --- a/LiteLoader/Header/MC/ChunkViewSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircleAroundAnchorDefinition.hpp b/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/CircleAroundAnchorDefinition.hpp rename to LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp index f93bd0e..02cfba0 100644 --- a/LiteLoader/Header/MC/CircleAroundAnchorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircleAroundAnchorGoal.hpp b/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/CircleAroundAnchorGoal.hpp rename to LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp index 077eebd..2fd43d1 100644 --- a/LiteLoader/Header/MC/CircleAroundAnchorGoal.hpp +++ b/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircuitComponentList.hpp b/LiteLoader/include/llapi/mc/CircuitComponentList.hpp similarity index 96% rename from LiteLoader/Header/MC/CircuitComponentList.hpp rename to LiteLoader/include/llapi/mc/CircuitComponentList.hpp index 2d27677..6309188 100644 --- a/LiteLoader/Header/MC/CircuitComponentList.hpp +++ b/LiteLoader/include/llapi/mc/CircuitComponentList.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircuitSceneGraph.hpp b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp similarity index 98% rename from LiteLoader/Header/MC/CircuitSceneGraph.hpp rename to LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp index 3d146a0..4517c3e 100644 --- a/LiteLoader/Header/MC/CircuitSceneGraph.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircuitSystem.hpp b/LiteLoader/include/llapi/mc/CircuitSystem.hpp similarity index 97% rename from LiteLoader/Header/MC/CircuitSystem.hpp rename to LiteLoader/include/llapi/mc/CircuitSystem.hpp index 29bde20..498cf23 100644 --- a/LiteLoader/Header/MC/CircuitSystem.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CircuitTrackingInfo.hpp b/LiteLoader/include/llapi/mc/CircuitTrackingInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/CircuitTrackingInfo.hpp rename to LiteLoader/include/llapi/mc/CircuitTrackingInfo.hpp index 8237f1d..ef4a9ef 100644 --- a/LiteLoader/Header/MC/CircuitTrackingInfo.hpp +++ b/LiteLoader/include/llapi/mc/CircuitTrackingInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClassroomModeListener.hpp b/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp similarity index 98% rename from LiteLoader/Header/MC/ClassroomModeListener.hpp rename to LiteLoader/include/llapi/mc/ClassroomModeListener.hpp index 489b5ec..8452109 100644 --- a/LiteLoader/Header/MC/ClassroomModeListener.hpp +++ b/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClassroomModeNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp similarity index 96% rename from LiteLoader/Header/MC/ClassroomModeNetworkHandler.hpp rename to LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp index a8b74de..676b3f1 100644 --- a/LiteLoader/Header/MC/ClassroomModeNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClayBlock.hpp b/LiteLoader/include/llapi/mc/ClayBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ClayBlock.hpp rename to LiteLoader/include/llapi/mc/ClayBlock.hpp index 24ad508..59677f2 100644 --- a/LiteLoader/Header/MC/ClayBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClayBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClayFeature.hpp b/LiteLoader/include/llapi/mc/ClayFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/ClayFeature.hpp rename to LiteLoader/include/llapi/mc/ClayFeature.hpp index 91886c6..ffdbf7b 100644 --- a/LiteLoader/Header/MC/ClayFeature.hpp +++ b/LiteLoader/include/llapi/mc/ClayFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClearCommand.hpp b/LiteLoader/include/llapi/mc/ClearCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ClearCommand.hpp rename to LiteLoader/include/llapi/mc/ClearCommand.hpp index e994b4c..b238dfe 100644 --- a/LiteLoader/Header/MC/ClearCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClientAutomationCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/ClientAutomationCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp index 41847c1..9fb0a5e 100644 --- a/LiteLoader/Header/MC/ClientAutomationCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/ClientCacheBlobStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ClientCacheBlobStatusPacket.hpp rename to LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp index 7908dc5..6058a4b 100644 --- a/LiteLoader/Header/MC/ClientCacheBlobStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ClientCacheMissResponsePacket.hpp rename to LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp index b0c6c61..83a7a80 100644 --- a/LiteLoader/Header/MC/ClientCacheMissResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClientCacheStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ClientCacheStatusPacket.hpp rename to LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp index f9ec1b7..720bc59 100644 --- a/LiteLoader/Header/MC/ClientCacheStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClientToServerHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ClientToServerHandshakePacket.hpp rename to LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp index a7bcfdb..161dc91 100644 --- a/LiteLoader/Header/MC/ClientToServerHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClientboundMapItemDataPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp similarity index 98% rename from LiteLoader/Header/MC/ClientboundMapItemDataPacket.hpp rename to LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp index 2987b92..8d52d7f 100644 --- a/LiteLoader/Header/MC/ClientboundMapItemDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MapItemTrackedActor.hpp" #include "Packet.hpp" diff --git a/LiteLoader/Header/MC/ClockItem.hpp b/LiteLoader/include/llapi/mc/ClockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ClockItem.hpp rename to LiteLoader/include/llapi/mc/ClockItem.hpp index 8112615..9d0bcf1 100644 --- a/LiteLoader/Header/MC/ClockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClockSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp similarity index 95% rename from LiteLoader/Header/MC/ClockSpriteCalculator.hpp rename to LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp index 7b7525d..9ff307b 100644 --- a/LiteLoader/Header/MC/ClockSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CloneCommand.hpp b/LiteLoader/include/llapi/mc/CloneCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/CloneCommand.hpp rename to LiteLoader/include/llapi/mc/CloneCommand.hpp index 5b4ff25..83cc4f5 100644 --- a/LiteLoader/Header/MC/CloneCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloneCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CloseWebSocketCommand.hpp b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/CloseWebSocketCommand.hpp rename to LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp index b3faea4..07df8a8 100644 --- a/LiteLoader/Header/MC/CloseWebSocketCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClothBlock.hpp b/LiteLoader/include/llapi/mc/ClothBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ClothBlock.hpp rename to LiteLoader/include/llapi/mc/ClothBlock.hpp index 1daf442..3fcf1ab 100644 --- a/LiteLoader/Header/MC/ClothBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClothBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ClothBlockItem.hpp b/LiteLoader/include/llapi/mc/ClothBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ClothBlockItem.hpp rename to LiteLoader/include/llapi/mc/ClothBlockItem.hpp index 2fccf47..bfe0d3c 100644 --- a/LiteLoader/Header/MC/ClothBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClothBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoalItem.hpp b/LiteLoader/include/llapi/mc/CoalItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CoalItem.hpp rename to LiteLoader/include/llapi/mc/CoalItem.hpp index 3372f35..c0fb1cb 100644 --- a/LiteLoader/Header/MC/CoalItem.hpp +++ b/LiteLoader/include/llapi/mc/CoalItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CocoaBlock.hpp b/LiteLoader/include/llapi/mc/CocoaBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CocoaBlock.hpp rename to LiteLoader/include/llapi/mc/CocoaBlock.hpp index 2dc8600..f12d6c0 100644 --- a/LiteLoader/Header/MC/CocoaBlock.hpp +++ b/LiteLoader/include/llapi/mc/CocoaBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CodeBuilderCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/CodeBuilderCommand.hpp rename to LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp index 02c0469..8659291 100644 --- a/LiteLoader/Header/MC/CodeBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CodeBuilderPacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CodeBuilderPacket.hpp rename to LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp index 5ba043b..a4dd624 100644 --- a/LiteLoader/Header/MC/CodeBuilderPacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CollisionBoxDescription.hpp b/LiteLoader/include/llapi/mc/CollisionBoxDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/CollisionBoxDescription.hpp rename to LiteLoader/include/llapi/mc/CollisionBoxDescription.hpp index 4b22436..5757bf5 100644 --- a/LiteLoader/Header/MC/CollisionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/CollisionBoxDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Color.hpp b/LiteLoader/include/llapi/mc/Color.hpp similarity index 98% rename from LiteLoader/Header/MC/Color.hpp rename to LiteLoader/include/llapi/mc/Color.hpp index b073a5f..2b09a3a 100644 --- a/LiteLoader/Header/MC/Color.hpp +++ b/LiteLoader/include/llapi/mc/Color.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Color2Description.hpp b/LiteLoader/include/llapi/mc/Color2Description.hpp similarity index 96% rename from LiteLoader/Header/MC/Color2Description.hpp rename to LiteLoader/include/llapi/mc/Color2Description.hpp index 948d100..d0c5427 100644 --- a/LiteLoader/Header/MC/Color2Description.hpp +++ b/LiteLoader/include/llapi/mc/Color2Description.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ColorDescription.hpp b/LiteLoader/include/llapi/mc/ColorDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ColorDescription.hpp rename to LiteLoader/include/llapi/mc/ColorDescription.hpp index 71a2495..78cf485 100644 --- a/LiteLoader/Header/MC/ColorDescription.hpp +++ b/LiteLoader/include/llapi/mc/ColorDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ColorFormat.hpp b/LiteLoader/include/llapi/mc/ColorFormat.hpp similarity index 98% rename from LiteLoader/Header/MC/ColorFormat.hpp rename to LiteLoader/include/llapi/mc/ColorFormat.hpp index cbeb991..6b17698 100644 --- a/LiteLoader/Header/MC/ColorFormat.hpp +++ b/LiteLoader/include/llapi/mc/ColorFormat.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA //using mce::Color; diff --git a/LiteLoader/Header/MC/ColorPaletteAttributes.hpp b/LiteLoader/include/llapi/mc/ColorPaletteAttributes.hpp similarity index 95% rename from LiteLoader/Header/MC/ColorPaletteAttributes.hpp rename to LiteLoader/include/llapi/mc/ColorPaletteAttributes.hpp index 4b371da..d9abcd1 100644 --- a/LiteLoader/Header/MC/ColorPaletteAttributes.hpp +++ b/LiteLoader/include/llapi/mc/ColorPaletteAttributes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ColoredBlock.hpp b/LiteLoader/include/llapi/mc/ColoredBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ColoredBlock.hpp rename to LiteLoader/include/llapi/mc/ColoredBlock.hpp index 3dc5e81..c941106 100644 --- a/LiteLoader/Header/MC/ColoredBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ColoredTorchBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ColoredTorchBlock.hpp rename to LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp index 40d6833..6ce13f1 100644 --- a/LiteLoader/Header/MC/ColoredTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TorchBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp similarity index 99% rename from LiteLoader/Header/MC/Command.hpp rename to LiteLoader/include/llapi/mc/Command.hpp index 8c6fdee..223bb78 100644 --- a/LiteLoader/Header/MC/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandAreaFactory.hpp b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandAreaFactory.hpp rename to LiteLoader/include/llapi/mc/CommandAreaFactory.hpp index 7caa296..213b1c4 100644 --- a/LiteLoader/Header/MC/CommandAreaFactory.hpp +++ b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlock.hpp b/LiteLoader/include/llapi/mc/CommandBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CommandBlock.hpp rename to LiteLoader/include/llapi/mc/CommandBlock.hpp index d5ca67a..c10a588 100644 --- a/LiteLoader/Header/MC/CommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlockActor.hpp b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandBlockActor.hpp rename to LiteLoader/include/llapi/mc/CommandBlockActor.hpp index dafaed8..7f21d8b 100644 --- a/LiteLoader/Header/MC/CommandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlockComponent.hpp b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandBlockComponent.hpp rename to LiteLoader/include/llapi/mc/CommandBlockComponent.hpp index f3718a2..5b7fa1c 100644 --- a/LiteLoader/Header/MC/CommandBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlockDescription.hpp b/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandBlockDescription.hpp rename to LiteLoader/include/llapi/mc/CommandBlockDescription.hpp index 5be2b0f..a143261 100644 --- a/LiteLoader/Header/MC/CommandBlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlockSystem.hpp b/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandBlockSystem.hpp rename to LiteLoader/include/llapi/mc/CommandBlockSystem.hpp index d8980e8..aef02a5 100644 --- a/LiteLoader/Header/MC/CommandBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandBlockUpdatePacket.hpp rename to LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp index 358bf0f..e881bcc 100644 --- a/LiteLoader/Header/MC/CommandBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandContext.hpp b/LiteLoader/include/llapi/mc/CommandContext.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandContext.hpp rename to LiteLoader/include/llapi/mc/CommandContext.hpp index 560fb6a..83d7e7b 100644 --- a/LiteLoader/Header/MC/CommandContext.hpp +++ b/LiteLoader/include/llapi/mc/CommandContext.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandDispatcher.hpp b/LiteLoader/include/llapi/mc/CommandDispatcher.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandDispatcher.hpp rename to LiteLoader/include/llapi/mc/CommandDispatcher.hpp index fb889ae..ba74089 100644 --- a/LiteLoader/Header/MC/CommandDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/CommandDispatcher.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandFlag.hpp b/LiteLoader/include/llapi/mc/CommandFlag.hpp similarity index 100% rename from LiteLoader/Header/MC/CommandFlag.hpp rename to LiteLoader/include/llapi/mc/CommandFlag.hpp diff --git a/LiteLoader/Header/MC/CommandFunctionEntry.hpp b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandFunctionEntry.hpp rename to LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp index dbb5233..8855e0d 100644 --- a/LiteLoader/Header/MC/CommandFunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandIntegerRange.hpp b/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandIntegerRange.hpp rename to LiteLoader/include/llapi/mc/CommandIntegerRange.hpp index 559ca6d..834f529 100644 --- a/LiteLoader/Header/MC/CommandIntegerRange.hpp +++ b/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp @@ -4,7 +4,7 @@ * */ #pragma once -#include "../Global.h" +#include "llapi/Global.h" class CommandIntegerRange { diff --git a/LiteLoader/Header/MC/CommandItem.hpp b/LiteLoader/include/llapi/mc/CommandItem.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandItem.hpp rename to LiteLoader/include/llapi/mc/CommandItem.hpp index f5939e7..d53448d 100644 --- a/LiteLoader/Header/MC/CommandItem.hpp +++ b/LiteLoader/include/llapi/mc/CommandItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandLexer.hpp b/LiteLoader/include/llapi/mc/CommandLexer.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandLexer.hpp rename to LiteLoader/include/llapi/mc/CommandLexer.hpp index 5d47db9..136bb90 100644 --- a/LiteLoader/Header/MC/CommandLexer.hpp +++ b/LiteLoader/include/llapi/mc/CommandLexer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandMessage.hpp b/LiteLoader/include/llapi/mc/CommandMessage.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandMessage.hpp rename to LiteLoader/include/llapi/mc/CommandMessage.hpp index 5360a16..c1f17ab 100644 --- a/LiteLoader/Header/MC/CommandMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandMessage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "CommandSelector.hpp" diff --git a/LiteLoader/Header/MC/CommandOrigin.hpp b/LiteLoader/include/llapi/mc/CommandOrigin.hpp similarity index 99% rename from LiteLoader/Header/MC/CommandOrigin.hpp rename to LiteLoader/include/llapi/mc/CommandOrigin.hpp index b8e9301..73543bc 100644 --- a/LiteLoader/Header/MC/CommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/CommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Bedrock.hpp" diff --git a/LiteLoader/Header/MC/CommandOriginData.hpp b/LiteLoader/include/llapi/mc/CommandOriginData.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandOriginData.hpp rename to LiteLoader/include/llapi/mc/CommandOriginData.hpp index d5f30fa..d1d8768 100644 --- a/LiteLoader/Header/MC/CommandOriginData.hpp +++ b/LiteLoader/include/llapi/mc/CommandOriginData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandOutput.hpp b/LiteLoader/include/llapi/mc/CommandOutput.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandOutput.hpp rename to LiteLoader/include/llapi/mc/CommandOutput.hpp index a49f5d4..87cb5cd 100644 --- a/LiteLoader/Header/MC/CommandOutput.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -9,8 +9,8 @@ #include "CommandOrigin.hpp" #include "Command.hpp" #include "ServerPlayer.hpp" -#include "../Utils/PluginOwnData.h" -#include "../I18nAPI.h" +#include "llapi/utils/PluginOwnData.h" +#include #define POD_COMMANDOUTPUT_LANGCODE ("_ll_plugin_cmdoutp_langcode_" + std::to_string((uint64_t)this)) #undef BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandOutputMessage.hpp b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandOutputMessage.hpp rename to LiteLoader/include/llapi/mc/CommandOutputMessage.hpp index 362c168..b90d172 100644 --- a/LiteLoader/Header/MC/CommandOutputMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandOutputPacket.hpp b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandOutputPacket.hpp rename to LiteLoader/include/llapi/mc/CommandOutputPacket.hpp index f007c97..10cb10b 100644 --- a/LiteLoader/Header/MC/CommandOutputPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandOutputParameter.hpp b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandOutputParameter.hpp rename to LiteLoader/include/llapi/mc/CommandOutputParameter.hpp index fd35f44..3d17802 100644 --- a/LiteLoader/Header/MC/CommandOutputParameter.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandOutputSender.hpp b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandOutputSender.hpp rename to LiteLoader/include/llapi/mc/CommandOutputSender.hpp index 5cdd108..fe457e0 100644 --- a/LiteLoader/Header/MC/CommandOutputSender.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandParameterData.hpp b/LiteLoader/include/llapi/mc/CommandParameterData.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandParameterData.hpp rename to LiteLoader/include/llapi/mc/CommandParameterData.hpp index f3f3276..54910cc 100644 --- a/LiteLoader/Header/MC/CommandParameterData.hpp +++ b/LiteLoader/include/llapi/mc/CommandParameterData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandPosition.hpp b/LiteLoader/include/llapi/mc/CommandPosition.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandPosition.hpp rename to LiteLoader/include/llapi/mc/CommandPosition.hpp index 85f3a8a..675879f 100644 --- a/LiteLoader/Header/MC/CommandPosition.hpp +++ b/LiteLoader/include/llapi/mc/CommandPosition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "CompoundTag.hpp" diff --git a/LiteLoader/Header/MC/CommandPositionFloat.hpp b/LiteLoader/include/llapi/mc/CommandPositionFloat.hpp similarity index 100% rename from LiteLoader/Header/MC/CommandPositionFloat.hpp rename to LiteLoader/include/llapi/mc/CommandPositionFloat.hpp diff --git a/LiteLoader/Header/MC/CommandPropertyBag.hpp b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandPropertyBag.hpp rename to LiteLoader/include/llapi/mc/CommandPropertyBag.hpp index 36a31f2..f571d2a 100644 --- a/LiteLoader/Header/MC/CommandPropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandRawText.hpp b/LiteLoader/include/llapi/mc/CommandRawText.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandRawText.hpp rename to LiteLoader/include/llapi/mc/CommandRawText.hpp index c43d49a..69e30c3 100644 --- a/LiteLoader/Header/MC/CommandRawText.hpp +++ b/LiteLoader/include/llapi/mc/CommandRawText.hpp @@ -4,7 +4,7 @@ * */ #pragma once -#include "../Global.h" +#include "llapi/Global.h" class CommandRawText { diff --git a/LiteLoader/Header/MC/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp similarity index 99% rename from LiteLoader/Header/MC/CommandRegistry.hpp rename to LiteLoader/include/llapi/mc/CommandRegistry.hpp index 1ee3bd6..13a6b28 100644 --- a/LiteLoader/Header/MC/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandRequestPacket.hpp rename to LiteLoader/include/llapi/mc/CommandRequestPacket.hpp index 760ccbf..92333bb 100644 --- a/LiteLoader/Header/MC/CommandRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandSelector.hpp b/LiteLoader/include/llapi/mc/CommandSelector.hpp similarity index 100% rename from LiteLoader/Header/MC/CommandSelector.hpp rename to LiteLoader/include/llapi/mc/CommandSelector.hpp diff --git a/LiteLoader/Header/MC/CommandSelectorBase.hpp b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandSelectorBase.hpp rename to LiteLoader/include/llapi/mc/CommandSelectorBase.hpp index 18cb45d..8aad4f2 100644 --- a/LiteLoader/Header/MC/CommandSelectorBase.hpp +++ b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandSoftEnumRegistry.hpp b/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/CommandSoftEnumRegistry.hpp rename to LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp index 93c148d..919d7ec 100644 --- a/LiteLoader/Header/MC/CommandSoftEnumRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/CommandSyntaxInformation.hpp b/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp similarity index 95% rename from LiteLoader/Header/MC/CommandSyntaxInformation.hpp rename to LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp index f20cce1..9e3e1bc 100644 --- a/LiteLoader/Header/MC/CommandSyntaxInformation.hpp +++ b/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandUtils.hpp b/LiteLoader/include/llapi/mc/CommandUtils.hpp similarity index 98% rename from LiteLoader/Header/MC/CommandUtils.hpp rename to LiteLoader/include/llapi/mc/CommandUtils.hpp index 9548443..135aa43 100644 --- a/LiteLoader/Header/MC/CommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/CommandUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CommandVersion.hpp b/LiteLoader/include/llapi/mc/CommandVersion.hpp similarity index 96% rename from LiteLoader/Header/MC/CommandVersion.hpp rename to LiteLoader/include/llapi/mc/CommandVersion.hpp index 02bdbb0..f6da5a8 100644 --- a/LiteLoader/Header/MC/CommandVersion.hpp +++ b/LiteLoader/include/llapi/mc/CommandVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Common.hpp b/LiteLoader/include/llapi/mc/Common.hpp similarity index 93% rename from LiteLoader/Header/MC/Common.hpp rename to LiteLoader/include/llapi/mc/Common.hpp index a7d7b92..dadb823 100644 --- a/LiteLoader/Header/MC/Common.hpp +++ b/LiteLoader/include/llapi/mc/Common.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompactionListenerEnv.hpp b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp similarity index 97% rename from LiteLoader/Header/MC/CompactionListenerEnv.hpp rename to LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp index 9a34489..4aa0e9a 100644 --- a/LiteLoader/Header/MC/CompactionListenerEnv.hpp +++ b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TransactionalWorldBlockTarget.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComparatorBlock.hpp b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ComparatorBlock.hpp rename to LiteLoader/include/llapi/mc/ComparatorBlock.hpp index 169612a..b8d7fde 100644 --- a/LiteLoader/Header/MC/ComparatorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComparatorBlockActor.hpp b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/ComparatorBlockActor.hpp rename to LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp index 92c2a36..5550c02 100644 --- a/LiteLoader/Header/MC/ComparatorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComparatorCapacitor.hpp b/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp similarity index 98% rename from LiteLoader/Header/MC/ComparatorCapacitor.hpp rename to LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp index 9a9ea73..b57a2ea 100644 --- a/LiteLoader/Header/MC/ComparatorCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ProducerComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompassItem.hpp b/LiteLoader/include/llapi/mc/CompassItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CompassItem.hpp rename to LiteLoader/include/llapi/mc/CompassItem.hpp index daa4498..1441504 100644 --- a/LiteLoader/Header/MC/CompassItem.hpp +++ b/LiteLoader/include/llapi/mc/CompassItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompassSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp similarity index 96% rename from LiteLoader/Header/MC/CompassSpriteCalculator.hpp rename to LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp index 4566612..6056d2d 100644 --- a/LiteLoader/Header/MC/CompassSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompletedUsingItemPacket.hpp b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/CompletedUsingItemPacket.hpp rename to LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp index 56ff48a..883fca5 100644 --- a/LiteLoader/Header/MC/CompletedUsingItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComplexInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp similarity index 98% rename from LiteLoader/Header/MC/ComplexInventoryTransaction.hpp rename to LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp index 6f98d82..58627f6 100644 --- a/LiteLoader/Header/MC/ComplexInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/ComplexItem.hpp b/LiteLoader/include/llapi/mc/ComplexItem.hpp similarity index 97% rename from LiteLoader/Header/MC/ComplexItem.hpp rename to LiteLoader/include/llapi/mc/ComplexItem.hpp index 1f1010d..43de7c4 100644 --- a/LiteLoader/Header/MC/ComplexItem.hpp +++ b/LiteLoader/include/llapi/mc/ComplexItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComponentDescription.hpp b/LiteLoader/include/llapi/mc/ComponentDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/ComponentDescription.hpp rename to LiteLoader/include/llapi/mc/ComponentDescription.hpp index 31b718e..64919e4 100644 --- a/LiteLoader/Header/MC/ComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/ComponentDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompositeDefinition.hpp b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/CompositeDefinition.hpp rename to LiteLoader/include/llapi/mc/CompositeDefinition.hpp index 0b8e7fc..a3708cc 100644 --- a/LiteLoader/Header/MC/CompositeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompositePackSource.hpp b/LiteLoader/include/llapi/mc/CompositePackSource.hpp similarity index 97% rename from LiteLoader/Header/MC/CompositePackSource.hpp rename to LiteLoader/include/llapi/mc/CompositePackSource.hpp index a1a86b3..83de426 100644 --- a/LiteLoader/Header/MC/CompositePackSource.hpp +++ b/LiteLoader/include/llapi/mc/CompositePackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ComposterBlock.hpp rename to LiteLoader/include/llapi/mc/ComposterBlock.hpp index 0a19298..9b4227d 100644 --- a/LiteLoader/Header/MC/ComposterBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MinecraftEventing.hpp" #include "BlockLegacy.hpp" diff --git a/LiteLoader/Header/MC/CompoundCreatorContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/CompoundCreatorContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp index 2dfda30..cce0206 100644 --- a/LiteLoader/Header/MC/CompoundCreatorContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundItem.hpp b/LiteLoader/include/llapi/mc/CompoundItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CompoundItem.hpp rename to LiteLoader/include/llapi/mc/CompoundItem.hpp index f328b3d..f3fdb6a 100644 --- a/LiteLoader/Header/MC/CompoundItem.hpp +++ b/LiteLoader/include/llapi/mc/CompoundItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp similarity index 99% rename from LiteLoader/Header/MC/CompoundTag.hpp rename to LiteLoader/include/llapi/mc/CompoundTag.hpp index 658dc66..fdbba8c 100644 --- a/LiteLoader/Header/MC/CompoundTag.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTagEditHelper.hpp b/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp similarity index 96% rename from LiteLoader/Header/MC/CompoundTagEditHelper.hpp rename to LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp index b1b85fe..e2b080b 100644 --- a/LiteLoader/Header/MC/CompoundTagEditHelper.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTagUpdater.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp similarity index 95% rename from LiteLoader/Header/MC/CompoundTagUpdater.hpp rename to LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp index 6f7afb0..891e425 100644 --- a/LiteLoader/Header/MC/CompoundTagUpdater.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTagUpdaterBuilder.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp similarity index 97% rename from LiteLoader/Header/MC/CompoundTagUpdaterBuilder.hpp rename to LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp index 8417b81..fc84dc4 100644 --- a/LiteLoader/Header/MC/CompoundTagUpdaterBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTagUpdaterContext.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp similarity index 96% rename from LiteLoader/Header/MC/CompoundTagUpdaterContext.hpp rename to LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp index 45806ac..a072032 100644 --- a/LiteLoader/Header/MC/CompoundTagUpdaterContext.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompoundTagVariant.hpp b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp similarity index 98% rename from LiteLoader/Header/MC/CompoundTagVariant.hpp rename to LiteLoader/include/llapi/mc/CompoundTagVariant.hpp index 13b70b7..f3c6666 100644 --- a/LiteLoader/Header/MC/CompoundTagVariant.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CompressedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp similarity index 97% rename from LiteLoader/Header/MC/CompressedNetworkPeer.hpp rename to LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp index d5d4da2..2865cf7 100644 --- a/LiteLoader/Header/MC/CompressedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetworkPeer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConcreteBlock.hpp b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ConcreteBlock.hpp rename to LiteLoader/include/llapi/mc/ConcreteBlock.hpp index 35fc473..0bd19c1 100644 --- a/LiteLoader/Header/MC/ConcreteBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConcretePowderBlock.hpp b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ConcretePowderBlock.hpp rename to LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp index 46b11c8..9350ac1 100644 --- a/LiteLoader/Header/MC/ConcretePowderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConduitBlock.hpp b/LiteLoader/include/llapi/mc/ConduitBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ConduitBlock.hpp rename to LiteLoader/include/llapi/mc/ConduitBlock.hpp index 1f74132..fc5936d 100644 --- a/LiteLoader/Header/MC/ConduitBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConduitBlockActor.hpp b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ConduitBlockActor.hpp rename to LiteLoader/include/llapi/mc/ConduitBlockActor.hpp index 0324d11..c03eec4 100644 --- a/LiteLoader/Header/MC/ConduitBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConnectionRequest.hpp b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp similarity index 98% rename from LiteLoader/Header/MC/ConnectionRequest.hpp rename to LiteLoader/include/llapi/mc/ConnectionRequest.hpp index a26d65d..cb4b123 100644 --- a/LiteLoader/Header/MC/ConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "persona.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/Connector.hpp b/LiteLoader/include/llapi/mc/Connector.hpp similarity index 94% rename from LiteLoader/Header/MC/Connector.hpp rename to LiteLoader/include/llapi/mc/Connector.hpp index 310de25..e450784 100644 --- a/LiteLoader/Header/MC/Connector.hpp +++ b/LiteLoader/include/llapi/mc/Connector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConsoleChunkBlender.hpp b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp similarity index 97% rename from LiteLoader/Header/MC/ConsoleChunkBlender.hpp rename to LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp index a738f9b..be2d3b3 100644 --- a/LiteLoader/Header/MC/ConsoleChunkBlender.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConsumeItemDefinition.hpp b/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ConsumeItemDefinition.hpp rename to LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp index 6711b54..c7bc228 100644 --- a/LiteLoader/Header/MC/ConsumeItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/ConsumeItemNode.hpp b/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp similarity index 95% rename from LiteLoader/Header/MC/ConsumeItemNode.hpp rename to LiteLoader/include/llapi/mc/ConsumeItemNode.hpp index 5d3818b..ef0849a 100644 --- a/LiteLoader/Header/MC/ConsumeItemNode.hpp +++ b/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ConsumerComponent.hpp b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ConsumerComponent.hpp rename to LiteLoader/include/llapi/mc/ConsumerComponent.hpp index ac86a74..784626e 100644 --- a/LiteLoader/Header/MC/ConsumerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseCircuitComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp similarity index 99% rename from LiteLoader/Header/MC/Container.hpp rename to LiteLoader/include/llapi/mc/Container.hpp index ba0a16a..e949789 100644 --- a/LiteLoader/Header/MC/Container.hpp +++ b/LiteLoader/include/llapi/mc/Container.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares diff --git a/LiteLoader/Header/MC/ContainerClosePacket.hpp b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerClosePacket.hpp rename to LiteLoader/include/llapi/mc/ContainerClosePacket.hpp index 97136b2..acb780e 100644 --- a/LiteLoader/Header/MC/ContainerClosePacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerComponent.hpp b/LiteLoader/include/llapi/mc/ContainerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ContainerComponent.hpp index cb5161b..c263df3 100644 --- a/LiteLoader/Header/MC/ContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerContentChangeListener.hpp b/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp similarity index 95% rename from LiteLoader/Header/MC/ContainerContentChangeListener.hpp rename to LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp index 2407b22..edb6fdf 100644 --- a/LiteLoader/Header/MC/ContainerContentChangeListener.hpp +++ b/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerDescription.hpp b/LiteLoader/include/llapi/mc/ContainerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerDescription.hpp rename to LiteLoader/include/llapi/mc/ContainerDescription.hpp index 5e9f0ab..9dbf338 100644 --- a/LiteLoader/Header/MC/ContainerDescription.hpp +++ b/LiteLoader/include/llapi/mc/ContainerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerManagerController.hpp b/LiteLoader/include/llapi/mc/ContainerManagerController.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerManagerController.hpp rename to LiteLoader/include/llapi/mc/ContainerManagerController.hpp index 888e70e..3b70413 100644 --- a/LiteLoader/Header/MC/ContainerManagerController.hpp +++ b/LiteLoader/include/llapi/mc/ContainerManagerController.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp similarity index 98% rename from LiteLoader/Header/MC/ContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/ContainerManagerModel.hpp index 812aa0f..2612658 100644 --- a/LiteLoader/Header/MC/ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerModel.hpp b/LiteLoader/include/llapi/mc/ContainerModel.hpp similarity index 98% rename from LiteLoader/Header/MC/ContainerModel.hpp rename to LiteLoader/include/llapi/mc/ContainerModel.hpp index 6bbe310..44532e2 100644 --- a/LiteLoader/Header/MC/ContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerOpenPacket.hpp b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerOpenPacket.hpp rename to LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp index b0eb0f6..3cb53ff 100644 --- a/LiteLoader/Header/MC/ContainerOpenPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerScreenContext.hpp b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp similarity index 95% rename from LiteLoader/Header/MC/ContainerScreenContext.hpp rename to LiteLoader/include/llapi/mc/ContainerScreenContext.hpp index af8a788..2425b64 100644 --- a/LiteLoader/Header/MC/ContainerScreenContext.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerSetDataPacket.hpp b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerSetDataPacket.hpp rename to LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp index d1c0897..1e9da2f 100644 --- a/LiteLoader/Header/MC/ContainerSetDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerSizeChangeListener.hpp b/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp similarity index 95% rename from LiteLoader/Header/MC/ContainerSizeChangeListener.hpp rename to LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp index 57d4644..eefe8ea 100644 --- a/LiteLoader/Header/MC/ContainerSizeChangeListener.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerValidation.hpp b/LiteLoader/include/llapi/mc/ContainerValidation.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerValidation.hpp rename to LiteLoader/include/llapi/mc/ContainerValidation.hpp index 8f70ad4..0d630ef 100644 --- a/LiteLoader/Header/MC/ContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContainerWeakRef.hpp b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp similarity index 96% rename from LiteLoader/Header/MC/ContainerWeakRef.hpp rename to LiteLoader/include/llapi/mc/ContainerWeakRef.hpp index 018f11f..3894d62 100644 --- a/LiteLoader/Header/MC/ContainerWeakRef.hpp +++ b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContentIdentity.hpp b/LiteLoader/include/llapi/mc/ContentIdentity.hpp similarity index 95% rename from LiteLoader/Header/MC/ContentIdentity.hpp rename to LiteLoader/include/llapi/mc/ContentIdentity.hpp index 12523b2..797a6c1 100644 --- a/LiteLoader/Header/MC/ContentIdentity.hpp +++ b/LiteLoader/include/llapi/mc/ContentIdentity.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContentLog.hpp b/LiteLoader/include/llapi/mc/ContentLog.hpp similarity index 96% rename from LiteLoader/Header/MC/ContentLog.hpp rename to LiteLoader/include/llapi/mc/ContentLog.hpp index b0ce8cd..c4d4ec6 100644 --- a/LiteLoader/Header/MC/ContentLog.hpp +++ b/LiteLoader/include/llapi/mc/ContentLog.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContentLogEndPoint.hpp b/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp similarity index 95% rename from LiteLoader/Header/MC/ContentLogEndPoint.hpp rename to LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp index 035acec..b9263d4 100644 --- a/LiteLoader/Header/MC/ContentLogEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContentLogFileEndPoint.hpp b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp similarity index 97% rename from LiteLoader/Header/MC/ContentLogFileEndPoint.hpp rename to LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp index 39cd45b..fa4aca1 100644 --- a/LiteLoader/Header/MC/ContentLogFileEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContextAccessor.hpp b/LiteLoader/include/llapi/mc/ContextAccessor.hpp similarity index 95% rename from LiteLoader/Header/MC/ContextAccessor.hpp rename to LiteLoader/include/llapi/mc/ContextAccessor.hpp index f1820e3..47f5b2f 100644 --- a/LiteLoader/Header/MC/ContextAccessor.hpp +++ b/LiteLoader/include/llapi/mc/ContextAccessor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContextMessageLogger.hpp b/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp similarity index 95% rename from LiteLoader/Header/MC/ContextMessageLogger.hpp rename to LiteLoader/include/llapi/mc/ContextMessageLogger.hpp index fe18860..eeb7b6a 100644 --- a/LiteLoader/Header/MC/ContextMessageLogger.hpp +++ b/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ContextMessageLoggerOptions.hpp b/LiteLoader/include/llapi/mc/ContextMessageLoggerOptions.hpp similarity index 95% rename from LiteLoader/Header/MC/ContextMessageLoggerOptions.hpp rename to LiteLoader/include/llapi/mc/ContextMessageLoggerOptions.hpp index b968d2a..b09cefd 100644 --- a/LiteLoader/Header/MC/ContextMessageLoggerOptions.hpp +++ b/LiteLoader/include/llapi/mc/ContextMessageLoggerOptions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Control.hpp b/LiteLoader/include/llapi/mc/Control.hpp similarity index 94% rename from LiteLoader/Header/MC/Control.hpp rename to LiteLoader/include/llapi/mc/Control.hpp index c24cf5e..5102a42 100644 --- a/LiteLoader/Header/MC/Control.hpp +++ b/LiteLoader/include/llapi/mc/Control.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ControlledByPlayerGoal.hpp b/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ControlledByPlayerGoal.hpp rename to LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp index a131b0b..88a77d7 100644 --- a/LiteLoader/Header/MC/ControlledByPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Coral.hpp b/LiteLoader/include/llapi/mc/Coral.hpp similarity index 99% rename from LiteLoader/Header/MC/Coral.hpp rename to LiteLoader/include/llapi/mc/Coral.hpp index c6b5931..eb3ef04 100644 --- a/LiteLoader/Header/MC/Coral.hpp +++ b/LiteLoader/include/llapi/mc/Coral.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralBlock.hpp b/LiteLoader/include/llapi/mc/CoralBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CoralBlock.hpp rename to LiteLoader/include/llapi/mc/CoralBlock.hpp index 35ea441..70979f9 100644 --- a/LiteLoader/Header/MC/CoralBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralCrustFeature.hpp b/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp similarity index 98% rename from LiteLoader/Header/MC/CoralCrustFeature.hpp rename to LiteLoader/include/llapi/mc/CoralCrustFeature.hpp index e940ef3..294d78c 100644 --- a/LiteLoader/Header/MC/CoralCrustFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralFan.hpp b/LiteLoader/include/llapi/mc/CoralFan.hpp similarity index 99% rename from LiteLoader/Header/MC/CoralFan.hpp rename to LiteLoader/include/llapi/mc/CoralFan.hpp index ea2eae6..cca3cf8 100644 --- a/LiteLoader/Header/MC/CoralFan.hpp +++ b/LiteLoader/include/llapi/mc/CoralFan.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralFanBlockItem.hpp b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CoralFanBlockItem.hpp rename to LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp index 34b50c8..720da32 100644 --- a/LiteLoader/Header/MC/CoralFanBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralFanHang.hpp b/LiteLoader/include/llapi/mc/CoralFanHang.hpp similarity index 99% rename from LiteLoader/Header/MC/CoralFanHang.hpp rename to LiteLoader/include/llapi/mc/CoralFanHang.hpp index 8862bec..51aea6b 100644 --- a/LiteLoader/Header/MC/CoralFanHang.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanHang.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "CoralFan.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralFeature.hpp b/LiteLoader/include/llapi/mc/CoralFeature.hpp similarity index 99% rename from LiteLoader/Header/MC/CoralFeature.hpp rename to LiteLoader/include/llapi/mc/CoralFeature.hpp index 9940e3c..79a9f28 100644 --- a/LiteLoader/Header/MC/CoralFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CoralHangFeature.hpp b/LiteLoader/include/llapi/mc/CoralHangFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/CoralHangFeature.hpp rename to LiteLoader/include/llapi/mc/CoralHangFeature.hpp index 5ad9d3b..dec0790 100644 --- a/LiteLoader/Header/MC/CoralHangFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralHangFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Core.hpp b/LiteLoader/include/llapi/mc/Core.hpp similarity index 99% rename from LiteLoader/Header/MC/Core.hpp rename to LiteLoader/include/llapi/mc/Core.hpp index 1b08249..24cd35a 100644 --- a/LiteLoader/Header/MC/Core.hpp +++ b/LiteLoader/include/llapi/mc/Core.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp similarity index 97% rename from LiteLoader/Header/MC/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp rename to LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp index f0515cf..53e0ffb 100644 --- a/LiteLoader/Header/MC/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftHandlerBase.hpp b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp similarity index 95% rename from LiteLoader/Header/MC/CraftHandlerBase.hpp rename to LiteLoader/include/llapi/mc/CraftHandlerBase.hpp index e880190..3d44c2a 100644 --- a/LiteLoader/Header/MC/CraftHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftHandlerCrafting.hpp b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp similarity index 97% rename from LiteLoader/Header/MC/CraftHandlerCrafting.hpp rename to LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp index 052dccd..6b5ab81 100644 --- a/LiteLoader/Header/MC/CraftHandlerCrafting.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftHandlerEnchant.hpp b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp similarity index 97% rename from LiteLoader/Header/MC/CraftHandlerEnchant.hpp rename to LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp index 243e5a3..541b355 100644 --- a/LiteLoader/Header/MC/CraftHandlerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftHandlerTrade.hpp b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp similarity index 96% rename from LiteLoader/Header/MC/CraftHandlerTrade.hpp rename to LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp index 47b37d0..ca3fe22 100644 --- a/LiteLoader/Header/MC/CraftHandlerTrade.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftableCompounds.hpp b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp similarity index 97% rename from LiteLoader/Header/MC/CraftableCompounds.hpp rename to LiteLoader/include/llapi/mc/CraftableCompounds.hpp index a52512b..948847a 100644 --- a/LiteLoader/Header/MC/CraftableCompounds.hpp +++ b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftingContainer.hpp b/LiteLoader/include/llapi/mc/CraftingContainer.hpp similarity index 97% rename from LiteLoader/Header/MC/CraftingContainer.hpp rename to LiteLoader/include/llapi/mc/CraftingContainer.hpp index 02e3973..4e2e517 100644 --- a/LiteLoader/Header/MC/CraftingContainer.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Container.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftingDataEntry.hpp b/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp similarity index 96% rename from LiteLoader/Header/MC/CraftingDataEntry.hpp rename to LiteLoader/include/llapi/mc/CraftingDataEntry.hpp index a8fc664..c37d6fb 100644 --- a/LiteLoader/Header/MC/CraftingDataEntry.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftingDataPacket.hpp b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CraftingDataPacket.hpp rename to LiteLoader/include/llapi/mc/CraftingDataPacket.hpp index 6672b86..176467b 100644 --- a/LiteLoader/Header/MC/CraftingDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftingEventPacket.hpp b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CraftingEventPacket.hpp rename to LiteLoader/include/llapi/mc/CraftingEventPacket.hpp index 61206a5..ed00176 100644 --- a/LiteLoader/Header/MC/CraftingEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CraftingTag.hpp b/LiteLoader/include/llapi/mc/CraftingTag.hpp similarity index 93% rename from LiteLoader/Header/MC/CraftingTag.hpp rename to LiteLoader/include/llapi/mc/CraftingTag.hpp index fd36a49..3532e62 100644 --- a/LiteLoader/Header/MC/CraftingTag.hpp +++ b/LiteLoader/include/llapi/mc/CraftingTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpAssertData.hpp b/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpAssertData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp index aab23d8..5812970 100644 --- a/LiteLoader/Header/MC/CrashDumpAssertData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpEventData.hpp b/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp similarity index 96% rename from LiteLoader/Header/MC/CrashDumpEventData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpEventData.hpp index 3be8bda..6f85cc0 100644 --- a/LiteLoader/Header/MC/CrashDumpEventData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpFrameData.hpp b/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpFrameData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp index f83a58d..80fb253 100644 --- a/LiteLoader/Header/MC/CrashDumpFrameData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpGameplayData.hpp b/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpGameplayData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp index 9758435..2e1a6c1 100644 --- a/LiteLoader/Header/MC/CrashDumpGameplayData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpGlobalData.hpp b/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpGlobalData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp index 337396e..5df8d4b 100644 --- a/LiteLoader/Header/MC/CrashDumpGlobalData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpKeyValueData.hpp b/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpKeyValueData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp index 15f1aaf..ddd458a 100644 --- a/LiteLoader/Header/MC/CrashDumpKeyValueData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpLog.hpp b/LiteLoader/include/llapi/mc/CrashDumpLog.hpp similarity index 98% rename from LiteLoader/Header/MC/CrashDumpLog.hpp rename to LiteLoader/include/llapi/mc/CrashDumpLog.hpp index df8cbed..5617747 100644 --- a/LiteLoader/Header/MC/CrashDumpLog.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpLog.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpPlayerData.hpp b/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpPlayerData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp index 8277d4f..08d9d39 100644 --- a/LiteLoader/Header/MC/CrashDumpPlayerData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDumpRenderData.hpp b/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashDumpRenderData.hpp rename to LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp index 1f69213..c9ac6f6 100644 --- a/LiteLoader/Header/MC/CrashDumpRenderData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashDump_AllData.hpp b/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp similarity index 94% rename from LiteLoader/Header/MC/CrashDump_AllData.hpp rename to LiteLoader/include/llapi/mc/CrashDump_AllData.hpp index cc36240..f3d566d 100644 --- a/LiteLoader/Header/MC/CrashDump_AllData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashHandler.hpp b/LiteLoader/include/llapi/mc/CrashHandler.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashHandler.hpp rename to LiteLoader/include/llapi/mc/CrashHandler.hpp index 0957b7b..a9ff3d8 100644 --- a/LiteLoader/Header/MC/CrashHandler.hpp +++ b/LiteLoader/include/llapi/mc/CrashHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrashHelper.hpp b/LiteLoader/include/llapi/mc/CrashHelper.hpp similarity index 95% rename from LiteLoader/Header/MC/CrashHelper.hpp rename to LiteLoader/include/llapi/mc/CrashHelper.hpp index a22aef2..7675221 100644 --- a/LiteLoader/Header/MC/CrashHelper.hpp +++ b/LiteLoader/include/llapi/mc/CrashHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CreativeContentPacket.hpp b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/CreativeContentPacket.hpp rename to LiteLoader/include/llapi/mc/CreativeContentPacket.hpp index 3032547..c6f8544 100644 --- a/LiteLoader/Header/MC/CreativeContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CreativeItemEntry.hpp b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/CreativeItemEntry.hpp rename to LiteLoader/include/llapi/mc/CreativeItemEntry.hpp index 38b4c69..aaef271 100644 --- a/LiteLoader/Header/MC/CreativeItemEntry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Creeper.hpp b/LiteLoader/include/llapi/mc/Creeper.hpp similarity index 98% rename from LiteLoader/Header/MC/Creeper.hpp rename to LiteLoader/include/llapi/mc/Creeper.hpp index 566278d..7580a29 100644 --- a/LiteLoader/Header/MC/Creeper.hpp +++ b/LiteLoader/include/llapi/mc/Creeper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/CropBlock.hpp b/LiteLoader/include/llapi/mc/CropBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/CropBlock.hpp rename to LiteLoader/include/llapi/mc/CropBlock.hpp index a104de4..e458608 100644 --- a/LiteLoader/Header/MC/CropBlock.hpp +++ b/LiteLoader/include/llapi/mc/CropBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrossbowEnchant.hpp b/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/CrossbowEnchant.hpp rename to LiteLoader/include/llapi/mc/CrossbowEnchant.hpp index 757fc94..7dc0085 100644 --- a/LiteLoader/Header/MC/CrossbowEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CrossbowItem.hpp b/LiteLoader/include/llapi/mc/CrossbowItem.hpp similarity index 98% rename from LiteLoader/Header/MC/CrossbowItem.hpp rename to LiteLoader/include/llapi/mc/CrossbowItem.hpp index 9e75dc8..d792043 100644 --- a/LiteLoader/Header/MC/CrossbowItem.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CryingObsidianBlock.hpp b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/CryingObsidianBlock.hpp rename to LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp index 9c29080..6c9257d 100644 --- a/LiteLoader/Header/MC/CryingObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CryptoUtils.hpp b/LiteLoader/include/llapi/mc/CryptoUtils.hpp similarity index 92% rename from LiteLoader/Header/MC/CryptoUtils.hpp rename to LiteLoader/include/llapi/mc/CryptoUtils.hpp index 155b1ee..53f0880 100644 --- a/LiteLoader/Header/MC/CryptoUtils.hpp +++ b/LiteLoader/include/llapi/mc/CryptoUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CurseBindingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/CurseBindingEnchant.hpp rename to LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp index 9e7b22b..ad40f40 100644 --- a/LiteLoader/Header/MC/CurseBindingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CurseVanishingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/CurseVanishingEnchant.hpp rename to LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp index 1ac0398..f8b87b0 100644 --- a/LiteLoader/Header/MC/CurseVanishingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/CustomScriptEventData.hpp b/LiteLoader/include/llapi/mc/CustomScriptEventData.hpp similarity index 96% rename from LiteLoader/Header/MC/CustomScriptEventData.hpp rename to LiteLoader/include/llapi/mc/CustomScriptEventData.hpp index 9c48780..b5010bd 100644 --- a/LiteLoader/Header/MC/CustomScriptEventData.hpp +++ b/LiteLoader/include/llapi/mc/CustomScriptEventData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DBChunkStorage.hpp b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp similarity index 98% rename from LiteLoader/Header/MC/DBChunkStorage.hpp rename to LiteLoader/include/llapi/mc/DBChunkStorage.hpp index 9b8de13..9a404d2 100644 --- a/LiteLoader/Header/MC/DBChunkStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #include "Bedrock.hpp" diff --git a/LiteLoader/Header/MC/DBStorage.hpp b/LiteLoader/include/llapi/mc/DBStorage.hpp similarity index 98% rename from LiteLoader/Header/MC/DBStorage.hpp rename to LiteLoader/include/llapi/mc/DBStorage.hpp index 5856e93..9c560c0 100644 --- a/LiteLoader/Header/MC/DBStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Bedrock.hpp" #include "LevelStorageWriteBatch.hpp" @@ -9,7 +9,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here -#include "third-party/leveldb/status.h" +#include #undef BEFORE_EXTRA class DBStorage : public LevelStorage { diff --git a/LiteLoader/Header/MC/DBStorageConfig.hpp b/LiteLoader/include/llapi/mc/DBStorageConfig.hpp similarity index 95% rename from LiteLoader/Header/MC/DBStorageConfig.hpp rename to LiteLoader/include/llapi/mc/DBStorageConfig.hpp index 4f94230..02fd60e 100644 --- a/LiteLoader/Header/MC/DBStorageConfig.hpp +++ b/LiteLoader/include/llapi/mc/DBStorageConfig.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DBStorageEnvironmentChain.hpp b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp similarity index 97% rename from LiteLoader/Header/MC/DBStorageEnvironmentChain.hpp rename to LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp index 1c54cce..cee3239 100644 --- a/LiteLoader/Header/MC/DBStorageEnvironmentChain.hpp +++ b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DamageCondition.hpp b/LiteLoader/include/llapi/mc/DamageCondition.hpp similarity index 95% rename from LiteLoader/Header/MC/DamageCondition.hpp rename to LiteLoader/include/llapi/mc/DamageCondition.hpp index c53a81c..ac8072e 100644 --- a/LiteLoader/Header/MC/DamageCondition.hpp +++ b/LiteLoader/include/llapi/mc/DamageCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DamageOverTimeSystem.hpp b/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/DamageOverTimeSystem.hpp rename to LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp index a5822cc..5be23c0 100644 --- a/LiteLoader/Header/MC/DamageOverTimeSystem.hpp +++ b/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DamageSensorComponent.hpp b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/DamageSensorComponent.hpp rename to LiteLoader/include/llapi/mc/DamageSensorComponent.hpp index bb47355..8b13b4f 100644 --- a/LiteLoader/Header/MC/DamageSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DamageSensorDefinition.hpp b/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/DamageSensorDefinition.hpp rename to LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp index a5ae154..48c25dc 100644 --- a/LiteLoader/Header/MC/DamageSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/DamageSensorTrigger.hpp b/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp similarity index 95% rename from LiteLoader/Header/MC/DamageSensorTrigger.hpp rename to LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp index 4afed05..733c902 100644 --- a/LiteLoader/Header/MC/DamageSensorTrigger.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DanceComponentListener.hpp b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp similarity index 98% rename from LiteLoader/Header/MC/DanceComponentListener.hpp rename to LiteLoader/include/llapi/mc/DanceComponentListener.hpp index 0b9e07a..d16b06f 100644 --- a/LiteLoader/Header/MC/DanceComponentListener.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DanceSystem.hpp b/LiteLoader/include/llapi/mc/DanceSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/DanceSystem.hpp rename to LiteLoader/include/llapi/mc/DanceSystem.hpp index 32b0ccf..08d95bf 100644 --- a/LiteLoader/Header/MC/DanceSystem.hpp +++ b/LiteLoader/include/llapi/mc/DanceSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DataItem.hpp b/LiteLoader/include/llapi/mc/DataItem.hpp similarity index 99% rename from LiteLoader/Header/MC/DataItem.hpp rename to LiteLoader/include/llapi/mc/DataItem.hpp index 972b618..6d5b062 100644 --- a/LiteLoader/Header/MC/DataItem.hpp +++ b/LiteLoader/include/llapi/mc/DataItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DatagramHeaderFormat.hpp b/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp similarity index 96% rename from LiteLoader/Header/MC/DatagramHeaderFormat.hpp rename to LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp index 03d884d..3793720 100644 --- a/LiteLoader/Header/MC/DatagramHeaderFormat.hpp +++ b/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DateManager.hpp b/LiteLoader/include/llapi/mc/DateManager.hpp similarity index 95% rename from LiteLoader/Header/MC/DateManager.hpp rename to LiteLoader/include/llapi/mc/DateManager.hpp index 54e5481..ab9d7d9 100644 --- a/LiteLoader/Header/MC/DateManager.hpp +++ b/LiteLoader/include/llapi/mc/DateManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DayLockCommand.hpp b/LiteLoader/include/llapi/mc/DayLockCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/DayLockCommand.hpp rename to LiteLoader/include/llapi/mc/DayLockCommand.hpp index b84467e..541bb67 100644 --- a/LiteLoader/Header/MC/DayLockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DayLockCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DaylightDetectorBlock.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DaylightDetectorBlock.hpp rename to LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp index f15eab3..616cb37 100644 --- a/LiteLoader/Header/MC/DaylightDetectorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DaylightDetectorBlockActor.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/DaylightDetectorBlockActor.hpp rename to LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp index 3639c3c..3805e19 100644 --- a/LiteLoader/Header/MC/DaylightDetectorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DeOpCommand.hpp b/LiteLoader/include/llapi/mc/DeOpCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/DeOpCommand.hpp rename to LiteLoader/include/llapi/mc/DeOpCommand.hpp index 88b0b2e..5781dde 100644 --- a/LiteLoader/Header/MC/DeOpCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeOpCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DeadBush.hpp b/LiteLoader/include/llapi/mc/DeadBush.hpp similarity index 98% rename from LiteLoader/Header/MC/DeadBush.hpp rename to LiteLoader/include/llapi/mc/DeadBush.hpp index 98caa57..28da26a 100644 --- a/LiteLoader/Header/MC/DeadBush.hpp +++ b/LiteLoader/include/llapi/mc/DeadBush.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DeadBushFeature.hpp b/LiteLoader/include/llapi/mc/DeadBushFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/DeadBushFeature.hpp rename to LiteLoader/include/llapi/mc/DeadBushFeature.hpp index 24dcd50..cab1a83 100644 --- a/LiteLoader/Header/MC/DeadBushFeature.hpp +++ b/LiteLoader/include/llapi/mc/DeadBushFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DebugAssertException.hpp b/LiteLoader/include/llapi/mc/DebugAssertException.hpp similarity index 96% rename from LiteLoader/Header/MC/DebugAssertException.hpp rename to LiteLoader/include/llapi/mc/DebugAssertException.hpp index 2fd0760..b99fff7 100644 --- a/LiteLoader/Header/MC/DebugAssertException.hpp +++ b/LiteLoader/include/llapi/mc/DebugAssertException.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DebugEndPoint.hpp b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp similarity index 96% rename from LiteLoader/Header/MC/DebugEndPoint.hpp rename to LiteLoader/include/llapi/mc/DebugEndPoint.hpp index d4efb45..5ad7d76 100644 --- a/LiteLoader/Header/MC/DebugEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DebugInfoComponent.hpp b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/DebugInfoComponent.hpp rename to LiteLoader/include/llapi/mc/DebugInfoComponent.hpp index 1906416..765a009 100644 --- a/LiteLoader/Header/MC/DebugInfoComponent.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DebugInfoPacket.hpp b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/DebugInfoPacket.hpp rename to LiteLoader/include/llapi/mc/DebugInfoPacket.hpp index 1053129..9d224ce 100644 --- a/LiteLoader/Header/MC/DebugInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DebugUtils.hpp b/LiteLoader/include/llapi/mc/DebugUtils.hpp similarity index 96% rename from LiteLoader/Header/MC/DebugUtils.hpp rename to LiteLoader/include/llapi/mc/DebugUtils.hpp index 85c8904..cb5d10c 100644 --- a/LiteLoader/Header/MC/DebugUtils.hpp +++ b/LiteLoader/include/llapi/mc/DebugUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DecoratorDefinition.hpp b/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DecoratorDefinition.hpp rename to LiteLoader/include/llapi/mc/DecoratorDefinition.hpp index 4ad50ed..1ecebcb 100644 --- a/LiteLoader/Header/MC/DecoratorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DedicatedServer.hpp b/LiteLoader/include/llapi/mc/DedicatedServer.hpp similarity index 97% rename from LiteLoader/Header/MC/DedicatedServer.hpp rename to LiteLoader/include/llapi/mc/DedicatedServer.hpp index 80bb15d..dbb564b 100644 --- a/LiteLoader/Header/MC/DedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DedicatedServerCommands.hpp b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp similarity index 96% rename from LiteLoader/Header/MC/DedicatedServerCommands.hpp rename to LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp index 54f8cf5..5d824f1 100644 --- a/LiteLoader/Header/MC/DedicatedServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DedicatedWSServerCommand.hpp b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/DedicatedWSServerCommand.hpp rename to LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp index eef796f..90ce088 100644 --- a/LiteLoader/Header/MC/DedicatedWSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefaultDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp similarity index 98% rename from LiteLoader/Header/MC/DefaultDataLoadHelper.hpp rename to LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp index 76da607..0241fd0 100644 --- a/LiteLoader/Header/MC/DefaultDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefaultEmptyActorAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/DefaultEmptyActorAnimationPlayer.hpp similarity index 98% rename from LiteLoader/Header/MC/DefaultEmptyActorAnimationPlayer.hpp rename to LiteLoader/include/llapi/mc/DefaultEmptyActorAnimationPlayer.hpp index 436a70b..c983d7b 100644 --- a/LiteLoader/Header/MC/DefaultEmptyActorAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/DefaultEmptyActorAnimationPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefaultLookAngleDescription.hpp b/LiteLoader/include/llapi/mc/DefaultLookAngleDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/DefaultLookAngleDescription.hpp rename to LiteLoader/include/llapi/mc/DefaultLookAngleDescription.hpp index d1a96db..b7518f0 100644 --- a/LiteLoader/Header/MC/DefaultLookAngleDescription.hpp +++ b/LiteLoader/include/llapi/mc/DefaultLookAngleDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefaultMobSpawner.hpp b/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp similarity index 96% rename from LiteLoader/Header/MC/DefaultMobSpawner.hpp rename to LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp index a30bdff..a89903a 100644 --- a/LiteLoader/Header/MC/DefaultMobSpawner.hpp +++ b/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMobSpawner.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefaultScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/DefaultScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp index 1f05f95..38abab6 100644 --- a/LiteLoader/Header/MC/DefaultScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefendTrustedTargetGoal.hpp b/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DefendTrustedTargetGoal.hpp rename to LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp index b27242f..2a1abdc 100644 --- a/LiteLoader/Header/MC/DefendTrustedTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NearestAttackableTargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefendVillageTargetDefinition.hpp b/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DefendVillageTargetDefinition.hpp rename to LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp index c5a41e0..66872b5 100644 --- a/LiteLoader/Header/MC/DefendVillageTargetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefendVillageTargetGoal.hpp b/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DefendVillageTargetGoal.hpp rename to LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp index b2c46a8..55d8f60 100644 --- a/LiteLoader/Header/MC/DefendVillageTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefinitionEvent.hpp b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/DefinitionEvent.hpp rename to LiteLoader/include/llapi/mc/DefinitionEvent.hpp index 793f6bc..b5d646e 100644 --- a/LiteLoader/Header/MC/DefinitionEvent.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefinitionEventLoader.hpp b/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp similarity index 96% rename from LiteLoader/Header/MC/DefinitionEventLoader.hpp rename to LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp index e9b9de7..2350675 100644 --- a/LiteLoader/Header/MC/DefinitionEventLoader.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefinitionModifier.hpp b/LiteLoader/include/llapi/mc/DefinitionModifier.hpp similarity index 95% rename from LiteLoader/Header/MC/DefinitionModifier.hpp rename to LiteLoader/include/llapi/mc/DefinitionModifier.hpp index 0567213..e5b3847 100644 --- a/LiteLoader/Header/MC/DefinitionModifier.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionModifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DefinitionTrigger.hpp b/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp similarity index 96% rename from LiteLoader/Header/MC/DefinitionTrigger.hpp rename to LiteLoader/include/llapi/mc/DefinitionTrigger.hpp index bb6ac04..845d075 100644 --- a/LiteLoader/Header/MC/DefinitionTrigger.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DelayedAttackDefinition.hpp b/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DelayedAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp index cb32773..9a49992 100644 --- a/LiteLoader/Header/MC/DelayedAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DelayedAttackGoal.hpp b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DelayedAttackGoal.hpp rename to LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp index bf02208..9a94dd2 100644 --- a/LiteLoader/Header/MC/DelayedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MeleeAttackGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DeltaFeature.hpp b/LiteLoader/include/llapi/mc/DeltaFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/DeltaFeature.hpp rename to LiteLoader/include/llapi/mc/DeltaFeature.hpp index 9188daa..5015042 100644 --- a/LiteLoader/Header/MC/DeltaFeature.hpp +++ b/LiteLoader/include/llapi/mc/DeltaFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DeprecatedSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/DeprecatedSlabBlockItem.hpp rename to LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp index 19cb698..2359116 100644 --- a/LiteLoader/Header/MC/DeprecatedSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Description.hpp b/LiteLoader/include/llapi/mc/Description.hpp similarity index 96% rename from LiteLoader/Header/MC/Description.hpp rename to LiteLoader/include/llapi/mc/Description.hpp index 38858d2..4c3d7ee 100644 --- a/LiteLoader/Header/MC/Description.hpp +++ b/LiteLoader/include/llapi/mc/Description.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DesertPyramidPiece.hpp b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp similarity index 96% rename from LiteLoader/Header/MC/DesertPyramidPiece.hpp rename to LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp index 63ba50e..9a42a9a 100644 --- a/LiteLoader/Header/MC/DesertPyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DesertWellFeature.hpp b/LiteLoader/include/llapi/mc/DesertWellFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/DesertWellFeature.hpp rename to LiteLoader/include/llapi/mc/DesertWellFeature.hpp index 27e982d..6d94139 100644 --- a/LiteLoader/Header/MC/DesertWellFeature.hpp +++ b/LiteLoader/include/llapi/mc/DesertWellFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DespawnComponent.hpp b/LiteLoader/include/llapi/mc/DespawnComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/DespawnComponent.hpp rename to LiteLoader/include/llapi/mc/DespawnComponent.hpp index a79884e..8ddd397 100644 --- a/LiteLoader/Header/MC/DespawnComponent.hpp +++ b/LiteLoader/include/llapi/mc/DespawnComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DespawnDefinition.hpp b/LiteLoader/include/llapi/mc/DespawnDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DespawnDefinition.hpp rename to LiteLoader/include/llapi/mc/DespawnDefinition.hpp index 36d5f09..91735e7 100644 --- a/LiteLoader/Header/MC/DespawnDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DespawnDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DespawnSystem.hpp b/LiteLoader/include/llapi/mc/DespawnSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/DespawnSystem.hpp rename to LiteLoader/include/llapi/mc/DespawnSystem.hpp index 1ace6fe..c67eb3d 100644 --- a/LiteLoader/Header/MC/DespawnSystem.hpp +++ b/LiteLoader/include/llapi/mc/DespawnSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DetectorRailBlock.hpp b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DetectorRailBlock.hpp rename to LiteLoader/include/llapi/mc/DetectorRailBlock.hpp index 946a39a..50a2d74 100644 --- a/LiteLoader/Header/MC/DetectorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseRailBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DifficultyCommand.hpp b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/DifficultyCommand.hpp rename to LiteLoader/include/llapi/mc/DifficultyCommand.hpp index 5e3fe5b..50f67b8 100644 --- a/LiteLoader/Header/MC/DifficultyCommand.hpp +++ b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DiggerItem.hpp b/LiteLoader/include/llapi/mc/DiggerItem.hpp similarity index 98% rename from LiteLoader/Header/MC/DiggerItem.hpp rename to LiteLoader/include/llapi/mc/DiggerItem.hpp index ea065fa..9694ea9 100644 --- a/LiteLoader/Header/MC/DiggerItem.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DiggingEnchant.hpp b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/DiggingEnchant.hpp rename to LiteLoader/include/llapi/mc/DiggingEnchant.hpp index d32d10b..6f9096b 100644 --- a/LiteLoader/Header/MC/DiggingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp similarity index 99% rename from LiteLoader/Header/MC/Dimension.hpp rename to LiteLoader/include/llapi/mc/Dimension.hpp index 0be90cc..31fd74e 100644 --- a/LiteLoader/Header/MC/Dimension.hpp +++ b/LiteLoader/include/llapi/mc/Dimension.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA class BlockSource; diff --git a/LiteLoader/Header/MC/DimensionBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp similarity index 96% rename from LiteLoader/Header/MC/DimensionBrightnessRamp.hpp rename to LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp index f5b7131..f4878a1 100644 --- a/LiteLoader/Header/MC/DimensionBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DiodeBlock.hpp b/LiteLoader/include/llapi/mc/DiodeBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DiodeBlock.hpp rename to LiteLoader/include/llapi/mc/DiodeBlock.hpp index 688537b..9217e77 100644 --- a/LiteLoader/Header/MC/DiodeBlock.hpp +++ b/LiteLoader/include/llapi/mc/DiodeBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Direction.hpp b/LiteLoader/include/llapi/mc/Direction.hpp similarity index 96% rename from LiteLoader/Header/MC/Direction.hpp rename to LiteLoader/include/llapi/mc/Direction.hpp index 5e73708..1586127 100644 --- a/LiteLoader/Header/MC/Direction.hpp +++ b/LiteLoader/include/llapi/mc/Direction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DirectoryPackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp similarity index 98% rename from LiteLoader/Header/MC/DirectoryPackAccessStrategy.hpp rename to LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp index 639268b..2a90946 100644 --- a/LiteLoader/Header/MC/DirectoryPackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "PackAccessStrategy.hpp" diff --git a/LiteLoader/Header/MC/DirectoryPackSource.hpp b/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp similarity index 97% rename from LiteLoader/Header/MC/DirectoryPackSource.hpp rename to LiteLoader/include/llapi/mc/DirectoryPackSource.hpp index 102d429..d92fa3e 100644 --- a/LiteLoader/Header/MC/DirectoryPackSource.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DirectoryPackWithEncryptionAccessStrategy.hpp b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp similarity index 98% rename from LiteLoader/Header/MC/DirectoryPackWithEncryptionAccessStrategy.hpp rename to LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp index 742a13d..bc24418 100644 --- a/LiteLoader/Header/MC/DirectoryPackWithEncryptionAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "PackAccessStrategy.hpp" diff --git a/LiteLoader/Header/MC/DirtBlock.hpp b/LiteLoader/include/llapi/mc/DirtBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/DirtBlock.hpp rename to LiteLoader/include/llapi/mc/DirtBlock.hpp index 1f1f9d6..d28b6f2 100644 --- a/LiteLoader/Header/MC/DirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DirtyTicksCounter.hpp b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp similarity index 94% rename from LiteLoader/Header/MC/DirtyTicksCounter.hpp rename to LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp index cffcdea..8ee1d8f 100644 --- a/LiteLoader/Header/MC/DirtyTicksCounter.hpp +++ b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DisconnectPacket.hpp b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/DisconnectPacket.hpp rename to LiteLoader/include/llapi/mc/DisconnectPacket.hpp index e26b372..1acdf2e 100644 --- a/LiteLoader/Header/MC/DisconnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DispenserBlock.hpp b/LiteLoader/include/llapi/mc/DispenserBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DispenserBlock.hpp rename to LiteLoader/include/llapi/mc/DispenserBlock.hpp index 11f11ec..2caea9b 100644 --- a/LiteLoader/Header/MC/DispenserBlock.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DispenserBlockActor.hpp b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/DispenserBlockActor.hpp rename to LiteLoader/include/llapi/mc/DispenserBlockActor.hpp index 231accd..5878dee 100644 --- a/LiteLoader/Header/MC/DispenserBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DispenserContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp similarity index 96% rename from LiteLoader/Header/MC/DispenserContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp index 723c090..888a366 100644 --- a/LiteLoader/Header/MC/DispenserContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DisplayObjective.hpp b/LiteLoader/include/llapi/mc/DisplayObjective.hpp similarity index 96% rename from LiteLoader/Header/MC/DisplayObjective.hpp rename to LiteLoader/include/llapi/mc/DisplayObjective.hpp index f9d3713..ea1b7d0 100644 --- a/LiteLoader/Header/MC/DisplayObjective.hpp +++ b/LiteLoader/include/llapi/mc/DisplayObjective.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Dolphin.hpp b/LiteLoader/include/llapi/mc/Dolphin.hpp similarity index 98% rename from LiteLoader/Header/MC/Dolphin.hpp rename to LiteLoader/include/llapi/mc/Dolphin.hpp index 45142a2..04df75b 100644 --- a/LiteLoader/Header/MC/Dolphin.hpp +++ b/LiteLoader/include/llapi/mc/Dolphin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "WaterAnimal.hpp" diff --git a/LiteLoader/Header/MC/DolphinMoveControl.hpp b/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/DolphinMoveControl.hpp rename to LiteLoader/include/llapi/mc/DolphinMoveControl.hpp index ad2a177..d4ff54d 100644 --- a/LiteLoader/Header/MC/DolphinMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DoorBlock.hpp b/LiteLoader/include/llapi/mc/DoorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DoorBlock.hpp rename to LiteLoader/include/llapi/mc/DoorBlock.hpp index 815464d..fc8fa24 100644 --- a/LiteLoader/Header/MC/DoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Direction.hpp" #include "BlockLegacy.hpp" diff --git a/LiteLoader/Header/MC/DoorInteractGoal.hpp b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DoorInteractGoal.hpp rename to LiteLoader/include/llapi/mc/DoorInteractGoal.hpp index 9df25a0..7d57ca2 100644 --- a/LiteLoader/Header/MC/DoorInteractGoal.hpp +++ b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Direction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DoorItem.hpp b/LiteLoader/include/llapi/mc/DoorItem.hpp similarity index 98% rename from LiteLoader/Header/MC/DoorItem.hpp rename to LiteLoader/include/llapi/mc/DoorItem.hpp index 1257979..6ae5231 100644 --- a/LiteLoader/Header/MC/DoorItem.hpp +++ b/LiteLoader/include/llapi/mc/DoorItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DoublePlantBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DoublePlantBlock.hpp rename to LiteLoader/include/llapi/mc/DoublePlantBlock.hpp index b0268d8..f7910b2 100644 --- a/LiteLoader/Header/MC/DoublePlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DoublePlantFeature.hpp b/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/DoublePlantFeature.hpp rename to LiteLoader/include/llapi/mc/DoublePlantFeature.hpp index 91d4054..56ae3dd 100644 --- a/LiteLoader/Header/MC/DoublePlantFeature.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DoubleTag.hpp b/LiteLoader/include/llapi/mc/DoubleTag.hpp similarity index 97% rename from LiteLoader/Header/MC/DoubleTag.hpp rename to LiteLoader/include/llapi/mc/DoubleTag.hpp index 9596fe9..a75ecb9 100644 --- a/LiteLoader/Header/MC/DoubleTag.hpp +++ b/LiteLoader/include/llapi/mc/DoubleTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DouseFireSubcomponent.hpp b/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp similarity index 97% rename from LiteLoader/Header/MC/DouseFireSubcomponent.hpp rename to LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp index 65a4a59..cd8ad34 100644 --- a/LiteLoader/Header/MC/DouseFireSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonBaseGoalDefinition.hpp b/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonBaseGoalDefinition.hpp rename to LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp index f3bf08a..372203c 100644 --- a/LiteLoader/Header/MC/DragonBaseGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonChargePlayerDefinition.hpp b/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonChargePlayerDefinition.hpp rename to LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp index c1f5ab2..805bc39 100644 --- a/LiteLoader/Header/MC/DragonChargePlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonChargePlayerGoal.hpp b/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonChargePlayerGoal.hpp rename to LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp index bc7b90d..1700122 100644 --- a/LiteLoader/Header/MC/DragonChargePlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonDeathGoal.hpp b/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonDeathGoal.hpp rename to LiteLoader/include/llapi/mc/DragonDeathGoal.hpp index d8b5056..58dc2d9 100644 --- a/LiteLoader/Header/MC/DragonDeathGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonEggBlock.hpp b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/DragonEggBlock.hpp rename to LiteLoader/include/llapi/mc/DragonEggBlock.hpp index f79ab5c..e790d00 100644 --- a/LiteLoader/Header/MC/DragonEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonFireball.hpp b/LiteLoader/include/llapi/mc/DragonFireball.hpp similarity index 98% rename from LiteLoader/Header/MC/DragonFireball.hpp rename to LiteLoader/include/llapi/mc/DragonFireball.hpp index 2617024..b9f0754 100644 --- a/LiteLoader/Header/MC/DragonFireball.hpp +++ b/LiteLoader/include/llapi/mc/DragonFireball.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fireball.hpp" diff --git a/LiteLoader/Header/MC/DragonFlamingDefinition.hpp b/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonFlamingDefinition.hpp rename to LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp index 60fe6b8..0bfb342 100644 --- a/LiteLoader/Header/MC/DragonFlamingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonFlamingGoal.hpp b/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonFlamingGoal.hpp rename to LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp index 1dd42a1..fcd21d3 100644 --- a/LiteLoader/Header/MC/DragonFlamingGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonHoldingPatternGoal.hpp b/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DragonHoldingPatternGoal.hpp rename to LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp index 93432fe..9739f79 100644 --- a/LiteLoader/Header/MC/DragonHoldingPatternGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonLandingGoal.hpp b/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonLandingGoal.hpp rename to LiteLoader/include/llapi/mc/DragonLandingGoal.hpp index 97dc73e..2882a07 100644 --- a/LiteLoader/Header/MC/DragonLandingGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonScanningGoal.hpp b/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DragonScanningGoal.hpp rename to LiteLoader/include/llapi/mc/DragonScanningGoal.hpp index c1868ea..e6cbc85 100644 --- a/LiteLoader/Header/MC/DragonScanningGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonStrafePlayerDefinition.hpp b/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonStrafePlayerDefinition.hpp rename to LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp index f06ce06..b10b88f 100644 --- a/LiteLoader/Header/MC/DragonStrafePlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonStrafePlayerGoal.hpp b/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DragonStrafePlayerGoal.hpp rename to LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp index 747750c..632bb5c 100644 --- a/LiteLoader/Header/MC/DragonStrafePlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DragonTakeoffGoal.hpp b/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/DragonTakeoffGoal.hpp rename to LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp index 62188bd..42c10e1 100644 --- a/LiteLoader/Header/MC/DragonTakeoffGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DriedKelpBlock.hpp b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/DriedKelpBlock.hpp rename to LiteLoader/include/llapi/mc/DriedKelpBlock.hpp index ef65acf..ce1757c 100644 --- a/LiteLoader/Header/MC/DriedKelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DrinkPotionData.hpp b/LiteLoader/include/llapi/mc/DrinkPotionData.hpp similarity index 95% rename from LiteLoader/Header/MC/DrinkPotionData.hpp rename to LiteLoader/include/llapi/mc/DrinkPotionData.hpp index bc3b974..833950a 100644 --- a/LiteLoader/Header/MC/DrinkPotionData.hpp +++ b/LiteLoader/include/llapi/mc/DrinkPotionData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DrinkPotionGoal.hpp b/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/DrinkPotionGoal.hpp rename to LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp index 3579305..2d406f0 100644 --- a/LiteLoader/Header/MC/DrinkPotionGoal.hpp +++ b/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DropItemForGoal.hpp b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/DropItemForGoal.hpp rename to LiteLoader/include/llapi/mc/DropItemForGoal.hpp index 770a60c..f7c26f5 100644 --- a/LiteLoader/Header/MC/DropItemForGoal.hpp +++ b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DropperBlock.hpp b/LiteLoader/include/llapi/mc/DropperBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/DropperBlock.hpp rename to LiteLoader/include/llapi/mc/DropperBlock.hpp index 5bea862..b72970e 100644 --- a/LiteLoader/Header/MC/DropperBlock.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "DispenserBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DropperBlockActor.hpp b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/DropperBlockActor.hpp rename to LiteLoader/include/llapi/mc/DropperBlockActor.hpp index 928ba1f..3524c10 100644 --- a/LiteLoader/Header/MC/DropperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DropperContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp similarity index 96% rename from LiteLoader/Header/MC/DropperContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp index cdc621c..35b493e 100644 --- a/LiteLoader/Header/MC/DropperContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DwellerComponent.hpp b/LiteLoader/include/llapi/mc/DwellerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/DwellerComponent.hpp rename to LiteLoader/include/llapi/mc/DwellerComponent.hpp index 9adb693..817ca31 100644 --- a/LiteLoader/Header/MC/DwellerComponent.hpp +++ b/LiteLoader/include/llapi/mc/DwellerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DwellerDescription.hpp b/LiteLoader/include/llapi/mc/DwellerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/DwellerDescription.hpp rename to LiteLoader/include/llapi/mc/DwellerDescription.hpp index ac741bc..2718b77 100644 --- a/LiteLoader/Header/MC/DwellerDescription.hpp +++ b/LiteLoader/include/llapi/mc/DwellerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DwellerSystem.hpp b/LiteLoader/include/llapi/mc/DwellerSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/DwellerSystem.hpp rename to LiteLoader/include/llapi/mc/DwellerSystem.hpp index 8a253ac..3a19672 100644 --- a/LiteLoader/Header/MC/DwellerSystem.hpp +++ b/LiteLoader/include/llapi/mc/DwellerSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DyeColorUtil.hpp b/LiteLoader/include/llapi/mc/DyeColorUtil.hpp similarity index 91% rename from LiteLoader/Header/MC/DyeColorUtil.hpp rename to LiteLoader/include/llapi/mc/DyeColorUtil.hpp index 4a976ab..4dfa61e 100644 --- a/LiteLoader/Header/MC/DyeColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/DyeColorUtil.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DyePowderItem.hpp b/LiteLoader/include/llapi/mc/DyePowderItem.hpp similarity index 98% rename from LiteLoader/Header/MC/DyePowderItem.hpp rename to LiteLoader/include/llapi/mc/DyePowderItem.hpp index bf03e39..b149530 100644 --- a/LiteLoader/Header/MC/DyePowderItem.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DyeableDescription.hpp b/LiteLoader/include/llapi/mc/DyeableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/DyeableDescription.hpp rename to LiteLoader/include/llapi/mc/DyeableDescription.hpp index 87c03a7..e30b6d8 100644 --- a/LiteLoader/Header/MC/DyeableDescription.hpp +++ b/LiteLoader/include/llapi/mc/DyeableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DynamicJumpControl.hpp b/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp similarity index 97% rename from LiteLoader/Header/MC/DynamicJumpControl.hpp rename to LiteLoader/include/llapi/mc/DynamicJumpControl.hpp index d97093c..7bd6d54 100644 --- a/LiteLoader/Header/MC/DynamicJumpControl.hpp +++ b/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/DynamicJumpControlDescription.hpp b/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/DynamicJumpControlDescription.hpp rename to LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp index 9eb6691..09bf87d 100644 --- a/LiteLoader/Header/MC/DynamicJumpControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EDUWorldsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/EDUWorldsScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp index fd37024..31bfec4 100644 --- a/LiteLoader/Header/MC/EDUWorldsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Easing.hpp b/LiteLoader/include/llapi/mc/Easing.hpp similarity index 95% rename from LiteLoader/Header/MC/Easing.hpp rename to LiteLoader/include/llapi/mc/Easing.hpp index 6032ebb..60c97ff 100644 --- a/LiteLoader/Header/MC/Easing.hpp +++ b/LiteLoader/include/llapi/mc/Easing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EatBlockDefinition.hpp b/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/EatBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/EatBlockDefinition.hpp index 8511ef0..1a96a87 100644 --- a/LiteLoader/Header/MC/EatBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EatBlockGoal.hpp b/LiteLoader/include/llapi/mc/EatBlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/EatBlockGoal.hpp rename to LiteLoader/include/llapi/mc/EatBlockGoal.hpp index d1d9bf8..1455887 100644 --- a/LiteLoader/Header/MC/EatBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EatBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EatCarriedItemGoal.hpp b/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/EatCarriedItemGoal.hpp rename to LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp index c025a4f..64e1551 100644 --- a/LiteLoader/Header/MC/EatCarriedItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EconomyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/EconomyTradeableComponent.hpp rename to LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp index 6d8f732..7d4ae8b 100644 --- a/LiteLoader/Header/MC/EconomyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EconomyTradeableDescription.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/EconomyTradeableDescription.hpp rename to LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp index 6059c4d..7e86f41 100644 --- a/LiteLoader/Header/MC/EconomyTradeableDescription.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EduAppConfigs.hpp b/LiteLoader/include/llapi/mc/EduAppConfigs.hpp similarity index 95% rename from LiteLoader/Header/MC/EduAppConfigs.hpp rename to LiteLoader/include/llapi/mc/EduAppConfigs.hpp index fe8b0e0..18f696f 100644 --- a/LiteLoader/Header/MC/EduAppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/EduAppConfigs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp similarity index 95% rename from LiteLoader/Header/MC/EducationLevelSettings.hpp rename to LiteLoader/include/llapi/mc/EducationLevelSettings.hpp index d649411..126a33b 100644 --- a/LiteLoader/Header/MC/EducationLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationLocalLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp similarity index 95% rename from LiteLoader/Header/MC/EducationLocalLevelSettings.hpp rename to LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp index 1a81ad8..df69c08 100644 --- a/LiteLoader/Header/MC/EducationLocalLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationMetadata.hpp b/LiteLoader/include/llapi/mc/EducationMetadata.hpp similarity index 97% rename from LiteLoader/Header/MC/EducationMetadata.hpp rename to LiteLoader/include/llapi/mc/EducationMetadata.hpp index e3403c4..a1a3e08 100644 --- a/LiteLoader/Header/MC/EducationMetadata.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadata.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationMetadataError.hpp b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp similarity index 97% rename from LiteLoader/Header/MC/EducationMetadataError.hpp rename to LiteLoader/include/llapi/mc/EducationMetadataError.hpp index c915d3a..d8a308a 100644 --- a/LiteLoader/Header/MC/EducationMetadataError.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PackError.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationMetadataUtils.hpp b/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp similarity index 94% rename from LiteLoader/Header/MC/EducationMetadataUtils.hpp rename to LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp index 4c223d9..4db7e1d 100644 --- a/LiteLoader/Header/MC/EducationMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationOptions.hpp b/LiteLoader/include/llapi/mc/EducationOptions.hpp similarity index 97% rename from LiteLoader/Header/MC/EducationOptions.hpp rename to LiteLoader/include/llapi/mc/EducationOptions.hpp index d7a604a..95d27d2 100644 --- a/LiteLoader/Header/MC/EducationOptions.hpp +++ b/LiteLoader/include/llapi/mc/EducationOptions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EducationSettingsPacket.hpp b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/EducationSettingsPacket.hpp rename to LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp index 775d59b..e06130d 100644 --- a/LiteLoader/Header/MC/EducationSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EffectCommand.hpp b/LiteLoader/include/llapi/mc/EffectCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/EffectCommand.hpp rename to LiteLoader/include/llapi/mc/EffectCommand.hpp index 64ca386..e2bf7a7 100644 --- a/LiteLoader/Header/MC/EffectCommand.hpp +++ b/LiteLoader/include/llapi/mc/EffectCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EggItem.hpp b/LiteLoader/include/llapi/mc/EggItem.hpp similarity index 98% rename from LiteLoader/Header/MC/EggItem.hpp rename to LiteLoader/include/llapi/mc/EggItem.hpp index 04837b2..9c764fe 100644 --- a/LiteLoader/Header/MC/EggItem.hpp +++ b/LiteLoader/include/llapi/mc/EggItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ElementBlock.hpp b/LiteLoader/include/llapi/mc/ElementBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ElementBlock.hpp rename to LiteLoader/include/llapi/mc/ElementBlock.hpp index 90e4b67..560701e 100644 --- a/LiteLoader/Header/MC/ElementBlock.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ElementBlockItem.hpp b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/ElementBlockItem.hpp rename to LiteLoader/include/llapi/mc/ElementBlockItem.hpp index 530a076..5364391 100644 --- a/LiteLoader/Header/MC/ElementBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AuxDataBlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ElementConstructorContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/ElementConstructorContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp index dc44c04..67acb15 100644 --- a/LiteLoader/Header/MC/ElementConstructorContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EmoteListPacket.hpp b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/EmoteListPacket.hpp rename to LiteLoader/include/llapi/mc/EmoteListPacket.hpp index 11ecaf0..6f1e7b5 100644 --- a/LiteLoader/Header/MC/EmoteListPacket.hpp +++ b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EmotePacket.hpp b/LiteLoader/include/llapi/mc/EmotePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/EmotePacket.hpp rename to LiteLoader/include/llapi/mc/EmotePacket.hpp index 94c0da0..344911a 100644 --- a/LiteLoader/Header/MC/EmotePacket.hpp +++ b/LiteLoader/include/llapi/mc/EmotePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EmptyLootItem.hpp b/LiteLoader/include/llapi/mc/EmptyLootItem.hpp similarity index 95% rename from LiteLoader/Header/MC/EmptyLootItem.hpp rename to LiteLoader/include/llapi/mc/EmptyLootItem.hpp index b3641d7..7d35d1d 100644 --- a/LiteLoader/Header/MC/EmptyLootItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyLootItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EmptyMapItem.hpp b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp similarity index 98% rename from LiteLoader/Header/MC/EmptyMapItem.hpp rename to LiteLoader/include/llapi/mc/EmptyMapItem.hpp index dbafa8b..3e007a6 100644 --- a/LiteLoader/Header/MC/EmptyMapItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnableEncryptionCommand.hpp b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/EnableEncryptionCommand.hpp rename to LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp index f0e3f3e..0174506 100644 --- a/LiteLoader/Header/MC/EnableEncryptionCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Enchant.hpp b/LiteLoader/include/llapi/mc/Enchant.hpp similarity index 98% rename from LiteLoader/Header/MC/Enchant.hpp rename to LiteLoader/include/llapi/mc/Enchant.hpp index a64d058..5e32735 100644 --- a/LiteLoader/Header/MC/Enchant.hpp +++ b/LiteLoader/include/llapi/mc/Enchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantBookForTradingFunction.hpp b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/EnchantBookForTradingFunction.hpp rename to LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp index 1c6a3a1..2044e55 100644 --- a/LiteLoader/Header/MC/EnchantBookForTradingFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantCommand.hpp b/LiteLoader/include/llapi/mc/EnchantCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/EnchantCommand.hpp rename to LiteLoader/include/llapi/mc/EnchantCommand.hpp index 3aceb8b..806d5f9 100644 --- a/LiteLoader/Header/MC/EnchantCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnchantCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantRandomEquipmentFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/EnchantRandomEquipmentFunction.hpp rename to LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp index 82bb26c..2b74c39 100644 --- a/LiteLoader/Header/MC/EnchantRandomEquipmentFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantRandomlyFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/EnchantRandomlyFunction.hpp rename to LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp index dacc6ab..2b638d6 100644 --- a/LiteLoader/Header/MC/EnchantRandomlyFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp similarity index 99% rename from LiteLoader/Header/MC/EnchantUtils.hpp rename to LiteLoader/include/llapi/mc/EnchantUtils.hpp index 752a5b5..98cd988 100644 --- a/LiteLoader/Header/MC/EnchantUtils.hpp +++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantWithLevelsFunction.hpp b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/EnchantWithLevelsFunction.hpp rename to LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp index 0b4bf4e..19b128f 100644 --- a/LiteLoader/Header/MC/EnchantWithLevelsFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantedBookItem.hpp b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp similarity index 98% rename from LiteLoader/Header/MC/EnchantedBookItem.hpp rename to LiteLoader/include/llapi/mc/EnchantedBookItem.hpp index b04792f..b6d194c 100644 --- a/LiteLoader/Header/MC/EnchantedBookItem.hpp +++ b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantingContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/EnchantingContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp index e6ffdde..adad685 100644 --- a/LiteLoader/Header/MC/EnchantingContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantingTableBlock.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/EnchantingTableBlock.hpp rename to LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp index 1d7a4b7..297d893 100644 --- a/LiteLoader/Header/MC/EnchantingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantingTableBlockActor.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/EnchantingTableBlockActor.hpp rename to LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp index f32961b..fdb48e6 100644 --- a/LiteLoader/Header/MC/EnchantingTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnchantmentInstance.hpp b/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp similarity index 95% rename from LiteLoader/Header/MC/EnchantmentInstance.hpp rename to LiteLoader/include/llapi/mc/EnchantmentInstance.hpp index 67091ce..dd2aa54 100644 --- a/LiteLoader/Header/MC/EnchantmentInstance.hpp +++ b/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EncryptedFileAccessStrategy.hpp b/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp similarity index 98% rename from LiteLoader/Header/MC/EncryptedFileAccessStrategy.hpp rename to LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp index 7c3e779..42cc394 100644 --- a/LiteLoader/Header/MC/EncryptedFileAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "DirectoryPackAccessStrategy.hpp" diff --git a/LiteLoader/Header/MC/EncryptedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp similarity index 97% rename from LiteLoader/Header/MC/EncryptedNetworkPeer.hpp rename to LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp index 732dfa2..7b900ab 100644 --- a/LiteLoader/Header/MC/EncryptedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetworkPeer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EncryptedProxyEnv.hpp b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp similarity index 97% rename from LiteLoader/Header/MC/EncryptedProxyEnv.hpp rename to LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp index 02962b3..f20c589 100644 --- a/LiteLoader/Header/MC/EncryptedProxyEnv.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TransactionalWorldBlockTarget.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EncryptedZipTransforms.hpp b/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp similarity index 96% rename from LiteLoader/Header/MC/EncryptedZipTransforms.hpp rename to LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp index 4ffbca1..07846bf 100644 --- a/LiteLoader/Header/MC/EncryptedZipTransforms.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndCityFeature.hpp b/LiteLoader/include/llapi/mc/EndCityFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/EndCityFeature.hpp rename to LiteLoader/include/llapi/mc/EndCityFeature.hpp index b606bef..f44ce86 100644 --- a/LiteLoader/Header/MC/EndCityFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndCityFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndCityPieces.hpp b/LiteLoader/include/llapi/mc/EndCityPieces.hpp similarity index 98% rename from LiteLoader/Header/MC/EndCityPieces.hpp rename to LiteLoader/include/llapi/mc/EndCityPieces.hpp index be6f064..238c9d5 100644 --- a/LiteLoader/Header/MC/EndCityPieces.hpp +++ b/LiteLoader/include/llapi/mc/EndCityPieces.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndCityStart.hpp b/LiteLoader/include/llapi/mc/EndCityStart.hpp similarity index 96% rename from LiteLoader/Header/MC/EndCityStart.hpp rename to LiteLoader/include/llapi/mc/EndCityStart.hpp index 02c3a9d..a5d21e1 100644 --- a/LiteLoader/Header/MC/EndCityStart.hpp +++ b/LiteLoader/include/llapi/mc/EndCityStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndCrystalItem.hpp b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp similarity index 98% rename from LiteLoader/Header/MC/EndCrystalItem.hpp rename to LiteLoader/include/llapi/mc/EndCrystalItem.hpp index e985d1a..07b0d5b 100644 --- a/LiteLoader/Header/MC/EndCrystalItem.hpp +++ b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndDragonFight.hpp b/LiteLoader/include/llapi/mc/EndDragonFight.hpp similarity index 98% rename from LiteLoader/Header/MC/EndDragonFight.hpp rename to LiteLoader/include/llapi/mc/EndDragonFight.hpp index 41b9832..b340dd3 100644 --- a/LiteLoader/Header/MC/EndDragonFight.hpp +++ b/LiteLoader/include/llapi/mc/EndDragonFight.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndGatewayBlock.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/EndGatewayBlock.hpp rename to LiteLoader/include/llapi/mc/EndGatewayBlock.hpp index 3fbe410..dec1aa4 100644 --- a/LiteLoader/Header/MC/EndGatewayBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndGatewayBlockActor.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/EndGatewayBlockActor.hpp rename to LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp index d9fd6a5..1efdd1b 100644 --- a/LiteLoader/Header/MC/EndGatewayBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndGatewayFeature.hpp b/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/EndGatewayFeature.hpp rename to LiteLoader/include/llapi/mc/EndGatewayFeature.hpp index 2235229..4a8aa87 100644 --- a/LiteLoader/Header/MC/EndGatewayFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndIslandFeature.hpp b/LiteLoader/include/llapi/mc/EndIslandFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/EndIslandFeature.hpp rename to LiteLoader/include/llapi/mc/EndIslandFeature.hpp index b67e8f8..c85dc24 100644 --- a/LiteLoader/Header/MC/EndIslandFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndIslandFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndPodiumFeature.hpp b/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/EndPodiumFeature.hpp rename to LiteLoader/include/llapi/mc/EndPodiumFeature.hpp index 5db0fb3..8b5100f 100644 --- a/LiteLoader/Header/MC/EndPodiumFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndPortalBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/EndPortalBlock.hpp rename to LiteLoader/include/llapi/mc/EndPortalBlock.hpp index 6fbd8e9..11f19b9 100644 --- a/LiteLoader/Header/MC/EndPortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndPortalBlockActor.hpp b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp similarity index 96% rename from LiteLoader/Header/MC/EndPortalBlockActor.hpp rename to LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp index fae32d2..dfffbc4 100644 --- a/LiteLoader/Header/MC/EndPortalBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndPortalFrameBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/EndPortalFrameBlock.hpp rename to LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp index d37acbe..5f9f250 100644 --- a/LiteLoader/Header/MC/EndPortalFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndPortalShape.hpp b/LiteLoader/include/llapi/mc/EndPortalShape.hpp similarity index 96% rename from LiteLoader/Header/MC/EndPortalShape.hpp rename to LiteLoader/include/llapi/mc/EndPortalShape.hpp index 034d774..5e45ff8 100644 --- a/LiteLoader/Header/MC/EndPortalShape.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalShape.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndRodBlock.hpp b/LiteLoader/include/llapi/mc/EndRodBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/EndRodBlock.hpp rename to LiteLoader/include/llapi/mc/EndRodBlock.hpp index 8cd9831..9363a87 100644 --- a/LiteLoader/Header/MC/EndRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndRodBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndTag.hpp b/LiteLoader/include/llapi/mc/EndTag.hpp similarity index 97% rename from LiteLoader/Header/MC/EndTag.hpp rename to LiteLoader/include/llapi/mc/EndTag.hpp index 75fd252..ad33548 100644 --- a/LiteLoader/Header/MC/EndTag.hpp +++ b/LiteLoader/include/llapi/mc/EndTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderChestBlock.hpp b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/EnderChestBlock.hpp rename to LiteLoader/include/llapi/mc/EnderChestBlock.hpp index ef0e03b..c9b16a0 100644 --- a/LiteLoader/Header/MC/EnderChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChestBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderChestBlockActor.hpp b/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp similarity index 96% rename from LiteLoader/Header/MC/EnderChestBlockActor.hpp rename to LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp index 1beb05b..4c58daa 100644 --- a/LiteLoader/Header/MC/EnderChestBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderChestContainer.hpp b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp similarity index 96% rename from LiteLoader/Header/MC/EnderChestContainer.hpp rename to LiteLoader/include/llapi/mc/EnderChestContainer.hpp index ea8ee16..69c565c 100644 --- a/LiteLoader/Header/MC/EnderChestContainer.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FillingContainer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderCrystal.hpp b/LiteLoader/include/llapi/mc/EnderCrystal.hpp similarity index 98% rename from LiteLoader/Header/MC/EnderCrystal.hpp rename to LiteLoader/include/llapi/mc/EnderCrystal.hpp index 4004712..b25c1d8 100644 --- a/LiteLoader/Header/MC/EnderCrystal.hpp +++ b/LiteLoader/include/llapi/mc/EnderCrystal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderDragon.hpp b/LiteLoader/include/llapi/mc/EnderDragon.hpp similarity index 99% rename from LiteLoader/Header/MC/EnderDragon.hpp rename to LiteLoader/include/llapi/mc/EnderDragon.hpp index 71db315..fada3bf 100644 --- a/LiteLoader/Header/MC/EnderDragon.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragon.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/EnderEyeItem.hpp b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp similarity index 97% rename from LiteLoader/Header/MC/EnderEyeItem.hpp rename to LiteLoader/include/llapi/mc/EnderEyeItem.hpp index a43b656..075edd3 100644 --- a/LiteLoader/Header/MC/EnderEyeItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnderMan.hpp b/LiteLoader/include/llapi/mc/EnderMan.hpp similarity index 99% rename from LiteLoader/Header/MC/EnderMan.hpp rename to LiteLoader/include/llapi/mc/EnderMan.hpp index 31a77e3..00ea340 100644 --- a/LiteLoader/Header/MC/EnderMan.hpp +++ b/LiteLoader/include/llapi/mc/EnderMan.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/EndermanLeaveBlockGoal.hpp b/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/EndermanLeaveBlockGoal.hpp rename to LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp index f2d849e..1b0e93e 100644 --- a/LiteLoader/Header/MC/EndermanLeaveBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EndermanTakeBlockGoal.hpp b/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/EndermanTakeBlockGoal.hpp rename to LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp index 8839f67..94a0163 100644 --- a/LiteLoader/Header/MC/EndermanTakeBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Endermite.hpp b/LiteLoader/include/llapi/mc/Endermite.hpp similarity index 98% rename from LiteLoader/Header/MC/Endermite.hpp rename to LiteLoader/include/llapi/mc/Endermite.hpp index 5e71e68..2788f6d 100644 --- a/LiteLoader/Header/MC/Endermite.hpp +++ b/LiteLoader/include/llapi/mc/Endermite.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/EnderpearlItem.hpp b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp similarity index 98% rename from LiteLoader/Header/MC/EnderpearlItem.hpp rename to LiteLoader/include/llapi/mc/EnderpearlItem.hpp index 2c2e81a..80c1a5d 100644 --- a/LiteLoader/Header/MC/EnderpearlItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntityComponentFactory.hpp b/LiteLoader/include/llapi/mc/EntityComponentFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/EntityComponentFactory.hpp rename to LiteLoader/include/llapi/mc/EntityComponentFactory.hpp index ac67259..6416316 100644 --- a/LiteLoader/Header/MC/EntityComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/EntityComponentFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntityGoalFactory.hpp b/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/EntityGoalFactory.hpp rename to LiteLoader/include/llapi/mc/EntityGoalFactory.hpp index e064404..4e278bc 100644 --- a/LiteLoader/Header/MC/EntityGoalFactory.hpp +++ b/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntityGoalUtility.hpp b/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp similarity index 90% rename from LiteLoader/Header/MC/EntityGoalUtility.hpp rename to LiteLoader/include/llapi/mc/EntityGoalUtility.hpp index 6adfe27..eb20777 100644 --- a/LiteLoader/Header/MC/EntityGoalUtility.hpp +++ b/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntitySensorComponent.hpp b/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/EntitySensorComponent.hpp rename to LiteLoader/include/llapi/mc/EntitySensorComponent.hpp index 744ba6a..4fd2fe1 100644 --- a/LiteLoader/Header/MC/EntitySensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntitySensorDefinition.hpp b/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/EntitySensorDefinition.hpp rename to LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp index 7c77562..ade1c52 100644 --- a/LiteLoader/Header/MC/EntitySensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntitySensorSystem.hpp b/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/EntitySensorSystem.hpp rename to LiteLoader/include/llapi/mc/EntitySensorSystem.hpp index 8bd64f4..826922f 100644 --- a/LiteLoader/Header/MC/EntitySensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntityServerPacket.hpp b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp similarity index 95% rename from LiteLoader/Header/MC/EntityServerPacket.hpp rename to LiteLoader/include/llapi/mc/EntityServerPacket.hpp index a86aed9..424c8a4 100644 --- a/LiteLoader/Header/MC/EntityServerPacket.hpp +++ b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntitySystems.hpp b/LiteLoader/include/llapi/mc/EntitySystems.hpp similarity index 95% rename from LiteLoader/Header/MC/EntitySystems.hpp rename to LiteLoader/include/llapi/mc/EntitySystems.hpp index 7bb0b77..65e8308 100644 --- a/LiteLoader/Header/MC/EntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystems.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EntityTypes.hpp b/LiteLoader/include/llapi/mc/EntityTypes.hpp similarity index 95% rename from LiteLoader/Header/MC/EntityTypes.hpp rename to LiteLoader/include/llapi/mc/EntityTypes.hpp index 228f64e..8cb5d36 100644 --- a/LiteLoader/Header/MC/EntityTypes.hpp +++ b/LiteLoader/include/llapi/mc/EntityTypes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnvironmentRequirement.hpp b/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp similarity index 95% rename from LiteLoader/Header/MC/EnvironmentRequirement.hpp rename to LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp index 07d915a..5748db4 100644 --- a/LiteLoader/Header/MC/EnvironmentRequirement.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnvironmentSensorDefinition.hpp b/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/EnvironmentSensorDefinition.hpp rename to LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp index 49031d2..fa577be 100644 --- a/LiteLoader/Header/MC/EnvironmentSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EnvironmentSensorSystem.hpp b/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/EnvironmentSensorSystem.hpp rename to LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp index 994d848..8d27c25 100644 --- a/LiteLoader/Header/MC/EnvironmentSensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EquipItemComponent.hpp b/LiteLoader/include/llapi/mc/EquipItemComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/EquipItemComponent.hpp rename to LiteLoader/include/llapi/mc/EquipItemComponent.hpp index 493e1f3..ab0c1d9 100644 --- a/LiteLoader/Header/MC/EquipItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EquipItemComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EquipItemGoal.hpp b/LiteLoader/include/llapi/mc/EquipItemGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/EquipItemGoal.hpp rename to LiteLoader/include/llapi/mc/EquipItemGoal.hpp index 758220d..330cbf6 100644 --- a/LiteLoader/Header/MC/EquipItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/EquipItemGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EquipmentTableDescription.hpp b/LiteLoader/include/llapi/mc/EquipmentTableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/EquipmentTableDescription.hpp rename to LiteLoader/include/llapi/mc/EquipmentTableDescription.hpp index 94900a7..21ba403 100644 --- a/LiteLoader/Header/MC/EquipmentTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/EquipmentTableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EquippableComponent.hpp b/LiteLoader/include/llapi/mc/EquippableComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/EquippableComponent.hpp rename to LiteLoader/include/llapi/mc/EquippableComponent.hpp index f1441a6..77f77dd 100644 --- a/LiteLoader/Header/MC/EquippableComponent.hpp +++ b/LiteLoader/include/llapi/mc/EquippableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EquippableDefinition.hpp b/LiteLoader/include/llapi/mc/EquippableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/EquippableDefinition.hpp rename to LiteLoader/include/llapi/mc/EquippableDefinition.hpp index 8a3c414..f914bfa 100644 --- a/LiteLoader/Header/MC/EquippableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EquippableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/ErrorPathStack.hpp b/LiteLoader/include/llapi/mc/ErrorPathStack.hpp similarity index 95% rename from LiteLoader/Header/MC/ErrorPathStack.hpp rename to LiteLoader/include/llapi/mc/ErrorPathStack.hpp index e3c5dab..d9a5dd7 100644 --- a/LiteLoader/Header/MC/ErrorPathStack.hpp +++ b/LiteLoader/include/llapi/mc/ErrorPathStack.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EventInfo.hpp b/LiteLoader/include/llapi/mc/EventInfo.hpp similarity index 94% rename from LiteLoader/Header/MC/EventInfo.hpp rename to LiteLoader/include/llapi/mc/EventInfo.hpp index 6f3af0a..4b65c61 100644 --- a/LiteLoader/Header/MC/EventInfo.hpp +++ b/LiteLoader/include/llapi/mc/EventInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp similarity index 98% rename from LiteLoader/Header/MC/EventPacket.hpp rename to LiteLoader/include/llapi/mc/EventPacket.hpp index efcb760..aa93e02 100644 --- a/LiteLoader/Header/MC/EventPacket.hpp +++ b/LiteLoader/include/llapi/mc/EventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MinecraftEventing.hpp" #include "Packet.hpp" diff --git a/LiteLoader/Header/MC/EvocationFang.hpp b/LiteLoader/include/llapi/mc/EvocationFang.hpp similarity index 98% rename from LiteLoader/Header/MC/EvocationFang.hpp rename to LiteLoader/include/llapi/mc/EvocationFang.hpp index 92b5bb8..46482ff 100644 --- a/LiteLoader/Header/MC/EvocationFang.hpp +++ b/LiteLoader/include/llapi/mc/EvocationFang.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EvocationIllager.hpp b/LiteLoader/include/llapi/mc/EvocationIllager.hpp similarity index 98% rename from LiteLoader/Header/MC/EvocationIllager.hpp rename to LiteLoader/include/llapi/mc/EvocationIllager.hpp index 7354ebb..7bb5341 100644 --- a/LiteLoader/Header/MC/EvocationIllager.hpp +++ b/LiteLoader/include/llapi/mc/EvocationIllager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/ExecuteCommand.hpp b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ExecuteCommand.hpp rename to LiteLoader/include/llapi/mc/ExecuteCommand.hpp index 802fb4e..e9bbd12 100644 --- a/LiteLoader/Header/MC/ExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExhaustionAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp similarity index 96% rename from LiteLoader/Header/MC/ExhaustionAttributeDelegate.hpp rename to LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp index 0a6023b..596d988 100644 --- a/LiteLoader/Header/MC/ExhaustionAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AttributeInstanceDelegate.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExperienceOrb.hpp b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp similarity index 98% rename from LiteLoader/Header/MC/ExperienceOrb.hpp rename to LiteLoader/include/llapi/mc/ExperienceOrb.hpp index b7bf30d..3e80ed3 100644 --- a/LiteLoader/Header/MC/ExperienceOrb.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExperiencePotion.hpp b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp similarity index 98% rename from LiteLoader/Header/MC/ExperiencePotion.hpp rename to LiteLoader/include/llapi/mc/ExperiencePotion.hpp index be09a1b..498a8e0 100644 --- a/LiteLoader/Header/MC/ExperiencePotion.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/ExperiencePotionItem.hpp b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ExperiencePotionItem.hpp rename to LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp index 09b9569..aa4f194 100644 --- a/LiteLoader/Header/MC/ExperiencePotionItem.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExperienceRewardComponent.hpp b/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ExperienceRewardComponent.hpp rename to LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp index 9a74f19..f0e1426 100644 --- a/LiteLoader/Header/MC/ExperienceRewardComponent.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExperienceRewardDefinition.hpp b/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/ExperienceRewardDefinition.hpp rename to LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp index 481f90a..db81de6 100644 --- a/LiteLoader/Header/MC/ExperienceRewardDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExplodeComponent.hpp b/LiteLoader/include/llapi/mc/ExplodeComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ExplodeComponent.hpp rename to LiteLoader/include/llapi/mc/ExplodeComponent.hpp index 22cfdc3..67a886f 100644 --- a/LiteLoader/Header/MC/ExplodeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExplodeDefinition.hpp b/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ExplodeDefinition.hpp rename to LiteLoader/include/llapi/mc/ExplodeDefinition.hpp index 9bee0c5..90adbd2 100644 --- a/LiteLoader/Header/MC/ExplodeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/ExplodeSystem.hpp b/LiteLoader/include/llapi/mc/ExplodeSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/ExplodeSystem.hpp rename to LiteLoader/include/llapi/mc/ExplodeSystem.hpp index 61412e7..495a573 100644 --- a/LiteLoader/Header/MC/ExplodeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExplorationMapFunction.hpp b/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/ExplorationMapFunction.hpp rename to LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp index 62b5668..882647e 100644 --- a/LiteLoader/Header/MC/ExplorationMapFunction.hpp +++ b/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/ExploreOutskirtsGoal.hpp b/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ExploreOutskirtsGoal.hpp rename to LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp index b2cf0bf..2d50370 100644 --- a/LiteLoader/Header/MC/ExploreOutskirtsGoal.hpp +++ b/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Explosion.hpp b/LiteLoader/include/llapi/mc/Explosion.hpp similarity index 95% rename from LiteLoader/Header/MC/Explosion.hpp rename to LiteLoader/include/llapi/mc/Explosion.hpp index 6dba24e..6082a27 100644 --- a/LiteLoader/Header/MC/Explosion.hpp +++ b/LiteLoader/include/llapi/mc/Explosion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExplosionDecayFunction.hpp b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/ExplosionDecayFunction.hpp rename to LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp index 05e7906..43acb14 100644 --- a/LiteLoader/Header/MC/ExplosionDecayFunction.hpp +++ b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp similarity index 99% rename from LiteLoader/Header/MC/ExpressionNode.hpp rename to LiteLoader/include/llapi/mc/ExpressionNode.hpp index 3715336..20ff1e5 100644 --- a/LiteLoader/Header/MC/ExpressionNode.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Bedrock.hpp" diff --git a/LiteLoader/Header/MC/ExtendedCertificate.hpp b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp similarity index 96% rename from LiteLoader/Header/MC/ExtendedCertificate.hpp rename to LiteLoader/include/llapi/mc/ExtendedCertificate.hpp index f7ea59f..235f606 100644 --- a/LiteLoader/Header/MC/ExtendedCertificate.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExtendedStreamReadResult.hpp b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp similarity index 96% rename from LiteLoader/Header/MC/ExtendedStreamReadResult.hpp rename to LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp index f13deb8..6f7a633 100644 --- a/LiteLoader/Header/MC/ExtendedStreamReadResult.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExternalFileLevelStorage.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp similarity index 98% rename from LiteLoader/Header/MC/ExternalFileLevelStorage.hpp rename to LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp index 72aaca5..c23b387 100644 --- a/LiteLoader/Header/MC/ExternalFileLevelStorage.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ExternalFileLevelStorageSource.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp similarity index 99% rename from LiteLoader/Header/MC/ExternalFileLevelStorageSource.hpp rename to LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp index ca7c9c9..b9f385d 100644 --- a/LiteLoader/Header/MC/ExternalFileLevelStorageSource.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/EyeOfEnder.hpp b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp similarity index 98% rename from LiteLoader/Header/MC/EyeOfEnder.hpp rename to LiteLoader/include/llapi/mc/EyeOfEnder.hpp index ee66f0d..2fac3d8 100644 --- a/LiteLoader/Header/MC/EyeOfEnder.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FaceDirectionalActorBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp similarity index 97% rename from LiteLoader/Header/MC/FaceDirectionalActorBlock.hpp rename to LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp index 022d70d..f0ec712 100644 --- a/LiteLoader/Header/MC/FaceDirectionalActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FaceDirectionalBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp similarity index 97% rename from LiteLoader/Header/MC/FaceDirectionalBlock.hpp rename to LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp index 1f47b18..366100d 100644 --- a/LiteLoader/Header/MC/FaceDirectionalBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Facing.hpp b/LiteLoader/include/llapi/mc/Facing.hpp similarity index 98% rename from LiteLoader/Header/MC/Facing.hpp rename to LiteLoader/include/llapi/mc/Facing.hpp index 723f12c..6087a4d 100644 --- a/LiteLoader/Header/MC/Facing.hpp +++ b/LiteLoader/include/llapi/mc/Facing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "math.h" diff --git a/LiteLoader/Header/MC/FallenTreeTrunk.hpp b/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp similarity index 96% rename from LiteLoader/Header/MC/FallenTreeTrunk.hpp rename to LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp index 74ac9cc..8062cf8 100644 --- a/LiteLoader/Header/MC/FallenTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FallingBlock.hpp b/LiteLoader/include/llapi/mc/FallingBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/FallingBlock.hpp rename to LiteLoader/include/llapi/mc/FallingBlock.hpp index bc29187..bb9af14 100644 --- a/LiteLoader/Header/MC/FallingBlock.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FamilyTypeDescription.hpp b/LiteLoader/include/llapi/mc/FamilyTypeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FamilyTypeDescription.hpp rename to LiteLoader/include/llapi/mc/FamilyTypeDescription.hpp index a52c236..db10ebe 100644 --- a/LiteLoader/Header/MC/FamilyTypeDescription.hpp +++ b/LiteLoader/include/llapi/mc/FamilyTypeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FancyTreeCanopy.hpp b/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp similarity index 97% rename from LiteLoader/Header/MC/FancyTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp index 2f6a05d..da38acf 100644 --- a/LiteLoader/Header/MC/FancyTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FancyTreeTrunk.hpp b/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp similarity index 97% rename from LiteLoader/Header/MC/FancyTreeTrunk.hpp rename to LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp index b948b92..b66859c 100644 --- a/LiteLoader/Header/MC/FancyTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FarmBlock.hpp b/LiteLoader/include/llapi/mc/FarmBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/FarmBlock.hpp rename to LiteLoader/include/llapi/mc/FarmBlock.hpp index 6a3966d..d341dff 100644 --- a/LiteLoader/Header/MC/FarmBlock.hpp +++ b/LiteLoader/include/llapi/mc/FarmBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Feature.hpp b/LiteLoader/include/llapi/mc/Feature.hpp similarity index 97% rename from LiteLoader/Header/MC/Feature.hpp rename to LiteLoader/include/llapi/mc/Feature.hpp index 6c60f0e..8579a1d 100644 --- a/LiteLoader/Header/MC/Feature.hpp +++ b/LiteLoader/include/llapi/mc/Feature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeatureHelper.hpp b/LiteLoader/include/llapi/mc/FeatureHelper.hpp similarity index 91% rename from LiteLoader/Header/MC/FeatureHelper.hpp rename to LiteLoader/include/llapi/mc/FeatureHelper.hpp index 72de2e8..0fa2b93 100644 --- a/LiteLoader/Header/MC/FeatureHelper.hpp +++ b/LiteLoader/include/llapi/mc/FeatureHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeaturePoolElement.hpp b/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp similarity index 97% rename from LiteLoader/Header/MC/FeaturePoolElement.hpp rename to LiteLoader/include/llapi/mc/FeaturePoolElement.hpp index 13e03dd..c0b2eef 100644 --- a/LiteLoader/Header/MC/FeaturePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePoolElement.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeatureRegistry.hpp b/LiteLoader/include/llapi/mc/FeatureRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/FeatureRegistry.hpp rename to LiteLoader/include/llapi/mc/FeatureRegistry.hpp index e92bdc8..4d85c31 100644 --- a/LiteLoader/Header/MC/FeatureRegistry.hpp +++ b/LiteLoader/include/llapi/mc/FeatureRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeatureToggles.hpp b/LiteLoader/include/llapi/mc/FeatureToggles.hpp similarity index 97% rename from LiteLoader/Header/MC/FeatureToggles.hpp rename to LiteLoader/include/llapi/mc/FeatureToggles.hpp index fbef921..e56f4aa 100644 --- a/LiteLoader/Header/MC/FeatureToggles.hpp +++ b/LiteLoader/include/llapi/mc/FeatureToggles.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeatureTypeFactory.hpp b/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/FeatureTypeFactory.hpp rename to LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp index ef3ca2f..6b0404e 100644 --- a/LiteLoader/Header/MC/FeatureTypeFactory.hpp +++ b/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FeedItem.hpp b/LiteLoader/include/llapi/mc/FeedItem.hpp similarity index 95% rename from LiteLoader/Header/MC/FeedItem.hpp rename to LiteLoader/include/llapi/mc/FeedItem.hpp index d744571..23786f6 100644 --- a/LiteLoader/Header/MC/FeedItem.hpp +++ b/LiteLoader/include/llapi/mc/FeedItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FenceBlock.hpp b/LiteLoader/include/llapi/mc/FenceBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FenceBlock.hpp rename to LiteLoader/include/llapi/mc/FenceBlock.hpp index 3710a20..c0bd5e1 100644 --- a/LiteLoader/Header/MC/FenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FenceGateBlock.hpp b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FenceGateBlock.hpp rename to LiteLoader/include/llapi/mc/FenceGateBlock.hpp index 8077b9d..57acb68 100644 --- a/LiteLoader/Header/MC/FenceGateBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FertilizerItem.hpp b/LiteLoader/include/llapi/mc/FertilizerItem.hpp similarity index 96% rename from LiteLoader/Header/MC/FertilizerItem.hpp rename to LiteLoader/include/llapi/mc/FertilizerItem.hpp index 71b0487..1f1ad4c 100644 --- a/LiteLoader/Header/MC/FertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/FertilizerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileAccessTransforms.hpp b/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp similarity index 96% rename from LiteLoader/Header/MC/FileAccessTransforms.hpp rename to LiteLoader/include/llapi/mc/FileAccessTransforms.hpp index 684d42d..7dcd6f6 100644 --- a/LiteLoader/Header/MC/FileAccessTransforms.hpp +++ b/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileArchiver.hpp b/LiteLoader/include/llapi/mc/FileArchiver.hpp similarity index 97% rename from LiteLoader/Header/MC/FileArchiver.hpp rename to LiteLoader/include/llapi/mc/FileArchiver.hpp index 1e024d0..f346ab6 100644 --- a/LiteLoader/Header/MC/FileArchiver.hpp +++ b/LiteLoader/include/llapi/mc/FileArchiver.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileChunkManager.hpp b/LiteLoader/include/llapi/mc/FileChunkManager.hpp similarity index 95% rename from LiteLoader/Header/MC/FileChunkManager.hpp rename to LiteLoader/include/llapi/mc/FileChunkManager.hpp index 35f72d2..8f13311 100644 --- a/LiteLoader/Header/MC/FileChunkManager.hpp +++ b/LiteLoader/include/llapi/mc/FileChunkManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileInfo.hpp b/LiteLoader/include/llapi/mc/FileInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/FileInfo.hpp rename to LiteLoader/include/llapi/mc/FileInfo.hpp index 3c5a66f..0896aa7 100644 --- a/LiteLoader/Header/MC/FileInfo.hpp +++ b/LiteLoader/include/llapi/mc/FileInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileSystemFileAccess.hpp b/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp similarity index 97% rename from LiteLoader/Header/MC/FileSystemFileAccess.hpp rename to LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp index 5c8aadb..6427da7 100644 --- a/LiteLoader/Header/MC/FileSystemFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FileUploadManager.hpp b/LiteLoader/include/llapi/mc/FileUploadManager.hpp similarity index 97% rename from LiteLoader/Header/MC/FileUploadManager.hpp rename to LiteLoader/include/llapi/mc/FileUploadManager.hpp index 1b216db..1946f08 100644 --- a/LiteLoader/Header/MC/FileUploadManager.hpp +++ b/LiteLoader/include/llapi/mc/FileUploadManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FillCommand.hpp b/LiteLoader/include/llapi/mc/FillCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/FillCommand.hpp rename to LiteLoader/include/llapi/mc/FillCommand.hpp index b87e312..b2be6e5 100644 --- a/LiteLoader/Header/MC/FillCommand.hpp +++ b/LiteLoader/include/llapi/mc/FillCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FillContainerFunction.hpp b/LiteLoader/include/llapi/mc/FillContainerFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/FillContainerFunction.hpp rename to LiteLoader/include/llapi/mc/FillContainerFunction.hpp index e2e22d4..ffcdae3 100644 --- a/LiteLoader/Header/MC/FillContainerFunction.hpp +++ b/LiteLoader/include/llapi/mc/FillContainerFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/FillingContainer.hpp b/LiteLoader/include/llapi/mc/FillingContainer.hpp similarity index 98% rename from LiteLoader/Header/MC/FillingContainer.hpp rename to LiteLoader/include/llapi/mc/FillingContainer.hpp index 92a8303..996d7a3 100644 --- a/LiteLoader/Header/MC/FillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/FillingContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Container.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterContext.hpp b/LiteLoader/include/llapi/mc/FilterContext.hpp similarity index 94% rename from LiteLoader/Header/MC/FilterContext.hpp rename to LiteLoader/include/llapi/mc/FilterContext.hpp index cd20baf..7e498de 100644 --- a/LiteLoader/Header/MC/FilterContext.hpp +++ b/LiteLoader/include/llapi/mc/FilterContext.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp similarity index 98% rename from LiteLoader/Header/MC/FilterGroup.hpp rename to LiteLoader/include/llapi/mc/FilterGroup.hpp index 322bd36..3f4b294 100644 --- a/LiteLoader/Header/MC/FilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/FilterGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "FilterTest.hpp" diff --git a/LiteLoader/Header/MC/FilterInput.hpp b/LiteLoader/include/llapi/mc/FilterInput.hpp similarity index 95% rename from LiteLoader/Header/MC/FilterInput.hpp rename to LiteLoader/include/llapi/mc/FilterInput.hpp index 3e0312f..d6162a2 100644 --- a/LiteLoader/Header/MC/FilterInput.hpp +++ b/LiteLoader/include/llapi/mc/FilterInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterInputDefinition.hpp b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterInputDefinition.hpp rename to LiteLoader/include/llapi/mc/FilterInputDefinition.hpp index e808b41..de512b2 100644 --- a/LiteLoader/Header/MC/FilterInputDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterInputs.hpp b/LiteLoader/include/llapi/mc/FilterInputs.hpp similarity index 95% rename from LiteLoader/Header/MC/FilterInputs.hpp rename to LiteLoader/include/llapi/mc/FilterInputs.hpp index 241948a..f57cf46 100644 --- a/LiteLoader/Header/MC/FilterInputs.hpp +++ b/LiteLoader/include/llapi/mc/FilterInputs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterList.hpp b/LiteLoader/include/llapi/mc/FilterList.hpp similarity index 92% rename from LiteLoader/Header/MC/FilterList.hpp rename to LiteLoader/include/llapi/mc/FilterList.hpp index 662aa55..d648ce0 100644 --- a/LiteLoader/Header/MC/FilterList.hpp +++ b/LiteLoader/include/llapi/mc/FilterList.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterParamDefinition.hpp b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterParamDefinition.hpp rename to LiteLoader/include/llapi/mc/FilterParamDefinition.hpp index f37ad1c..b7884bc 100644 --- a/LiteLoader/Header/MC/FilterParamDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterStringMap.hpp b/LiteLoader/include/llapi/mc/FilterStringMap.hpp similarity index 95% rename from LiteLoader/Header/MC/FilterStringMap.hpp rename to LiteLoader/include/llapi/mc/FilterStringMap.hpp index f268875..f176fbd 100644 --- a/LiteLoader/Header/MC/FilterStringMap.hpp +++ b/LiteLoader/include/llapi/mc/FilterStringMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTest.hpp rename to LiteLoader/include/llapi/mc/FilterTest.hpp index 3fab27d..e62e42a 100644 --- a/LiteLoader/Header/MC/FilterTest.hpp +++ b/LiteLoader/include/llapi/mc/FilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FilterTestAltitude.hpp b/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestAltitude.hpp rename to LiteLoader/include/llapi/mc/FilterTestAltitude.hpp index bcb4754..ed521da 100644 --- a/LiteLoader/Header/MC/FilterTestAltitude.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestBiome.hpp b/LiteLoader/include/llapi/mc/FilterTestBiome.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestBiome.hpp rename to LiteLoader/include/llapi/mc/FilterTestBiome.hpp index 7e5cfa7..7f49e7a 100644 --- a/LiteLoader/Header/MC/FilterTestBiome.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiome.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestBiomeHasTag.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTestBiomeHasTag.hpp rename to LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp index 42ec3b4..b0147fd 100644 --- a/LiteLoader/Header/MC/FilterTestBiomeHasTag.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestBiomeHumid.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestBiomeHumid.hpp rename to LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp index 5f853d7..9bf12f6 100644 --- a/LiteLoader/Header/MC/FilterTestBiomeHumid.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestBiomeSnowCovered.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestBiomeSnowCovered.hpp rename to LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp index ee17ef1..cbfffd7 100644 --- a/LiteLoader/Header/MC/FilterTestBiomeSnowCovered.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestBrightness.hpp b/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestBrightness.hpp rename to LiteLoader/include/llapi/mc/FilterTestBrightness.hpp index cd7e0b1..509cc0b 100644 --- a/LiteLoader/Header/MC/FilterTestBrightness.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestClock.hpp b/LiteLoader/include/llapi/mc/FilterTestClock.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestClock.hpp rename to LiteLoader/include/llapi/mc/FilterTestClock.hpp index 3ed756d..f8a7b43 100644 --- a/LiteLoader/Header/MC/FilterTestClock.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestClock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestDaytime.hpp b/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestDaytime.hpp rename to LiteLoader/include/llapi/mc/FilterTestDaytime.hpp index 9ce8cd2..c3cc25b 100644 --- a/LiteLoader/Header/MC/FilterTestDaytime.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestDifficulty.hpp b/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestDifficulty.hpp rename to LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp index a565e64..fa4cc63 100644 --- a/LiteLoader/Header/MC/FilterTestDifficulty.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestDimensionWeather.hpp b/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTestDimensionWeather.hpp rename to LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp index bc0f02d..032c0be 100644 --- a/LiteLoader/Header/MC/FilterTestDimensionWeather.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestDistanceToNearestPlayer.hpp b/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTestDistanceToNearestPlayer.hpp rename to LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp index 95a3542..c8e282c 100644 --- a/LiteLoader/Header/MC/FilterTestDistanceToNearestPlayer.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestGameRule.hpp b/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTestGameRule.hpp rename to LiteLoader/include/llapi/mc/FilterTestGameRule.hpp index aae25d3..9a6db38 100644 --- a/LiteLoader/Header/MC/FilterTestGameRule.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestHasTradeSupply.hpp b/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestHasTradeSupply.hpp rename to LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp index e486f61..2f8c39b 100644 --- a/LiteLoader/Header/MC/FilterTestHasTradeSupply.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestHourlyClock.hpp b/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp similarity index 97% rename from LiteLoader/Header/MC/FilterTestHourlyClock.hpp rename to LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp index 05b66c6..3b5002a 100644 --- a/LiteLoader/Header/MC/FilterTestHourlyClock.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestLightLevel.hpp b/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestLightLevel.hpp rename to LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp index 12f6e2d..40146cd 100644 --- a/LiteLoader/Header/MC/FilterTestLightLevel.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestMoonIntensity.hpp b/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestMoonIntensity.hpp rename to LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp index 4a6d6a1..e25d2e3 100644 --- a/LiteLoader/Header/MC/FilterTestMoonIntensity.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestMoonPhase.hpp b/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestMoonPhase.hpp rename to LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp index 65a1dc8..def27c9 100644 --- a/LiteLoader/Header/MC/FilterTestMoonPhase.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestTemperatureType.hpp b/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestTemperatureType.hpp rename to LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp index aef0537..e19b0bc 100644 --- a/LiteLoader/Header/MC/FilterTestTemperatureType.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FilterTestTemperatureValue.hpp b/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp similarity index 96% rename from LiteLoader/Header/MC/FilterTestTemperatureValue.hpp rename to LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp index a33f63b..57e7b7c 100644 --- a/LiteLoader/Header/MC/FilterTestTemperatureValue.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FilterTest.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FindActorDefinition.hpp b/LiteLoader/include/llapi/mc/FindActorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FindActorDefinition.hpp rename to LiteLoader/include/llapi/mc/FindActorDefinition.hpp index 7c7a932..5f993bb 100644 --- a/LiteLoader/Header/MC/FindActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FindActorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/FindActorNode.hpp b/LiteLoader/include/llapi/mc/FindActorNode.hpp similarity index 95% rename from LiteLoader/Header/MC/FindActorNode.hpp rename to LiteLoader/include/llapi/mc/FindActorNode.hpp index 94cfe3e..a166e1b 100644 --- a/LiteLoader/Header/MC/FindActorNode.hpp +++ b/LiteLoader/include/llapi/mc/FindActorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FindBlockDefinition.hpp b/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FindBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/FindBlockDefinition.hpp index 0e75285..6083933 100644 --- a/LiteLoader/Header/MC/FindBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/FindBlockNode.hpp b/LiteLoader/include/llapi/mc/FindBlockNode.hpp similarity index 95% rename from LiteLoader/Header/MC/FindBlockNode.hpp rename to LiteLoader/include/llapi/mc/FindBlockNode.hpp index 082d116..de91ca1 100644 --- a/LiteLoader/Header/MC/FindBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/FindBlockNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FindCoverGoal.hpp b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FindCoverGoal.hpp rename to LiteLoader/include/llapi/mc/FindCoverGoal.hpp index 40b7998..0363c13 100644 --- a/LiteLoader/Header/MC/FindCoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FindMountGoal.hpp b/LiteLoader/include/llapi/mc/FindMountGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FindMountGoal.hpp rename to LiteLoader/include/llapi/mc/FindMountGoal.hpp index b4099bc..3fa5142 100644 --- a/LiteLoader/Header/MC/FindMountGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindMountGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FindUnderwaterTreasureGoal.hpp b/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/FindUnderwaterTreasureGoal.hpp rename to LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp index bd7ac4b..c228928 100644 --- a/LiteLoader/Header/MC/FindUnderwaterTreasureGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireBlock.hpp b/LiteLoader/include/llapi/mc/FireBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FireBlock.hpp rename to LiteLoader/include/llapi/mc/FireBlock.hpp index e1852b7..dbeb032 100644 --- a/LiteLoader/Header/MC/FireBlock.hpp +++ b/LiteLoader/include/llapi/mc/FireBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireChargeItem.hpp b/LiteLoader/include/llapi/mc/FireChargeItem.hpp similarity index 98% rename from LiteLoader/Header/MC/FireChargeItem.hpp rename to LiteLoader/include/llapi/mc/FireChargeItem.hpp index e0c3bb1..ab7ca9d 100644 --- a/LiteLoader/Header/MC/FireChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireChargeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireImmuneDescription.hpp b/LiteLoader/include/llapi/mc/FireImmuneDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FireImmuneDescription.hpp rename to LiteLoader/include/llapi/mc/FireImmuneDescription.hpp index ce18a77..a85f6e1 100644 --- a/LiteLoader/Header/MC/FireImmuneDescription.hpp +++ b/LiteLoader/include/llapi/mc/FireImmuneDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Fireball.hpp b/LiteLoader/include/llapi/mc/Fireball.hpp similarity index 98% rename from LiteLoader/Header/MC/Fireball.hpp rename to LiteLoader/include/llapi/mc/Fireball.hpp index e1dc40f..75600c5 100644 --- a/LiteLoader/Header/MC/Fireball.hpp +++ b/LiteLoader/include/llapi/mc/Fireball.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireworkChargeItem.hpp b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp similarity index 98% rename from LiteLoader/Header/MC/FireworkChargeItem.hpp rename to LiteLoader/include/llapi/mc/FireworkChargeItem.hpp index 6454a06..209e471 100644 --- a/LiteLoader/Header/MC/FireworkChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireworksItem.hpp b/LiteLoader/include/llapi/mc/FireworksItem.hpp similarity index 98% rename from LiteLoader/Header/MC/FireworksItem.hpp rename to LiteLoader/include/llapi/mc/FireworksItem.hpp index 4551f74..dbb9f14 100644 --- a/LiteLoader/Header/MC/FireworksItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworksItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireworksRecipe.hpp b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/FireworksRecipe.hpp rename to LiteLoader/include/llapi/mc/FireworksRecipe.hpp index 5193c1b..22288f0 100644 --- a/LiteLoader/Header/MC/FireworksRecipe.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FireworksRocketActor.hpp b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp similarity index 98% rename from LiteLoader/Header/MC/FireworksRocketActor.hpp rename to LiteLoader/include/llapi/mc/FireworksRocketActor.hpp index 49ecb08..11ad1f4 100644 --- a/LiteLoader/Header/MC/FireworksRocketActor.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Fish.hpp b/LiteLoader/include/llapi/mc/Fish.hpp similarity index 98% rename from LiteLoader/Header/MC/Fish.hpp rename to LiteLoader/include/llapi/mc/Fish.hpp index 3b19c76..6003cc1 100644 --- a/LiteLoader/Header/MC/Fish.hpp +++ b/LiteLoader/include/llapi/mc/Fish.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "WaterAnimal.hpp" diff --git a/LiteLoader/Header/MC/FishingEnchant.hpp b/LiteLoader/include/llapi/mc/FishingEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/FishingEnchant.hpp rename to LiteLoader/include/llapi/mc/FishingEnchant.hpp index 250ddd8..0195b88 100644 --- a/LiteLoader/Header/MC/FishingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/FishingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FishingHook.hpp b/LiteLoader/include/llapi/mc/FishingHook.hpp similarity index 98% rename from LiteLoader/Header/MC/FishingHook.hpp rename to LiteLoader/include/llapi/mc/FishingHook.hpp index 6e3fbf2..8a341fc 100644 --- a/LiteLoader/Header/MC/FishingHook.hpp +++ b/LiteLoader/include/llapi/mc/FishingHook.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FishingRodItem.hpp b/LiteLoader/include/llapi/mc/FishingRodItem.hpp similarity index 98% rename from LiteLoader/Header/MC/FishingRodItem.hpp rename to LiteLoader/include/llapi/mc/FishingRodItem.hpp index 409a330..367f4e1 100644 --- a/LiteLoader/Header/MC/FishingRodItem.hpp +++ b/LiteLoader/include/llapi/mc/FishingRodItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitDoubleXRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitDoubleXRoom.hpp rename to LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp index f8af848..7ab5bb2 100644 --- a/LiteLoader/Header/MC/FitDoubleXRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitDoubleXYRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitDoubleXYRoom.hpp rename to LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp index 73e984c..c002207 100644 --- a/LiteLoader/Header/MC/FitDoubleXYRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitDoubleYRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitDoubleYRoom.hpp rename to LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp index 664bc4f..802f73e 100644 --- a/LiteLoader/Header/MC/FitDoubleYRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitDoubleYZRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitDoubleYZRoom.hpp rename to LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp index ddb1a49..32569fd 100644 --- a/LiteLoader/Header/MC/FitDoubleYZRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitDoubleZRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitDoubleZRoom.hpp rename to LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp index c62329f..6365a12 100644 --- a/LiteLoader/Header/MC/FitDoubleZRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitSimpleRoom.hpp b/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitSimpleRoom.hpp rename to LiteLoader/include/llapi/mc/FitSimpleRoom.hpp index 78904a6..d779cbf 100644 --- a/LiteLoader/Header/MC/FitSimpleRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FitSimpleTopRoom.hpp b/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/FitSimpleTopRoom.hpp rename to LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp index 5925d96..4b89a13 100644 --- a/LiteLoader/Header/MC/FitSimpleTopRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FixedBiomeSource.hpp b/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp similarity index 96% rename from LiteLoader/Header/MC/FixedBiomeSource.hpp rename to LiteLoader/include/llapi/mc/FixedBiomeSource.hpp index b8871ee..2c6a321 100644 --- a/LiteLoader/Header/MC/FixedBiomeSource.hpp +++ b/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlatWorldGenerator.hpp b/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp similarity index 97% rename from LiteLoader/Header/MC/FlatWorldGenerator.hpp rename to LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp index 34622eb..412d36f 100644 --- a/LiteLoader/Header/MC/FlatWorldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlatWorldGeneratorOptions.hpp b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp similarity index 96% rename from LiteLoader/Header/MC/FlatWorldGeneratorOptions.hpp rename to LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp index 479561c..6fda7dc 100644 --- a/LiteLoader/Header/MC/FlatWorldGeneratorOptions.hpp +++ b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FleeSunGoal.hpp b/LiteLoader/include/llapi/mc/FleeSunGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FleeSunGoal.hpp rename to LiteLoader/include/llapi/mc/FleeSunGoal.hpp index a180e54..6faeee1 100644 --- a/LiteLoader/Header/MC/FleeSunGoal.hpp +++ b/LiteLoader/include/llapi/mc/FleeSunGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FindCoverGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlintAndSteelItem.hpp b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp similarity index 98% rename from LiteLoader/Header/MC/FlintAndSteelItem.hpp rename to LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp index 7991ea7..219c8cc 100644 --- a/LiteLoader/Header/MC/FlintAndSteelItem.hpp +++ b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatGoal.hpp b/LiteLoader/include/llapi/mc/FloatGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FloatGoal.hpp rename to LiteLoader/include/llapi/mc/FloatGoal.hpp index b9b304f..72bc9bf 100644 --- a/LiteLoader/Header/MC/FloatGoal.hpp +++ b/LiteLoader/include/llapi/mc/FloatGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatNavigation.hpp b/LiteLoader/include/llapi/mc/FloatNavigation.hpp similarity index 96% rename from LiteLoader/Header/MC/FloatNavigation.hpp rename to LiteLoader/include/llapi/mc/FloatNavigation.hpp index 93f195d..5cbcfad 100644 --- a/LiteLoader/Header/MC/FloatNavigation.hpp +++ b/LiteLoader/include/llapi/mc/FloatNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatRange.hpp b/LiteLoader/include/llapi/mc/FloatRange.hpp similarity index 95% rename from LiteLoader/Header/MC/FloatRange.hpp rename to LiteLoader/include/llapi/mc/FloatRange.hpp index b29f12b..acc542e 100644 --- a/LiteLoader/Header/MC/FloatRange.hpp +++ b/LiteLoader/include/llapi/mc/FloatRange.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatTag.hpp b/LiteLoader/include/llapi/mc/FloatTag.hpp similarity index 97% rename from LiteLoader/Header/MC/FloatTag.hpp rename to LiteLoader/include/llapi/mc/FloatTag.hpp index 632f5cc..71e4e3a 100644 --- a/LiteLoader/Header/MC/FloatTag.hpp +++ b/LiteLoader/include/llapi/mc/FloatTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatWanderGoal.hpp b/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FloatWanderGoal.hpp rename to LiteLoader/include/llapi/mc/FloatWanderGoal.hpp index 6f80cc4..09972e4 100644 --- a/LiteLoader/Header/MC/FloatWanderGoal.hpp +++ b/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FloatsInLiquidDescription.hpp b/LiteLoader/include/llapi/mc/FloatsInLiquidDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FloatsInLiquidDescription.hpp rename to LiteLoader/include/llapi/mc/FloatsInLiquidDescription.hpp index f5dbc06..3956135 100644 --- a/LiteLoader/Header/MC/FloatsInLiquidDescription.hpp +++ b/LiteLoader/include/llapi/mc/FloatsInLiquidDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlockingComponent.hpp b/LiteLoader/include/llapi/mc/FlockingComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/FlockingComponent.hpp rename to LiteLoader/include/llapi/mc/FlockingComponent.hpp index 4820428..2e988c9 100644 --- a/LiteLoader/Header/MC/FlockingComponent.hpp +++ b/LiteLoader/include/llapi/mc/FlockingComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlockingDefinition.hpp b/LiteLoader/include/llapi/mc/FlockingDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FlockingDefinition.hpp rename to LiteLoader/include/llapi/mc/FlockingDefinition.hpp index 5836685..aa37b56 100644 --- a/LiteLoader/Header/MC/FlockingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FlockingDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlockingSystem.hpp b/LiteLoader/include/llapi/mc/FlockingSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/FlockingSystem.hpp rename to LiteLoader/include/llapi/mc/FlockingSystem.hpp index 83d999a..d50d6bf 100644 --- a/LiteLoader/Header/MC/FlockingSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlockingSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlockingUtility.hpp b/LiteLoader/include/llapi/mc/FlockingUtility.hpp similarity index 94% rename from LiteLoader/Header/MC/FlockingUtility.hpp rename to LiteLoader/include/llapi/mc/FlockingUtility.hpp index df984c6..600c3bc 100644 --- a/LiteLoader/Header/MC/FlockingUtility.hpp +++ b/LiteLoader/include/llapi/mc/FlockingUtility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlowerBlock.hpp b/LiteLoader/include/llapi/mc/FlowerBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FlowerBlock.hpp rename to LiteLoader/include/llapi/mc/FlowerBlock.hpp index 59c8939..fcae722 100644 --- a/LiteLoader/Header/MC/FlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlowerFeature.hpp b/LiteLoader/include/llapi/mc/FlowerFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/FlowerFeature.hpp rename to LiteLoader/include/llapi/mc/FlowerFeature.hpp index c3494a9..cfc3360 100644 --- a/LiteLoader/Header/MC/FlowerFeature.hpp +++ b/LiteLoader/include/llapi/mc/FlowerFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlowerHelper.hpp b/LiteLoader/include/llapi/mc/FlowerHelper.hpp similarity index 94% rename from LiteLoader/Header/MC/FlowerHelper.hpp rename to LiteLoader/include/llapi/mc/FlowerHelper.hpp index c6582c4..e6a4769 100644 --- a/LiteLoader/Header/MC/FlowerHelper.hpp +++ b/LiteLoader/include/llapi/mc/FlowerHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlowerPotBlock.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FlowerPotBlock.hpp rename to LiteLoader/include/llapi/mc/FlowerPotBlock.hpp index da7b40e..5c4910e 100644 --- a/LiteLoader/Header/MC/FlowerPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlowerPotBlockActor.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/FlowerPotBlockActor.hpp rename to LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp index 1e1434a..75738fe 100644 --- a/LiteLoader/Header/MC/FlowerPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlushableEnv.hpp b/LiteLoader/include/llapi/mc/FlushableEnv.hpp similarity index 94% rename from LiteLoader/Header/MC/FlushableEnv.hpp rename to LiteLoader/include/llapi/mc/FlushableEnv.hpp index 98c8409..0de5a54 100644 --- a/LiteLoader/Header/MC/FlushableEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlushableStorageAreaEnv.hpp b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp similarity index 97% rename from LiteLoader/Header/MC/FlushableStorageAreaEnv.hpp rename to LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp index 0dbe234..549d1a2 100644 --- a/LiteLoader/Header/MC/FlushableStorageAreaEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TransactionalWorldBlockTarget.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlyDefinition.hpp b/LiteLoader/include/llapi/mc/FlyDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/FlyDefinition.hpp rename to LiteLoader/include/llapi/mc/FlyDefinition.hpp index 77f427b..29215a9 100644 --- a/LiteLoader/Header/MC/FlyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FlyDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/FlyMoveControl.hpp b/LiteLoader/include/llapi/mc/FlyMoveControl.hpp similarity index 95% rename from LiteLoader/Header/MC/FlyMoveControl.hpp rename to LiteLoader/include/llapi/mc/FlyMoveControl.hpp index 899c8e7..2b31e0f 100644 --- a/LiteLoader/Header/MC/FlyMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/FlyMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlyNode.hpp b/LiteLoader/include/llapi/mc/FlyNode.hpp similarity index 95% rename from LiteLoader/Header/MC/FlyNode.hpp rename to LiteLoader/include/llapi/mc/FlyNode.hpp index 2399e2f..e4f0944 100644 --- a/LiteLoader/Header/MC/FlyNode.hpp +++ b/LiteLoader/include/llapi/mc/FlyNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlyingPathNavigation.hpp b/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp similarity index 98% rename from LiteLoader/Header/MC/FlyingPathNavigation.hpp rename to LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp index 4789ae2..320c8d4 100644 --- a/LiteLoader/Header/MC/FlyingPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FlyingSpeedDescription.hpp b/LiteLoader/include/llapi/mc/FlyingSpeedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FlyingSpeedDescription.hpp rename to LiteLoader/include/llapi/mc/FlyingSpeedDescription.hpp index 407439c..54365c6 100644 --- a/LiteLoader/Header/MC/FlyingSpeedDescription.hpp +++ b/LiteLoader/include/llapi/mc/FlyingSpeedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FoliageColor.hpp b/LiteLoader/include/llapi/mc/FoliageColor.hpp similarity index 98% rename from LiteLoader/Header/MC/FoliageColor.hpp rename to LiteLoader/include/llapi/mc/FoliageColor.hpp index dbd7840..c9d9652 100644 --- a/LiteLoader/Header/MC/FoliageColor.hpp +++ b/LiteLoader/include/llapi/mc/FoliageColor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowCaravanGoal.hpp b/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/FollowCaravanGoal.hpp rename to LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp index 688cde0..0654074 100644 --- a/LiteLoader/Header/MC/FollowCaravanGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowFlockGoal.hpp b/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FollowFlockGoal.hpp rename to LiteLoader/include/llapi/mc/FollowFlockGoal.hpp index f086957..2f43a0a 100644 --- a/LiteLoader/Header/MC/FollowFlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowMobGoal.hpp b/LiteLoader/include/llapi/mc/FollowMobGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FollowMobGoal.hpp rename to LiteLoader/include/llapi/mc/FollowMobGoal.hpp index 7e420da..098ef95 100644 --- a/LiteLoader/Header/MC/FollowMobGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowMobGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowOwnerGoal.hpp b/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/FollowOwnerGoal.hpp rename to LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp index f9c6a21..038c721 100644 --- a/LiteLoader/Header/MC/FollowOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowParentGoal.hpp b/LiteLoader/include/llapi/mc/FollowParentGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/FollowParentGoal.hpp rename to LiteLoader/include/llapi/mc/FollowParentGoal.hpp index 153306a..a535946 100644 --- a/LiteLoader/Header/MC/FollowParentGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowParentGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FollowTargetCaptainGoal.hpp b/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/FollowTargetCaptainGoal.hpp rename to LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp index 57f799b..0b99a80 100644 --- a/LiteLoader/Header/MC/FollowTargetCaptainGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FoodConstants.hpp b/LiteLoader/include/llapi/mc/FoodConstants.hpp similarity index 97% rename from LiteLoader/Header/MC/FoodConstants.hpp rename to LiteLoader/include/llapi/mc/FoodConstants.hpp index 617b0b7..e49f8fa 100644 --- a/LiteLoader/Header/MC/FoodConstants.hpp +++ b/LiteLoader/include/llapi/mc/FoodConstants.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FoodItemComponent.hpp b/LiteLoader/include/llapi/mc/FoodItemComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/FoodItemComponent.hpp rename to LiteLoader/include/llapi/mc/FoodItemComponent.hpp index 91f426a..55358a6 100644 --- a/LiteLoader/Header/MC/FoodItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/FoodItemComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FootSizeDescription.hpp b/LiteLoader/include/llapi/mc/FootSizeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FootSizeDescription.hpp rename to LiteLoader/include/llapi/mc/FootSizeDescription.hpp index 615f471..d236535 100644 --- a/LiteLoader/Header/MC/FootSizeDescription.hpp +++ b/LiteLoader/include/llapi/mc/FootSizeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FormJsonValidator.hpp b/LiteLoader/include/llapi/mc/FormJsonValidator.hpp similarity index 97% rename from LiteLoader/Header/MC/FormJsonValidator.hpp rename to LiteLoader/include/llapi/mc/FormJsonValidator.hpp index d1bd356..053b16c 100644 --- a/LiteLoader/Header/MC/FormJsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/FormJsonValidator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonValidator.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FossilFeature.hpp b/LiteLoader/include/llapi/mc/FossilFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/FossilFeature.hpp rename to LiteLoader/include/llapi/mc/FossilFeature.hpp index 57e65cd..363a5f2 100644 --- a/LiteLoader/Header/MC/FossilFeature.hpp +++ b/LiteLoader/include/llapi/mc/FossilFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FreezeOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/FreezeOnHitSubcomponent.hpp rename to LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp index a7a43bb..c1d8f31 100644 --- a/LiteLoader/Header/MC/FreezeOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FrictionModifierDescription.hpp b/LiteLoader/include/llapi/mc/FrictionModifierDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/FrictionModifierDescription.hpp rename to LiteLoader/include/llapi/mc/FrictionModifierDescription.hpp index c55d78a..b85155f 100644 --- a/LiteLoader/Header/MC/FrictionModifierDescription.hpp +++ b/LiteLoader/include/llapi/mc/FrictionModifierDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FrostWalkerEnchant.hpp b/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/FrostWalkerEnchant.hpp rename to LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp index 11d0af5..e87aa9f 100644 --- a/LiteLoader/Header/MC/FrostWalkerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FrostedIceBlock.hpp b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FrostedIceBlock.hpp rename to LiteLoader/include/llapi/mc/FrostedIceBlock.hpp index db0167d..a1741de 100644 --- a/LiteLoader/Header/MC/FrostedIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FullPlayerInventoryWrapper.hpp b/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp similarity index 97% rename from LiteLoader/Header/MC/FullPlayerInventoryWrapper.hpp rename to LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp index 6545609..28f5a46 100644 --- a/LiteLoader/Header/MC/FullPlayerInventoryWrapper.hpp +++ b/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FunctionCommand.hpp b/LiteLoader/include/llapi/mc/FunctionCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/FunctionCommand.hpp rename to LiteLoader/include/llapi/mc/FunctionCommand.hpp index 6aaeefd..209999d 100644 --- a/LiteLoader/Header/MC/FunctionCommand.hpp +++ b/LiteLoader/include/llapi/mc/FunctionCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FunctionEntry.hpp b/LiteLoader/include/llapi/mc/FunctionEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/FunctionEntry.hpp rename to LiteLoader/include/llapi/mc/FunctionEntry.hpp index 8f9a028..75a9f02 100644 --- a/LiteLoader/Header/MC/FunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/FunctionEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FunctionManager.hpp b/LiteLoader/include/llapi/mc/FunctionManager.hpp similarity index 98% rename from LiteLoader/Header/MC/FunctionManager.hpp rename to LiteLoader/include/llapi/mc/FunctionManager.hpp index c93b6c7..fddfe5f 100644 --- a/LiteLoader/Header/MC/FunctionManager.hpp +++ b/LiteLoader/include/llapi/mc/FunctionManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/FungusStem.hpp b/LiteLoader/include/llapi/mc/FungusStem.hpp similarity index 98% rename from LiteLoader/Header/MC/FungusStem.hpp rename to LiteLoader/include/llapi/mc/FungusStem.hpp index 4ab4f7e..69a773a 100644 --- a/LiteLoader/Header/MC/FungusStem.hpp +++ b/LiteLoader/include/llapi/mc/FungusStem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FurnaceBlock.hpp b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/FurnaceBlock.hpp rename to LiteLoader/include/llapi/mc/FurnaceBlock.hpp index 4abfc80..6f1161e 100644 --- a/LiteLoader/Header/MC/FurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp similarity index 99% rename from LiteLoader/Header/MC/FurnaceBlockActor.hpp rename to LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp index 1dffee2..3c7dff9 100644 --- a/LiteLoader/Header/MC/FurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/FurnaceContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp similarity index 98% rename from LiteLoader/Header/MC/FurnaceContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp index 5d5fd69..dfb004d 100644 --- a/LiteLoader/Header/MC/FurnaceContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameCallbacks.hpp b/LiteLoader/include/llapi/mc/GameCallbacks.hpp similarity index 94% rename from LiteLoader/Header/MC/GameCallbacks.hpp rename to LiteLoader/include/llapi/mc/GameCallbacks.hpp index 2bc283c..4e31f6f 100644 --- a/LiteLoader/Header/MC/GameCallbacks.hpp +++ b/LiteLoader/include/llapi/mc/GameCallbacks.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameMasterEntityServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/GameMasterEntityServerCommandOrigin.hpp similarity index 97% rename from LiteLoader/Header/MC/GameMasterEntityServerCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/GameMasterEntityServerCommandOrigin.hpp index f00ff02..f436e46 100644 --- a/LiteLoader/Header/MC/GameMasterEntityServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/GameMasterEntityServerCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "ActorCommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/GameMode.hpp b/LiteLoader/include/llapi/mc/GameMode.hpp similarity index 98% rename from LiteLoader/Header/MC/GameMode.hpp rename to LiteLoader/include/llapi/mc/GameMode.hpp index 6bc9727..a23212f 100644 --- a/LiteLoader/Header/MC/GameMode.hpp +++ b/LiteLoader/include/llapi/mc/GameMode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameModeCommand.hpp b/LiteLoader/include/llapi/mc/GameModeCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GameModeCommand.hpp rename to LiteLoader/include/llapi/mc/GameModeCommand.hpp index cac1808..ebe48b7 100644 --- a/LiteLoader/Header/MC/GameModeCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameModeCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameModuleServer.hpp b/LiteLoader/include/llapi/mc/GameModuleServer.hpp similarity index 94% rename from LiteLoader/Header/MC/GameModuleServer.hpp rename to LiteLoader/include/llapi/mc/GameModuleServer.hpp index efc38d0..b7a4509 100644 --- a/LiteLoader/Header/MC/GameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/GameModuleServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp similarity index 97% rename from LiteLoader/Header/MC/GameRule.hpp rename to LiteLoader/include/llapi/mc/GameRule.hpp index b0d789d..32fbe8c 100644 --- a/LiteLoader/Header/MC/GameRule.hpp +++ b/LiteLoader/include/llapi/mc/GameRule.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameRuleCommand.hpp b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/GameRuleCommand.hpp rename to LiteLoader/include/llapi/mc/GameRuleCommand.hpp index 3ad37ad..e852322 100644 --- a/LiteLoader/Header/MC/GameRuleCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Command.hpp" diff --git a/LiteLoader/Header/MC/GameRules.hpp b/LiteLoader/include/llapi/mc/GameRules.hpp similarity index 98% rename from LiteLoader/Header/MC/GameRules.hpp rename to LiteLoader/include/llapi/mc/GameRules.hpp index f7f9630..94c2b44 100644 --- a/LiteLoader/Header/MC/GameRules.hpp +++ b/LiteLoader/include/llapi/mc/GameRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "GameRule.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameRulesChangedPacket.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/GameRulesChangedPacket.hpp rename to LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp index bd7c3e1..c905e87 100644 --- a/LiteLoader/Header/MC/GameRulesChangedPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameRulesChangedPacketData.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp similarity index 95% rename from LiteLoader/Header/MC/GameRulesChangedPacketData.hpp rename to LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp index 3837508..2c7ab83 100644 --- a/LiteLoader/Header/MC/GameRulesChangedPacketData.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameSession.hpp b/LiteLoader/include/llapi/mc/GameSession.hpp similarity index 96% rename from LiteLoader/Header/MC/GameSession.hpp rename to LiteLoader/include/llapi/mc/GameSession.hpp index dd096e5..ed30dbd 100644 --- a/LiteLoader/Header/MC/GameSession.hpp +++ b/LiteLoader/include/llapi/mc/GameSession.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameSpecificNetEventCallback.hpp b/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp similarity index 96% rename from LiteLoader/Header/MC/GameSpecificNetEventCallback.hpp rename to LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp index 32cbaa3..70bad0e 100644 --- a/LiteLoader/Header/MC/GameSpecificNetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameTypeConv.hpp b/LiteLoader/include/llapi/mc/GameTypeConv.hpp similarity index 93% rename from LiteLoader/Header/MC/GameTypeConv.hpp rename to LiteLoader/include/llapi/mc/GameTypeConv.hpp index e9726ba..c856161 100644 --- a/LiteLoader/Header/MC/GameTypeConv.hpp +++ b/LiteLoader/include/llapi/mc/GameTypeConv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GameVersion.hpp b/LiteLoader/include/llapi/mc/GameVersion.hpp similarity index 96% rename from LiteLoader/Header/MC/GameVersion.hpp rename to LiteLoader/include/llapi/mc/GameVersion.hpp index d8473ed..9e6d3fa 100644 --- a/LiteLoader/Header/MC/GameVersion.hpp +++ b/LiteLoader/include/llapi/mc/GameVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GeneDefinition.hpp b/LiteLoader/include/llapi/mc/GeneDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/GeneDefinition.hpp rename to LiteLoader/include/llapi/mc/GeneDefinition.hpp index 4d5de51..8f2c050 100644 --- a/LiteLoader/Header/MC/GeneDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GeneDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GenericMoveControl.hpp b/LiteLoader/include/llapi/mc/GenericMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/GenericMoveControl.hpp rename to LiteLoader/include/llapi/mc/GenericMoveControl.hpp index 0655228..733a64a 100644 --- a/LiteLoader/Header/MC/GenericMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/GenericMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GenericMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/GenericMoveControlDescription.hpp rename to LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp index 238075d..fa3895d 100644 --- a/LiteLoader/Header/MC/GenericMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GenericPathNavigation.hpp b/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp similarity index 97% rename from LiteLoader/Header/MC/GenericPathNavigation.hpp rename to LiteLoader/include/llapi/mc/GenericPathNavigation.hpp index 94609ad..8feab7e 100644 --- a/LiteLoader/Header/MC/GenericPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GeneticVariant.hpp b/LiteLoader/include/llapi/mc/GeneticVariant.hpp similarity index 95% rename from LiteLoader/Header/MC/GeneticVariant.hpp rename to LiteLoader/include/llapi/mc/GeneticVariant.hpp index 7016855..4fb9343 100644 --- a/LiteLoader/Header/MC/GeneticVariant.hpp +++ b/LiteLoader/include/llapi/mc/GeneticVariant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GeneticsComponent.hpp b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/GeneticsComponent.hpp rename to LiteLoader/include/llapi/mc/GeneticsComponent.hpp index 027d9d1..2f09d85 100644 --- a/LiteLoader/Header/MC/GeneticsComponent.hpp +++ b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GeneticsDefinition.hpp b/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/GeneticsDefinition.hpp rename to LiteLoader/include/llapi/mc/GeneticsDefinition.hpp index bceed3e..0f74425 100644 --- a/LiteLoader/Header/MC/GeneticsDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetChunkDataCommand.hpp b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GetChunkDataCommand.hpp rename to LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp index 38559d7..3e058d0 100644 --- a/LiteLoader/Header/MC/GetChunkDataCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetChunksCommand.hpp b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GetChunksCommand.hpp rename to LiteLoader/include/llapi/mc/GetChunksCommand.hpp index ff41be3..d71587a 100644 --- a/LiteLoader/Header/MC/GetChunksCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetEduServerInfoCommand.hpp b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GetEduServerInfoCommand.hpp rename to LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp index 7bf4e21..d810866 100644 --- a/LiteLoader/Header/MC/GetEduServerInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetInteractionPositionForBlockDefinition.hpp b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/GetInteractionPositionForBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp index b2a90e6..0883419 100644 --- a/LiteLoader/Header/MC/GetInteractionPositionForBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/GetInteractionPositionForBlockNode.hpp b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp similarity index 97% rename from LiteLoader/Header/MC/GetInteractionPositionForBlockNode.hpp rename to LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp index 085ab07..6c74a87 100644 --- a/LiteLoader/Header/MC/GetInteractionPositionForBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Facing.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GetSpawnPointCommand.hpp rename to LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp index a83d358..d2d930f 100644 --- a/LiteLoader/Header/MC/GetSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GetTopSolidBlockCommand.hpp b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GetTopSolidBlockCommand.hpp rename to LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp index f56a7f2..4ab8e9a 100644 --- a/LiteLoader/Header/MC/GetTopSolidBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Ghast.hpp b/LiteLoader/include/llapi/mc/Ghast.hpp similarity index 98% rename from LiteLoader/Header/MC/Ghast.hpp rename to LiteLoader/include/llapi/mc/Ghast.hpp index f0e34bb..97ab1ab 100644 --- a/LiteLoader/Header/MC/Ghast.hpp +++ b/LiteLoader/include/llapi/mc/Ghast.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/GildedBlackstone.hpp b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp similarity index 98% rename from LiteLoader/Header/MC/GildedBlackstone.hpp rename to LiteLoader/include/llapi/mc/GildedBlackstone.hpp index 988fa86..239b8a8 100644 --- a/LiteLoader/Header/MC/GildedBlackstone.hpp +++ b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GiveCommand.hpp b/LiteLoader/include/llapi/mc/GiveCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GiveCommand.hpp rename to LiteLoader/include/llapi/mc/GiveCommand.hpp index 04d0d2a..5b323a5 100644 --- a/LiteLoader/Header/MC/GiveCommand.hpp +++ b/LiteLoader/include/llapi/mc/GiveCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GiveableComponent.hpp b/LiteLoader/include/llapi/mc/GiveableComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/GiveableComponent.hpp rename to LiteLoader/include/llapi/mc/GiveableComponent.hpp index 30681b7..59d6bf0 100644 --- a/LiteLoader/Header/MC/GiveableComponent.hpp +++ b/LiteLoader/include/llapi/mc/GiveableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GiveableDefinition.hpp b/LiteLoader/include/llapi/mc/GiveableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/GiveableDefinition.hpp rename to LiteLoader/include/llapi/mc/GiveableDefinition.hpp index bffb230..462d035 100644 --- a/LiteLoader/Header/MC/GiveableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GiveableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GiveableTrigger.hpp b/LiteLoader/include/llapi/mc/GiveableTrigger.hpp similarity index 95% rename from LiteLoader/Header/MC/GiveableTrigger.hpp rename to LiteLoader/include/llapi/mc/GiveableTrigger.hpp index 9261016..dfff652 100644 --- a/LiteLoader/Header/MC/GiveableTrigger.hpp +++ b/LiteLoader/include/llapi/mc/GiveableTrigger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlassBlock.hpp b/LiteLoader/include/llapi/mc/GlassBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/GlassBlock.hpp rename to LiteLoader/include/llapi/mc/GlassBlock.hpp index 254def1..aef6bc2 100644 --- a/LiteLoader/Header/MC/GlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlassBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlazedTerracottaBlock.hpp b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/GlazedTerracottaBlock.hpp rename to LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp index 3100981..a0c3311 100644 --- a/LiteLoader/Header/MC/GlazedTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlideMoveControl.hpp b/LiteLoader/include/llapi/mc/GlideMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/GlideMoveControl.hpp rename to LiteLoader/include/llapi/mc/GlideMoveControl.hpp index ff37f75..56b0611 100644 --- a/LiteLoader/Header/MC/GlideMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/GlideMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlideMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/GlideMoveControlDescription.hpp rename to LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp index 36ec245..630b7e6 100644 --- a/LiteLoader/Header/MC/GlideMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlobalPauseCommand.hpp b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/GlobalPauseCommand.hpp rename to LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp index fe849c9..5be8182 100644 --- a/LiteLoader/Header/MC/GlobalPauseCommand.hpp +++ b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlowStickItem.hpp b/LiteLoader/include/llapi/mc/GlowStickItem.hpp similarity index 99% rename from LiteLoader/Header/MC/GlowStickItem.hpp rename to LiteLoader/include/llapi/mc/GlowStickItem.hpp index f40b4c2..1a1582d 100644 --- a/LiteLoader/Header/MC/GlowStickItem.hpp +++ b/LiteLoader/include/llapi/mc/GlowStickItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChemistryStickItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GlowStoneFeature.hpp b/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/GlowStoneFeature.hpp rename to LiteLoader/include/llapi/mc/GlowStoneFeature.hpp index 546e3a3..5128d2e 100644 --- a/LiteLoader/Header/MC/GlowStoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GoHomeGoal.hpp b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/GoHomeGoal.hpp rename to LiteLoader/include/llapi/mc/GoHomeGoal.hpp index 37d319d..a816a06 100644 --- a/LiteLoader/Header/MC/GoHomeGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Goal.hpp b/LiteLoader/include/llapi/mc/Goal.hpp similarity index 97% rename from LiteLoader/Header/MC/Goal.hpp rename to LiteLoader/include/llapi/mc/Goal.hpp index a48711d..da0835f 100644 --- a/LiteLoader/Header/MC/Goal.hpp +++ b/LiteLoader/include/llapi/mc/Goal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GoalDefinition.hpp b/LiteLoader/include/llapi/mc/GoalDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/GoalDefinition.hpp rename to LiteLoader/include/llapi/mc/GoalDefinition.hpp index 8192250..44a1baf 100644 --- a/LiteLoader/Header/MC/GoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GoalDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GoalSelectorComponent.hpp b/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/GoalSelectorComponent.hpp rename to LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp index 1bdac43..9cb7997 100644 --- a/LiteLoader/Header/MC/GoalSelectorComponent.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GoalSelectorSystem.hpp b/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/GoalSelectorSystem.hpp rename to LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp index 4aa8359..4d3f8e1 100644 --- a/LiteLoader/Header/MC/GoalSelectorSystem.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GoalSelectorUtility.hpp b/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp similarity index 93% rename from LiteLoader/Header/MC/GoalSelectorUtility.hpp rename to LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp index 93a36fc..72a38b3 100644 --- a/LiteLoader/Header/MC/GoalSelectorUtility.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrantXPSubcomponent.hpp b/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/GrantXPSubcomponent.hpp rename to LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp index 4331179..c8cec6f 100644 --- a/LiteLoader/Header/MC/GrantXPSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrassBlock.hpp b/LiteLoader/include/llapi/mc/GrassBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/GrassBlock.hpp rename to LiteLoader/include/llapi/mc/GrassBlock.hpp index fd695a0..dee89fb 100644 --- a/LiteLoader/Header/MC/GrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrassPathBlock.hpp b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/GrassPathBlock.hpp rename to LiteLoader/include/llapi/mc/GrassPathBlock.hpp index 6e479cd..d2b9573 100644 --- a/LiteLoader/Header/MC/GrassPathBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GravelBlock.hpp b/LiteLoader/include/llapi/mc/GravelBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/GravelBlock.hpp rename to LiteLoader/include/llapi/mc/GravelBlock.hpp index be5538b..c596e56 100644 --- a/LiteLoader/Header/MC/GravelBlock.hpp +++ b/LiteLoader/include/llapi/mc/GravelBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrindstoneBlock.hpp b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/GrindstoneBlock.hpp rename to LiteLoader/include/llapi/mc/GrindstoneBlock.hpp index 09b267c..51cef32 100644 --- a/LiteLoader/Header/MC/GrindstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrindstoneContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/GrindstoneContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp index 68c28d3..e2f8f77 100644 --- a/LiteLoader/Header/MC/GrindstoneContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GroundOffsetDescription.hpp b/LiteLoader/include/llapi/mc/GroundOffsetDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/GroundOffsetDescription.hpp rename to LiteLoader/include/llapi/mc/GroundOffsetDescription.hpp index 5e99734..734b2e2 100644 --- a/LiteLoader/Header/MC/GroundOffsetDescription.hpp +++ b/LiteLoader/include/llapi/mc/GroundOffsetDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GroundedConstraint.hpp b/LiteLoader/include/llapi/mc/GroundedConstraint.hpp similarity index 96% rename from LiteLoader/Header/MC/GroundedConstraint.hpp rename to LiteLoader/include/llapi/mc/GroundedConstraint.hpp index 674c3ce..68576fb 100644 --- a/LiteLoader/Header/MC/GroundedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/GroundedConstraint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GroupSizeDefinition.hpp b/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/GroupSizeDefinition.hpp rename to LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp index 305ed6b..6316b6a 100644 --- a/LiteLoader/Header/MC/GroupSizeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GroupSizeSystem.hpp b/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/GroupSizeSystem.hpp rename to LiteLoader/include/llapi/mc/GroupSizeSystem.hpp index 5da6dea..9c44df2 100644 --- a/LiteLoader/Header/MC/GroupSizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GrowCropSystem.hpp b/LiteLoader/include/llapi/mc/GrowCropSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/GrowCropSystem.hpp rename to LiteLoader/include/llapi/mc/GrowCropSystem.hpp index aea4ea0..3cc19f6 100644 --- a/LiteLoader/Header/MC/GrowCropSystem.hpp +++ b/LiteLoader/include/llapi/mc/GrowCropSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Guardian.hpp b/LiteLoader/include/llapi/mc/Guardian.hpp similarity index 98% rename from LiteLoader/Header/MC/Guardian.hpp rename to LiteLoader/include/llapi/mc/Guardian.hpp index d03adae..56a6469 100644 --- a/LiteLoader/Header/MC/Guardian.hpp +++ b/LiteLoader/include/llapi/mc/Guardian.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/GuardianAttackDefinition.hpp b/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/GuardianAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp index be02a88..8154e56 100644 --- a/LiteLoader/Header/MC/GuardianAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GuardianAttackGoal.hpp b/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/GuardianAttackGoal.hpp rename to LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp index 2e66912..595e21f 100644 --- a/LiteLoader/Header/MC/GuardianAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/GuiDataPickItemPacket.hpp b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/GuiDataPickItemPacket.hpp rename to LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp index a0520a2..eafc0e7 100644 --- a/LiteLoader/Header/MC/GuiDataPickItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp similarity index 98% rename from LiteLoader/Header/MC/HangingActor.hpp rename to LiteLoader/include/llapi/mc/HangingActor.hpp index 19966f6..cbe1d12 100644 --- a/LiteLoader/Header/MC/HangingActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HangingActorItem.hpp b/LiteLoader/include/llapi/mc/HangingActorItem.hpp similarity index 97% rename from LiteLoader/Header/MC/HangingActorItem.hpp rename to LiteLoader/include/llapi/mc/HangingActorItem.hpp index 9a8663a..6fd1f12 100644 --- a/LiteLoader/Header/MC/HangingActorItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingActorItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HardcodedSpawnAreaRegistry.hpp b/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp similarity index 96% rename from LiteLoader/Header/MC/HardcodedSpawnAreaRegistry.hpp rename to LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp index 1a8c6b5..288c4a4 100644 --- a/LiteLoader/Header/MC/HardcodedSpawnAreaRegistry.hpp +++ b/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HarvestFarmBlockGoal.hpp b/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/HarvestFarmBlockGoal.hpp rename to LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp index 428630a..27955ce 100644 --- a/LiteLoader/Header/MC/HarvestFarmBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HashedString.hpp b/LiteLoader/include/llapi/mc/HashedString.hpp similarity index 97% rename from LiteLoader/Header/MC/HashedString.hpp rename to LiteLoader/include/llapi/mc/HashedString.hpp index b0029aa..6acb35a 100644 --- a/LiteLoader/Header/MC/HashedString.hpp +++ b/LiteLoader/include/llapi/mc/HashedString.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HatchetItem.hpp b/LiteLoader/include/llapi/mc/HatchetItem.hpp similarity index 98% rename from LiteLoader/Header/MC/HatchetItem.hpp rename to LiteLoader/include/llapi/mc/HatchetItem.hpp index 46a80f7..314a482 100644 --- a/LiteLoader/Header/MC/HatchetItem.hpp +++ b/LiteLoader/include/llapi/mc/HatchetItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #include "DiggerItem.hpp" diff --git a/LiteLoader/Header/MC/HayBlockBlock.hpp b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/HayBlockBlock.hpp rename to LiteLoader/include/llapi/mc/HayBlockBlock.hpp index 5112666..66e31a0 100644 --- a/LiteLoader/Header/MC/HayBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HealableComponent.hpp b/LiteLoader/include/llapi/mc/HealableComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/HealableComponent.hpp rename to LiteLoader/include/llapi/mc/HealableComponent.hpp index 5ab8896..1fde425 100644 --- a/LiteLoader/Header/MC/HealableComponent.hpp +++ b/LiteLoader/include/llapi/mc/HealableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HealableDefinition.hpp b/LiteLoader/include/llapi/mc/HealableDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/HealableDefinition.hpp rename to LiteLoader/include/llapi/mc/HealableDefinition.hpp index ebe0350..f3aa35e 100644 --- a/LiteLoader/Header/MC/HealableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HealableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/HealthAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp similarity index 96% rename from LiteLoader/Header/MC/HealthAttributeDelegate.hpp rename to LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp index f71c0a5..9bd1f6a 100644 --- a/LiteLoader/Header/MC/HealthAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HeavyBlock.hpp b/LiteLoader/include/llapi/mc/HeavyBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/HeavyBlock.hpp rename to LiteLoader/include/llapi/mc/HeavyBlock.hpp index eb0c998..3c474e2 100644 --- a/LiteLoader/Header/MC/HeavyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HeavyBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HellFireFeature.hpp b/LiteLoader/include/llapi/mc/HellFireFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/HellFireFeature.hpp rename to LiteLoader/include/llapi/mc/HellFireFeature.hpp index 9826476..3b9bb04 100644 --- a/LiteLoader/Header/MC/HellFireFeature.hpp +++ b/LiteLoader/include/llapi/mc/HellFireFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HellSpringFeature.hpp b/LiteLoader/include/llapi/mc/HellSpringFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/HellSpringFeature.hpp rename to LiteLoader/include/llapi/mc/HellSpringFeature.hpp index 3e50d8b..57655a4 100644 --- a/LiteLoader/Header/MC/HellSpringFeature.hpp +++ b/LiteLoader/include/llapi/mc/HellSpringFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HelpCommand.hpp b/LiteLoader/include/llapi/mc/HelpCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/HelpCommand.hpp rename to LiteLoader/include/llapi/mc/HelpCommand.hpp index 7ffeb62..7fa6a1b 100644 --- a/LiteLoader/Header/MC/HelpCommand.hpp +++ b/LiteLoader/include/llapi/mc/HelpCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HideComponent.hpp b/LiteLoader/include/llapi/mc/HideComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/HideComponent.hpp rename to LiteLoader/include/llapi/mc/HideComponent.hpp index 9d9c63e..af34565 100644 --- a/LiteLoader/Header/MC/HideComponent.hpp +++ b/LiteLoader/include/llapi/mc/HideComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HideDescription.hpp b/LiteLoader/include/llapi/mc/HideDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/HideDescription.hpp rename to LiteLoader/include/llapi/mc/HideDescription.hpp index ba333b5..17974c8 100644 --- a/LiteLoader/Header/MC/HideDescription.hpp +++ b/LiteLoader/include/llapi/mc/HideDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HideGoal.hpp b/LiteLoader/include/llapi/mc/HideGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/HideGoal.hpp rename to LiteLoader/include/llapi/mc/HideGoal.hpp index e6364d4..78d8f0f 100644 --- a/LiteLoader/Header/MC/HideGoal.hpp +++ b/LiteLoader/include/llapi/mc/HideGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveToPOIGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HistoricPredictionData.hpp b/LiteLoader/include/llapi/mc/HistoricPredictionData.hpp similarity index 95% rename from LiteLoader/Header/MC/HistoricPredictionData.hpp rename to LiteLoader/include/llapi/mc/HistoricPredictionData.hpp index 99710e1..3f3f07f 100644 --- a/LiteLoader/Header/MC/HistoricPredictionData.hpp +++ b/LiteLoader/include/llapi/mc/HistoricPredictionData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp similarity index 98% rename from LiteLoader/Header/MC/HitResult.hpp rename to LiteLoader/include/llapi/mc/HitResult.hpp index 6091e8f..ead0658 100644 --- a/LiteLoader/Header/MC/HitResult.hpp +++ b/LiteLoader/include/llapi/mc/HitResult.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/HitboxComponent.hpp b/LiteLoader/include/llapi/mc/HitboxComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/HitboxComponent.hpp rename to LiteLoader/include/llapi/mc/HitboxComponent.hpp index 25bb870..5370e45 100644 --- a/LiteLoader/Header/MC/HitboxComponent.hpp +++ b/LiteLoader/include/llapi/mc/HitboxComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HitboxDefinition.hpp b/LiteLoader/include/llapi/mc/HitboxDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/HitboxDefinition.hpp rename to LiteLoader/include/llapi/mc/HitboxDefinition.hpp index bd76e5a..9a2d0b4 100644 --- a/LiteLoader/Header/MC/HitboxDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HitboxDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoeItem.hpp b/LiteLoader/include/llapi/mc/HoeItem.hpp similarity index 98% rename from LiteLoader/Header/MC/HoeItem.hpp rename to LiteLoader/include/llapi/mc/HoeItem.hpp index 6fcaeb3..b34223e 100644 --- a/LiteLoader/Header/MC/HoeItem.hpp +++ b/LiteLoader/include/llapi/mc/HoeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #include "DiggerItem.hpp" diff --git a/LiteLoader/Header/MC/HoldGroundGoal.hpp b/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/HoldGroundGoal.hpp rename to LiteLoader/include/llapi/mc/HoldGroundGoal.hpp index 77a7934..052827d 100644 --- a/LiteLoader/Header/MC/HoldGroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HomeComponent.hpp b/LiteLoader/include/llapi/mc/HomeComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/HomeComponent.hpp rename to LiteLoader/include/llapi/mc/HomeComponent.hpp index 9309b5d..c69501f 100644 --- a/LiteLoader/Header/MC/HomeComponent.hpp +++ b/LiteLoader/include/llapi/mc/HomeComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoneyBlock.hpp b/LiteLoader/include/llapi/mc/HoneyBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/HoneyBlock.hpp rename to LiteLoader/include/llapi/mc/HoneyBlock.hpp index 838a03d..8e47981 100644 --- a/LiteLoader/Header/MC/HoneyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneyBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoneycombBlock.hpp b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/HoneycombBlock.hpp rename to LiteLoader/include/llapi/mc/HoneycombBlock.hpp index d5ed0eb..8500010 100644 --- a/LiteLoader/Header/MC/HoneycombBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopMoveControl.hpp b/LiteLoader/include/llapi/mc/HopMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/HopMoveControl.hpp rename to LiteLoader/include/llapi/mc/HopMoveControl.hpp index ce71c0e..f82cbd6 100644 --- a/LiteLoader/Header/MC/HopMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/HopMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Hopper.hpp b/LiteLoader/include/llapi/mc/Hopper.hpp similarity index 98% rename from LiteLoader/Header/MC/Hopper.hpp rename to LiteLoader/include/llapi/mc/Hopper.hpp index 152f7ca..13259e0 100644 --- a/LiteLoader/Header/MC/Hopper.hpp +++ b/LiteLoader/include/llapi/mc/Hopper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopperBlock.hpp b/LiteLoader/include/llapi/mc/HopperBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/HopperBlock.hpp rename to LiteLoader/include/llapi/mc/HopperBlock.hpp index e68d836..2719d0b 100644 --- a/LiteLoader/Header/MC/HopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopperBlockActor.hpp b/LiteLoader/include/llapi/mc/HopperBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/HopperBlockActor.hpp rename to LiteLoader/include/llapi/mc/HopperBlockActor.hpp index 78f871b..8f26ef8 100644 --- a/LiteLoader/Header/MC/HopperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopperComponent.hpp b/LiteLoader/include/llapi/mc/HopperComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/HopperComponent.hpp rename to LiteLoader/include/llapi/mc/HopperComponent.hpp index 30338c6..f371bb4 100644 --- a/LiteLoader/Header/MC/HopperComponent.hpp +++ b/LiteLoader/include/llapi/mc/HopperComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopperContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp similarity index 96% rename from LiteLoader/Header/MC/HopperContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp index dae13b7..ae9a9fc 100644 --- a/LiteLoader/Header/MC/HopperContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HopperSystem.hpp b/LiteLoader/include/llapi/mc/HopperSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/HopperSystem.hpp rename to LiteLoader/include/llapi/mc/HopperSystem.hpp index 421050d..d76ec1c 100644 --- a/LiteLoader/Header/MC/HopperSystem.hpp +++ b/LiteLoader/include/llapi/mc/HopperSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Horse.hpp b/LiteLoader/include/llapi/mc/Horse.hpp similarity index 99% rename from LiteLoader/Header/MC/Horse.hpp rename to LiteLoader/include/llapi/mc/Horse.hpp index fdc971e..0cb561c 100644 --- a/LiteLoader/Header/MC/Horse.hpp +++ b/LiteLoader/include/llapi/mc/Horse.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/HorseArmorItem.hpp b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp similarity index 98% rename from LiteLoader/Header/MC/HorseArmorItem.hpp rename to LiteLoader/include/llapi/mc/HorseArmorItem.hpp index bc0ada3..6c9722f 100644 --- a/LiteLoader/Header/MC/HorseArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HorseContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/HorseContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp index e53c3b6..fcabbed 100644 --- a/LiteLoader/Header/MC/HorseContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoverGoal.hpp b/LiteLoader/include/llapi/mc/HoverGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/HoverGoal.hpp rename to LiteLoader/include/llapi/mc/HoverGoal.hpp index 53f4eec..7f07f7a 100644 --- a/LiteLoader/Header/MC/HoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/HoverGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoverMoveControl.hpp b/LiteLoader/include/llapi/mc/HoverMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/HoverMoveControl.hpp rename to LiteLoader/include/llapi/mc/HoverMoveControl.hpp index 0bc43f7..0a4eaed 100644 --- a/LiteLoader/Header/MC/HoverMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/HoverMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HoverPathNavigation.hpp b/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp similarity index 97% rename from LiteLoader/Header/MC/HoverPathNavigation.hpp rename to LiteLoader/include/llapi/mc/HoverPathNavigation.hpp index 7e8c6f4..8f71871 100644 --- a/LiteLoader/Header/MC/HoverPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HttpHeaders.hpp b/LiteLoader/include/llapi/mc/HttpHeaders.hpp similarity index 96% rename from LiteLoader/Header/MC/HttpHeaders.hpp rename to LiteLoader/include/llapi/mc/HttpHeaders.hpp index 8a72f1c..7b56120 100644 --- a/LiteLoader/Header/MC/HttpHeaders.hpp +++ b/LiteLoader/include/llapi/mc/HttpHeaders.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HudContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/HudContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp index 7554112..e80cc40 100644 --- a/LiteLoader/Header/MC/HudContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HudContainerModel.hpp b/LiteLoader/include/llapi/mc/HudContainerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/HudContainerModel.hpp rename to LiteLoader/include/llapi/mc/HudContainerModel.hpp index d3340af..6462259 100644 --- a/LiteLoader/Header/MC/HudContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/HudContainerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HudScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/HudScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp index ce68be2..ff55a65 100644 --- a/LiteLoader/Header/MC/HudScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HugeFungusFeature.hpp b/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/HugeFungusFeature.hpp rename to LiteLoader/include/llapi/mc/HugeFungusFeature.hpp index 6628270..20c167c 100644 --- a/LiteLoader/Header/MC/HugeFungusFeature.hpp +++ b/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HugeMushroomBlock.hpp b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/HugeMushroomBlock.hpp rename to LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp index 583125d..2cea0bd 100644 --- a/LiteLoader/Header/MC/HugeMushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HugeMushroomFeature.hpp b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/HugeMushroomFeature.hpp rename to LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp index 93511a2..0828e38 100644 --- a/LiteLoader/Header/MC/HugeMushroomFeature.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HumanoidMonster.hpp b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp similarity index 98% rename from LiteLoader/Header/MC/HumanoidMonster.hpp rename to LiteLoader/include/llapi/mc/HumanoidMonster.hpp index 5859964..ba8c84c 100644 --- a/LiteLoader/Header/MC/HumanoidMonster.hpp +++ b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/HungerAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp similarity index 96% rename from LiteLoader/Header/MC/HungerAttributeDelegate.hpp rename to LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp index 5176b2e..3ca651d 100644 --- a/LiteLoader/Header/MC/HungerAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AttributeInstanceDelegate.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HurtArmorPacket.hpp b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/HurtArmorPacket.hpp rename to LiteLoader/include/llapi/mc/HurtArmorPacket.hpp index 23e7ddd..c8b4949 100644 --- a/LiteLoader/Header/MC/HurtArmorPacket.hpp +++ b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HurtByTargetGoal.hpp b/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/HurtByTargetGoal.hpp rename to LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp index d34c990..274072e 100644 --- a/LiteLoader/Header/MC/HurtByTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HurtOnConditionDefinition.hpp b/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/HurtOnConditionDefinition.hpp rename to LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp index 979314b..90dbf9b 100644 --- a/LiteLoader/Header/MC/HurtOnConditionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HurtOnConditionSystem.hpp b/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/HurtOnConditionSystem.hpp rename to LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp index e7006b0..8044d42 100644 --- a/LiteLoader/Header/MC/HurtOnConditionSystem.hpp +++ b/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/HurtOwnerSubcomponent.hpp b/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/HurtOwnerSubcomponent.hpp rename to LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp index 38b5b16..b0c0535 100644 --- a/LiteLoader/Header/MC/HurtOwnerSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/I18n.hpp b/LiteLoader/include/llapi/mc/I18n.hpp similarity index 99% rename from LiteLoader/Header/MC/I18n.hpp rename to LiteLoader/include/llapi/mc/I18n.hpp index cb50c46..7ca4a5c 100644 --- a/LiteLoader/Header/MC/I18n.hpp +++ b/LiteLoader/include/llapi/mc/I18n.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Core.hpp" diff --git a/LiteLoader/Header/MC/I18nObserver.hpp b/LiteLoader/include/llapi/mc/I18nObserver.hpp similarity index 94% rename from LiteLoader/Header/MC/I18nObserver.hpp rename to LiteLoader/include/llapi/mc/I18nObserver.hpp index 8b564fe..22de914 100644 --- a/LiteLoader/Header/MC/I18nObserver.hpp +++ b/LiteLoader/include/llapi/mc/I18nObserver.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IContainerManager.hpp b/LiteLoader/include/llapi/mc/IContainerManager.hpp similarity index 94% rename from LiteLoader/Header/MC/IContainerManager.hpp rename to LiteLoader/include/llapi/mc/IContainerManager.hpp index d9fcaf9..8de2fac 100644 --- a/LiteLoader/Header/MC/IContainerManager.hpp +++ b/LiteLoader/include/llapi/mc/IContainerManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IContentKeyProvider.hpp b/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp similarity index 96% rename from LiteLoader/Header/MC/IContentKeyProvider.hpp rename to LiteLoader/include/llapi/mc/IContentKeyProvider.hpp index d1d4208..1e71936 100644 --- a/LiteLoader/Header/MC/IContentKeyProvider.hpp +++ b/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IDataInput.hpp b/LiteLoader/include/llapi/mc/IDataInput.hpp similarity index 94% rename from LiteLoader/Header/MC/IDataInput.hpp rename to LiteLoader/include/llapi/mc/IDataInput.hpp index f36fa07..80401d7 100644 --- a/LiteLoader/Header/MC/IDataInput.hpp +++ b/LiteLoader/include/llapi/mc/IDataInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IDataOutput.hpp b/LiteLoader/include/llapi/mc/IDataOutput.hpp similarity index 94% rename from LiteLoader/Header/MC/IDataOutput.hpp rename to LiteLoader/include/llapi/mc/IDataOutput.hpp index 1e75927..579ee8a 100644 --- a/LiteLoader/Header/MC/IDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/IDataOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IDefinitionInstance.hpp b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp similarity index 96% rename from LiteLoader/Header/MC/IDefinitionInstance.hpp rename to LiteLoader/include/llapi/mc/IDefinitionInstance.hpp index fc44b06..dab8839 100644 --- a/LiteLoader/Header/MC/IDefinitionInstance.hpp +++ b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IDefinitionSerializer.hpp b/LiteLoader/include/llapi/mc/IDefinitionSerializer.hpp similarity index 95% rename from LiteLoader/Header/MC/IDefinitionSerializer.hpp rename to LiteLoader/include/llapi/mc/IDefinitionSerializer.hpp index 12841bc..4df2a5f 100644 --- a/LiteLoader/Header/MC/IDefinitionSerializer.hpp +++ b/LiteLoader/include/llapi/mc/IDefinitionSerializer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IFileAccess.hpp b/LiteLoader/include/llapi/mc/IFileAccess.hpp similarity index 94% rename from LiteLoader/Header/MC/IFileAccess.hpp rename to LiteLoader/include/llapi/mc/IFileAccess.hpp index e1775e0..9c80227 100644 --- a/LiteLoader/Header/MC/IFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileAccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IFileChunkUploader.hpp b/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp similarity index 98% rename from LiteLoader/Header/MC/IFileChunkUploader.hpp rename to LiteLoader/include/llapi/mc/IFileChunkUploader.hpp index 6d479e0..5250a18 100644 --- a/LiteLoader/Header/MC/IFileChunkUploader.hpp +++ b/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IFilePicker.hpp b/LiteLoader/include/llapi/mc/IFilePicker.hpp similarity index 94% rename from LiteLoader/Header/MC/IFilePicker.hpp rename to LiteLoader/include/llapi/mc/IFilePicker.hpp index c56726b..4f97c38 100644 --- a/LiteLoader/Header/MC/IFilePicker.hpp +++ b/LiteLoader/include/llapi/mc/IFilePicker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IFileReadAccess.hpp b/LiteLoader/include/llapi/mc/IFileReadAccess.hpp similarity index 94% rename from LiteLoader/Header/MC/IFileReadAccess.hpp rename to LiteLoader/include/llapi/mc/IFileReadAccess.hpp index 8c340ce..f3ef5aa 100644 --- a/LiteLoader/Header/MC/IFileReadAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileReadAccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IFileWriteAccess.hpp b/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp similarity index 94% rename from LiteLoader/Header/MC/IFileWriteAccess.hpp rename to LiteLoader/include/llapi/mc/IFileWriteAccess.hpp index ef64e9d..63539e2 100644 --- a/LiteLoader/Header/MC/IFileWriteAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IJsonSerializable.hpp b/LiteLoader/include/llapi/mc/IJsonSerializable.hpp similarity index 94% rename from LiteLoader/Header/MC/IJsonSerializable.hpp rename to LiteLoader/include/llapi/mc/IJsonSerializable.hpp index df578ab..4325ff8 100644 --- a/LiteLoader/Header/MC/IJsonSerializable.hpp +++ b/LiteLoader/include/llapi/mc/IJsonSerializable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IMinecraftApp.hpp b/LiteLoader/include/llapi/mc/IMinecraftApp.hpp similarity index 94% rename from LiteLoader/Header/MC/IMinecraftApp.hpp rename to LiteLoader/include/llapi/mc/IMinecraftApp.hpp index 932f558..d1190bb 100644 --- a/LiteLoader/Header/MC/IMinecraftApp.hpp +++ b/LiteLoader/include/llapi/mc/IMinecraftApp.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IMinecraftEventing.hpp b/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp similarity index 95% rename from LiteLoader/Header/MC/IMinecraftEventing.hpp rename to LiteLoader/include/llapi/mc/IMinecraftEventing.hpp index 3359e72..14bb397 100644 --- a/LiteLoader/Header/MC/IMinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IPackTelemetry.hpp b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp similarity index 94% rename from LiteLoader/Header/MC/IPackTelemetry.hpp rename to LiteLoader/include/llapi/mc/IPackTelemetry.hpp index 9332b8b..c262c0b 100644 --- a/LiteLoader/Header/MC/IPackTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IPacketHandlerDispatcher.hpp b/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp similarity index 95% rename from LiteLoader/Header/MC/IPacketHandlerDispatcher.hpp rename to LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp index f780013..06c4a4b 100644 --- a/LiteLoader/Header/MC/IPacketHandlerDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ISecureStorageKeySystem.hpp b/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp similarity index 95% rename from LiteLoader/Header/MC/ISecureStorageKeySystem.hpp rename to LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp index fe9760d..b8db06d 100644 --- a/LiteLoader/Header/MC/ISecureStorageKeySystem.hpp +++ b/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ISubChunkBlockStoragePaletted.hpp b/LiteLoader/include/llapi/mc/ISubChunkBlockStoragePaletted.hpp similarity index 95% rename from LiteLoader/Header/MC/ISubChunkBlockStoragePaletted.hpp rename to LiteLoader/include/llapi/mc/ISubChunkBlockStoragePaletted.hpp index f5b9fe8..9ead9ae 100644 --- a/LiteLoader/Header/MC/ISubChunkBlockStoragePaletted.hpp +++ b/LiteLoader/include/llapi/mc/ISubChunkBlockStoragePaletted.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ITextObject.hpp b/LiteLoader/include/llapi/mc/ITextObject.hpp similarity index 96% rename from LiteLoader/Header/MC/ITextObject.hpp rename to LiteLoader/include/llapi/mc/ITextObject.hpp index 2779de9..760a858 100644 --- a/LiteLoader/Header/MC/ITextObject.hpp +++ b/LiteLoader/include/llapi/mc/ITextObject.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ITickingArea.hpp b/LiteLoader/include/llapi/mc/ITickingArea.hpp similarity index 95% rename from LiteLoader/Header/MC/ITickingArea.hpp rename to LiteLoader/include/llapi/mc/ITickingArea.hpp index 6204b5f..3756a70 100644 --- a/LiteLoader/Header/MC/ITickingArea.hpp +++ b/LiteLoader/include/llapi/mc/ITickingArea.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ITickingAreaView.hpp b/LiteLoader/include/llapi/mc/ITickingAreaView.hpp similarity index 94% rename from LiteLoader/Header/MC/ITickingAreaView.hpp rename to LiteLoader/include/llapi/mc/ITickingAreaView.hpp index 500bc60..26aced0 100644 --- a/LiteLoader/Header/MC/ITickingAreaView.hpp +++ b/LiteLoader/include/llapi/mc/ITickingAreaView.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ITreeFeature.hpp b/LiteLoader/include/llapi/mc/ITreeFeature.hpp similarity index 94% rename from LiteLoader/Header/MC/ITreeFeature.hpp rename to LiteLoader/include/llapi/mc/ITreeFeature.hpp index 9b6124b..e587e17 100644 --- a/LiteLoader/Header/MC/ITreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/ITreeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IWebviewTelemetry.hpp b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp similarity index 96% rename from LiteLoader/Header/MC/IWebviewTelemetry.hpp rename to LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp index af20795..64e57fa 100644 --- a/LiteLoader/Header/MC/IWebviewTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IceBlock.hpp b/LiteLoader/include/llapi/mc/IceBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/IceBlock.hpp rename to LiteLoader/include/llapi/mc/IceBlock.hpp index cd51ab5..bda1a4d 100644 --- a/LiteLoader/Header/MC/IceBlock.hpp +++ b/LiteLoader/include/llapi/mc/IceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IceBombItem.hpp b/LiteLoader/include/llapi/mc/IceBombItem.hpp similarity index 98% rename from LiteLoader/Header/MC/IceBombItem.hpp rename to LiteLoader/include/llapi/mc/IceBombItem.hpp index fcb743c..323c3c1 100644 --- a/LiteLoader/Header/MC/IceBombItem.hpp +++ b/LiteLoader/include/llapi/mc/IceBombItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IcePatchFeature.hpp b/LiteLoader/include/llapi/mc/IcePatchFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/IcePatchFeature.hpp rename to LiteLoader/include/llapi/mc/IcePatchFeature.hpp index 7b50224..b0b2be0 100644 --- a/LiteLoader/Header/MC/IcePatchFeature.hpp +++ b/LiteLoader/include/llapi/mc/IcePatchFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IceSpikeFeature.hpp b/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/IceSpikeFeature.hpp rename to LiteLoader/include/llapi/mc/IceSpikeFeature.hpp index 3b0faef..589ace3 100644 --- a/LiteLoader/Header/MC/IceSpikeFeature.hpp +++ b/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IcebergFeature.hpp b/LiteLoader/include/llapi/mc/IcebergFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/IcebergFeature.hpp rename to LiteLoader/include/llapi/mc/IcebergFeature.hpp index 28997c6..e94dfab 100644 --- a/LiteLoader/Header/MC/IcebergFeature.hpp +++ b/LiteLoader/include/llapi/mc/IcebergFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IdentifierDescription.hpp b/LiteLoader/include/llapi/mc/IdentifierDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/IdentifierDescription.hpp rename to LiteLoader/include/llapi/mc/IdentifierDescription.hpp index 62257c1..b48e9f8 100644 --- a/LiteLoader/Header/MC/IdentifierDescription.hpp +++ b/LiteLoader/include/llapi/mc/IdentifierDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IdentifierResult.hpp b/LiteLoader/include/llapi/mc/IdentifierResult.hpp similarity index 95% rename from LiteLoader/Header/MC/IdentifierResult.hpp rename to LiteLoader/include/llapi/mc/IdentifierResult.hpp index 5500365..257bd6e 100644 --- a/LiteLoader/Header/MC/IdentifierResult.hpp +++ b/LiteLoader/include/llapi/mc/IdentifierResult.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IdentityDefinition.hpp b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/IdentityDefinition.hpp rename to LiteLoader/include/llapi/mc/IdentityDefinition.hpp index 8543938..d2730e6 100644 --- a/LiteLoader/Header/MC/IdentityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IdentityDictionary.hpp b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp similarity index 96% rename from LiteLoader/Header/MC/IdentityDictionary.hpp rename to LiteLoader/include/llapi/mc/IdentityDictionary.hpp index f3fe66b..56965ba 100644 --- a/LiteLoader/Header/MC/IdentityDictionary.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IdleState.hpp b/LiteLoader/include/llapi/mc/IdleState.hpp similarity index 95% rename from LiteLoader/Header/MC/IdleState.hpp rename to LiteLoader/include/llapi/mc/IdleState.hpp index 5222344..3d62684 100644 --- a/LiteLoader/Header/MC/IdleState.hpp +++ b/LiteLoader/include/llapi/mc/IdleState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PetSleepWithOwnerState.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Igloo.hpp b/LiteLoader/include/llapi/mc/Igloo.hpp similarity index 97% rename from LiteLoader/Header/MC/Igloo.hpp rename to LiteLoader/include/llapi/mc/Igloo.hpp index 976358a..b064783 100644 --- a/LiteLoader/Header/MC/Igloo.hpp +++ b/LiteLoader/include/llapi/mc/Igloo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IgniteSubcomponent.hpp b/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/IgniteSubcomponent.hpp rename to LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp index b466efb..a884e8c 100644 --- a/LiteLoader/Header/MC/IgniteSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IllagerBeast.hpp b/LiteLoader/include/llapi/mc/IllagerBeast.hpp similarity index 98% rename from LiteLoader/Header/MC/IllagerBeast.hpp rename to LiteLoader/include/llapi/mc/IllagerBeast.hpp index 81a442f..3af8e11 100644 --- a/LiteLoader/Header/MC/IllagerBeast.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeast.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/IllagerBeastBlockedComponent.hpp b/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/IllagerBeastBlockedComponent.hpp rename to LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp index 12b69b7..e4d331a 100644 --- a/LiteLoader/Header/MC/IllagerBeastBlockedComponent.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IllagerBeastBlockedDescription.hpp b/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IllagerBeastBlockedDescription.hpp rename to LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp index efee009..e1b3790 100644 --- a/LiteLoader/Header/MC/IllagerBeastBlockedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ImmutableWorldCommand.hpp b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ImmutableWorldCommand.hpp rename to LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp index 6942179..c152b41 100644 --- a/LiteLoader/Header/MC/ImmutableWorldCommand.hpp +++ b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ImpactDamageSubcomponent.hpp b/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ImpactDamageSubcomponent.hpp rename to LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp index cfc29c7..85608c4 100644 --- a/LiteLoader/Header/MC/ImpactDamageSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ImprovedNoise.hpp b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp similarity index 96% rename from LiteLoader/Header/MC/ImprovedNoise.hpp rename to LiteLoader/include/llapi/mc/ImprovedNoise.hpp index fa5e450..640fab9 100644 --- a/LiteLoader/Header/MC/ImprovedNoise.hpp +++ b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemoryEnv.hpp b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp similarity index 98% rename from LiteLoader/Header/MC/InMemoryEnv.hpp rename to LiteLoader/include/llapi/mc/InMemoryEnv.hpp index 2858b60..c557484 100644 --- a/LiteLoader/Header/MC/InMemoryEnv.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemoryFile.hpp b/LiteLoader/include/llapi/mc/InMemoryFile.hpp similarity index 96% rename from LiteLoader/Header/MC/InMemoryFile.hpp rename to LiteLoader/include/llapi/mc/InMemoryFile.hpp index 6430115..7f162cc 100644 --- a/LiteLoader/Header/MC/InMemoryFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemoryFileStorage.hpp b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp similarity index 97% rename from LiteLoader/Header/MC/InMemoryFileStorage.hpp rename to LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp index 561de8f..037f7de 100644 --- a/LiteLoader/Header/MC/InMemoryFileStorage.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemoryRandomAccessFile.hpp b/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp similarity index 96% rename from LiteLoader/Header/MC/InMemoryRandomAccessFile.hpp rename to LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp index 5d3b5e5..227ddd8 100644 --- a/LiteLoader/Header/MC/InMemoryRandomAccessFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemorySequentialFile.hpp b/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp similarity index 96% rename from LiteLoader/Header/MC/InMemorySequentialFile.hpp rename to LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp index 111d4df..f42e2b4 100644 --- a/LiteLoader/Header/MC/InMemorySequentialFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InMemoryWritableFile.hpp b/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp similarity index 96% rename from LiteLoader/Header/MC/InMemoryWritableFile.hpp rename to LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp index a10df47..597d89b 100644 --- a/LiteLoader/Header/MC/InMemoryWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InPackagePackSource.hpp b/LiteLoader/include/llapi/mc/InPackagePackSource.hpp similarity index 97% rename from LiteLoader/Header/MC/InPackagePackSource.hpp rename to LiteLoader/include/llapi/mc/InPackagePackSource.hpp index 4b94492..adbc486 100644 --- a/LiteLoader/Header/MC/InPackagePackSource.hpp +++ b/LiteLoader/include/llapi/mc/InPackagePackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IndexSet.hpp b/LiteLoader/include/llapi/mc/IndexSet.hpp similarity index 94% rename from LiteLoader/Header/MC/IndexSet.hpp rename to LiteLoader/include/llapi/mc/IndexSet.hpp index 19cffd2..82934c4 100644 --- a/LiteLoader/Header/MC/IndexSet.hpp +++ b/LiteLoader/include/llapi/mc/IndexSet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InsomniaSystem.hpp b/LiteLoader/include/llapi/mc/InsomniaSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/InsomniaSystem.hpp rename to LiteLoader/include/llapi/mc/InsomniaSystem.hpp index b7c9209..d9de0ee 100644 --- a/LiteLoader/Header/MC/InsomniaSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsomniaSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InspectBookshelfGoal.hpp b/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/InspectBookshelfGoal.hpp rename to LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp index 1ce8597..4ba7cdd 100644 --- a/LiteLoader/Header/MC/InspectBookshelfGoal.hpp +++ b/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InstantDespawnDefinition.hpp b/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/InstantDespawnDefinition.hpp rename to LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp index 5615a86..9559d01 100644 --- a/LiteLoader/Header/MC/InstantDespawnDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InstantDespawnSystem.hpp b/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/InstantDespawnSystem.hpp rename to LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp index 1093596..8ac3a7f 100644 --- a/LiteLoader/Header/MC/InstantDespawnSystem.hpp +++ b/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InstantaneousAttributeBuff.hpp b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp similarity index 96% rename from LiteLoader/Header/MC/InstantaneousAttributeBuff.hpp rename to LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp index 9f952ea..50d08b9 100644 --- a/LiteLoader/Header/MC/InstantaneousAttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AttributeBuff.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InstantaneousMobEffect.hpp b/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp similarity index 96% rename from LiteLoader/Header/MC/InstantaneousMobEffect.hpp rename to LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp index 5364d53..a2b2f32 100644 --- a/LiteLoader/Header/MC/InstantaneousMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MobEffect.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Int64Tag.hpp b/LiteLoader/include/llapi/mc/Int64Tag.hpp similarity index 97% rename from LiteLoader/Header/MC/Int64Tag.hpp rename to LiteLoader/include/llapi/mc/Int64Tag.hpp index 5bd9448..3c81aae 100644 --- a/LiteLoader/Header/MC/Int64Tag.hpp +++ b/LiteLoader/include/llapi/mc/Int64Tag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IntArrayTag.hpp b/LiteLoader/include/llapi/mc/IntArrayTag.hpp similarity index 98% rename from LiteLoader/Header/MC/IntArrayTag.hpp rename to LiteLoader/include/llapi/mc/IntArrayTag.hpp index 5edc38e..882030c 100644 --- a/LiteLoader/Header/MC/IntArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/IntArrayTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IntRange.hpp b/LiteLoader/include/llapi/mc/IntRange.hpp similarity index 95% rename from LiteLoader/Header/MC/IntRange.hpp rename to LiteLoader/include/llapi/mc/IntRange.hpp index 02cefc7..7e2105d 100644 --- a/LiteLoader/Header/MC/IntRange.hpp +++ b/LiteLoader/include/llapi/mc/IntRange.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IntTag.hpp b/LiteLoader/include/llapi/mc/IntTag.hpp similarity index 97% rename from LiteLoader/Header/MC/IntTag.hpp rename to LiteLoader/include/llapi/mc/IntTag.hpp index 8563ddf..cfcd79e 100644 --- a/LiteLoader/Header/MC/IntTag.hpp +++ b/LiteLoader/include/llapi/mc/IntTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InteractActionDefinition.hpp b/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/InteractActionDefinition.hpp rename to LiteLoader/include/llapi/mc/InteractActionDefinition.hpp index c6ddf83..0c06f24 100644 --- a/LiteLoader/Header/MC/InteractActionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/InteractActionNode.hpp b/LiteLoader/include/llapi/mc/InteractActionNode.hpp similarity index 96% rename from LiteLoader/Header/MC/InteractActionNode.hpp rename to LiteLoader/include/llapi/mc/InteractActionNode.hpp index 629682e..46761aa 100644 --- a/LiteLoader/Header/MC/InteractActionNode.hpp +++ b/LiteLoader/include/llapi/mc/InteractActionNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InteractComponent.hpp b/LiteLoader/include/llapi/mc/InteractComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/InteractComponent.hpp rename to LiteLoader/include/llapi/mc/InteractComponent.hpp index d563403..a62c563 100644 --- a/LiteLoader/Header/MC/InteractComponent.hpp +++ b/LiteLoader/include/llapi/mc/InteractComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InteractDefinition.hpp b/LiteLoader/include/llapi/mc/InteractDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/InteractDefinition.hpp rename to LiteLoader/include/llapi/mc/InteractDefinition.hpp index 801c36b..417a79a 100644 --- a/LiteLoader/Header/MC/InteractDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InteractDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/InteractPacket.hpp b/LiteLoader/include/llapi/mc/InteractPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/InteractPacket.hpp rename to LiteLoader/include/llapi/mc/InteractPacket.hpp index fc73c4a..8216049 100644 --- a/LiteLoader/Header/MC/InteractPacket.hpp +++ b/LiteLoader/include/llapi/mc/InteractPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InteractSystem.hpp b/LiteLoader/include/llapi/mc/InteractSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/InteractSystem.hpp rename to LiteLoader/include/llapi/mc/InteractSystem.hpp index 4a94acd..73861c5 100644 --- a/LiteLoader/Header/MC/InteractSystem.hpp +++ b/LiteLoader/include/llapi/mc/InteractSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Interaction.hpp b/LiteLoader/include/llapi/mc/Interaction.hpp similarity index 96% rename from LiteLoader/Header/MC/Interaction.hpp rename to LiteLoader/include/llapi/mc/Interaction.hpp index 799c6c0..1b54d4b 100644 --- a/LiteLoader/Header/MC/Interaction.hpp +++ b/LiteLoader/include/llapi/mc/Interaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InternalTaskGroup.hpp b/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp similarity index 97% rename from LiteLoader/Header/MC/InternalTaskGroup.hpp rename to LiteLoader/include/llapi/mc/InternalTaskGroup.hpp index 8073b28..1b9dcf3 100644 --- a/LiteLoader/Header/MC/InternalTaskGroup.hpp +++ b/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Inventory.hpp b/LiteLoader/include/llapi/mc/Inventory.hpp similarity index 97% rename from LiteLoader/Header/MC/Inventory.hpp rename to LiteLoader/include/llapi/mc/Inventory.hpp index dd6e2a3..d2ff484 100644 --- a/LiteLoader/Header/MC/Inventory.hpp +++ b/LiteLoader/include/llapi/mc/Inventory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FillingContainer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryAction.hpp b/LiteLoader/include/llapi/mc/InventoryAction.hpp similarity index 97% rename from LiteLoader/Header/MC/InventoryAction.hpp rename to LiteLoader/include/llapi/mc/InventoryAction.hpp index 4eb0552..021d23e 100644 --- a/LiteLoader/Header/MC/InventoryAction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/InventoryContainerModel.hpp b/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp similarity index 98% rename from LiteLoader/Header/MC/InventoryContainerModel.hpp rename to LiteLoader/include/llapi/mc/InventoryContainerModel.hpp index 8b4e7cc..16b0f7d 100644 --- a/LiteLoader/Header/MC/InventoryContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryContentPacket.hpp b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/InventoryContentPacket.hpp rename to LiteLoader/include/llapi/mc/InventoryContentPacket.hpp index 4160789..d917e2a 100644 --- a/LiteLoader/Header/MC/InventoryContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryMenu.hpp b/LiteLoader/include/llapi/mc/InventoryMenu.hpp similarity index 96% rename from LiteLoader/Header/MC/InventoryMenu.hpp rename to LiteLoader/include/llapi/mc/InventoryMenu.hpp index e200b54..edded8c 100644 --- a/LiteLoader/Header/MC/InventoryMenu.hpp +++ b/LiteLoader/include/llapi/mc/InventoryMenu.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventorySlotPacket.hpp b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/InventorySlotPacket.hpp rename to LiteLoader/include/llapi/mc/InventorySlotPacket.hpp index f543310..60070b7 100644 --- a/LiteLoader/Header/MC/InventorySlotPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventorySource.hpp b/LiteLoader/include/llapi/mc/InventorySource.hpp similarity index 98% rename from LiteLoader/Header/MC/InventorySource.hpp rename to LiteLoader/include/llapi/mc/InventorySource.hpp index 11d820a..b5b2646 100644 --- a/LiteLoader/Header/MC/InventorySource.hpp +++ b/LiteLoader/include/llapi/mc/InventorySource.hpp @@ -5,7 +5,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp similarity index 98% rename from LiteLoader/Header/MC/InventoryTransaction.hpp rename to LiteLoader/include/llapi/mc/InventoryTransaction.hpp index 45bd0ae..0741455 100644 --- a/LiteLoader/Header/MC/InventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryTransactionItemGroup.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp similarity index 96% rename from LiteLoader/Header/MC/InventoryTransactionItemGroup.hpp rename to LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp index 58840d7..a4475ec 100644 --- a/LiteLoader/Header/MC/InventoryTransactionItemGroup.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryTransactionManager.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp similarity index 96% rename from LiteLoader/Header/MC/InventoryTransactionManager.hpp rename to LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp index 02fd7dc..a72ecc0 100644 --- a/LiteLoader/Header/MC/InventoryTransactionManager.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InventoryTransactionPacket.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/InventoryTransactionPacket.hpp rename to LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp index 47bb107..b452f40 100644 --- a/LiteLoader/Header/MC/InventoryTransactionPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InverterDefinition.hpp b/LiteLoader/include/llapi/mc/InverterDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/InverterDefinition.hpp rename to LiteLoader/include/llapi/mc/InverterDefinition.hpp index 421ef58..37ebc11 100644 --- a/LiteLoader/Header/MC/InverterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InverterDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/InverterNode.hpp b/LiteLoader/include/llapi/mc/InverterNode.hpp similarity index 95% rename from LiteLoader/Header/MC/InverterNode.hpp rename to LiteLoader/include/llapi/mc/InverterNode.hpp index 8337360..c3aa1f1 100644 --- a/LiteLoader/Header/MC/InverterNode.hpp +++ b/LiteLoader/include/llapi/mc/InverterNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/InvisibleBlock.hpp b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/InvisibleBlock.hpp rename to LiteLoader/include/llapi/mc/InvisibleBlock.hpp index 8c02d5a..5c9b1f1 100644 --- a/LiteLoader/Header/MC/InvisibleBlock.hpp +++ b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IronGolem.hpp b/LiteLoader/include/llapi/mc/IronGolem.hpp similarity index 98% rename from LiteLoader/Header/MC/IronGolem.hpp rename to LiteLoader/include/llapi/mc/IronGolem.hpp index c7862b9..1dbbb36 100644 --- a/LiteLoader/Header/MC/IronGolem.hpp +++ b/LiteLoader/include/llapi/mc/IronGolem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/IsBabyDescription.hpp b/LiteLoader/include/llapi/mc/IsBabyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsBabyDescription.hpp rename to LiteLoader/include/llapi/mc/IsBabyDescription.hpp index d5172ed..3bf72d6 100644 --- a/LiteLoader/Header/MC/IsBabyDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsBabyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsChargedDescription.hpp b/LiteLoader/include/llapi/mc/IsChargedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsChargedDescription.hpp rename to LiteLoader/include/llapi/mc/IsChargedDescription.hpp index 0c99294..96635d3 100644 --- a/LiteLoader/Header/MC/IsChargedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsChargedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsChestedDescription.hpp b/LiteLoader/include/llapi/mc/IsChestedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsChestedDescription.hpp rename to LiteLoader/include/llapi/mc/IsChestedDescription.hpp index e7ccabe..5218d55 100644 --- a/LiteLoader/Header/MC/IsChestedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsChestedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsExperimentalDescription.hpp b/LiteLoader/include/llapi/mc/IsExperimentalDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsExperimentalDescription.hpp rename to LiteLoader/include/llapi/mc/IsExperimentalDescription.hpp index 57be67b..5518865 100644 --- a/LiteLoader/Header/MC/IsExperimentalDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsExperimentalDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsHiddenWhenInvisibleDescription.hpp b/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsHiddenWhenInvisibleDescription.hpp rename to LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDescription.hpp index 26b7a6c..a0fadbf 100644 --- a/LiteLoader/Header/MC/IsHiddenWhenInvisibleDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsIgnitedDescription.hpp b/LiteLoader/include/llapi/mc/IsIgnitedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsIgnitedDescription.hpp rename to LiteLoader/include/llapi/mc/IsIgnitedDescription.hpp index 7909750..534246d 100644 --- a/LiteLoader/Header/MC/IsIgnitedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsIgnitedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsIllagerCaptainDescription.hpp b/LiteLoader/include/llapi/mc/IsIllagerCaptainDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsIllagerCaptainDescription.hpp rename to LiteLoader/include/llapi/mc/IsIllagerCaptainDescription.hpp index 7aacca0..7b21e64 100644 --- a/LiteLoader/Header/MC/IsIllagerCaptainDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsIllagerCaptainDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsSaddledDescription.hpp b/LiteLoader/include/llapi/mc/IsSaddledDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsSaddledDescription.hpp rename to LiteLoader/include/llapi/mc/IsSaddledDescription.hpp index b2de94d..69972c7 100644 --- a/LiteLoader/Header/MC/IsSaddledDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSaddledDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsShakingDescription.hpp b/LiteLoader/include/llapi/mc/IsShakingDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsShakingDescription.hpp rename to LiteLoader/include/llapi/mc/IsShakingDescription.hpp index e6f3730..ac08688 100644 --- a/LiteLoader/Header/MC/IsShakingDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsShakingDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsShearedDescription.hpp b/LiteLoader/include/llapi/mc/IsShearedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsShearedDescription.hpp rename to LiteLoader/include/llapi/mc/IsShearedDescription.hpp index 01c0090..aad721b 100644 --- a/LiteLoader/Header/MC/IsShearedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsShearedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsSpawnableDescription.hpp b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/IsSpawnableDescription.hpp rename to LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp index cb88c8f..8922ebd 100644 --- a/LiteLoader/Header/MC/IsSpawnableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsStackableDescription.hpp b/LiteLoader/include/llapi/mc/IsStackableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsStackableDescription.hpp rename to LiteLoader/include/llapi/mc/IsStackableDescription.hpp index fef5aa0..7ea5f0d 100644 --- a/LiteLoader/Header/MC/IsStackableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsStackableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsStunnedDescription.hpp b/LiteLoader/include/llapi/mc/IsStunnedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsStunnedDescription.hpp rename to LiteLoader/include/llapi/mc/IsStunnedDescription.hpp index eb668fe..0377539 100644 --- a/LiteLoader/Header/MC/IsStunnedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsStunnedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsSummonableDescription.hpp b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsSummonableDescription.hpp rename to LiteLoader/include/llapi/mc/IsSummonableDescription.hpp index 14778aa..db5ed4c 100644 --- a/LiteLoader/Header/MC/IsSummonableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IsTamedDescription.hpp b/LiteLoader/include/llapi/mc/IsTamedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/IsTamedDescription.hpp rename to LiteLoader/include/llapi/mc/IsTamedDescription.hpp index e942355..f85527e 100644 --- a/LiteLoader/Header/MC/IsTamedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsTamedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/IslandLayer.hpp b/LiteLoader/include/llapi/mc/IslandLayer.hpp similarity index 96% rename from LiteLoader/Header/MC/IslandLayer.hpp rename to LiteLoader/include/llapi/mc/IslandLayer.hpp index 8de137f..de0ad15 100644 --- a/LiteLoader/Header/MC/IslandLayer.hpp +++ b/LiteLoader/include/llapi/mc/IslandLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp similarity index 99% rename from LiteLoader/Header/MC/Item.hpp rename to LiteLoader/include/llapi/mc/Item.hpp index 03ffa8c..1ebefdd 100644 --- a/LiteLoader/Header/MC/Item.hpp +++ b/LiteLoader/include/llapi/mc/Item.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemAcquisitionMethodMap.hpp b/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemAcquisitionMethodMap.hpp rename to LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp index e3dc3db..19fbbda 100644 --- a/LiteLoader/Header/MC/ItemAcquisitionMethodMap.hpp +++ b/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemActor.hpp b/LiteLoader/include/llapi/mc/ItemActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemActor.hpp rename to LiteLoader/include/llapi/mc/ItemActor.hpp index e2c87c9..e8f0aa6 100644 --- a/LiteLoader/Header/MC/ItemActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemColorUtil.hpp b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp similarity index 90% rename from LiteLoader/Header/MC/ItemColorUtil.hpp rename to LiteLoader/include/llapi/mc/ItemColorUtil.hpp index b11cfe2..886767a 100644 --- a/LiteLoader/Header/MC/ItemColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemControlDescription.hpp b/LiteLoader/include/llapi/mc/ItemControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemControlDescription.hpp rename to LiteLoader/include/llapi/mc/ItemControlDescription.hpp index d60f4a6..17556a1 100644 --- a/LiteLoader/Header/MC/ItemControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/ItemControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemData.hpp b/LiteLoader/include/llapi/mc/ItemData.hpp similarity index 94% rename from LiteLoader/Header/MC/ItemData.hpp rename to LiteLoader/include/llapi/mc/ItemData.hpp index cd44339..ca222bd 100644 --- a/LiteLoader/Header/MC/ItemData.hpp +++ b/LiteLoader/include/llapi/mc/ItemData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemDescriptor.hpp rename to LiteLoader/include/llapi/mc/ItemDescriptor.hpp index 2facd52..804986e 100644 --- a/LiteLoader/Header/MC/ItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemDescriptorCount.hpp rename to LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp index 49029e0..57d373a 100644 --- a/LiteLoader/Header/MC/ItemDescriptorCount.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemEnchantOption.hpp b/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemEnchantOption.hpp rename to LiteLoader/include/llapi/mc/ItemEnchantOption.hpp index 2165f07..953640b 100644 --- a/LiteLoader/Header/MC/ItemEnchantOption.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemEnchants.hpp b/LiteLoader/include/llapi/mc/ItemEnchants.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemEnchants.hpp rename to LiteLoader/include/llapi/mc/ItemEnchants.hpp index 1eedaa3..aedb710 100644 --- a/LiteLoader/Header/MC/ItemEnchants.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchants.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp index 703d166..8ddb044 100644 --- a/LiteLoader/Header/MC/ItemEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ItemFrameBlock.hpp rename to LiteLoader/include/llapi/mc/ItemFrameBlock.hpp index 7a625e1..1738f7e 100644 --- a/LiteLoader/Header/MC/ItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemFrameBlockActor.hpp rename to LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp index 965f76b..e948de8 100644 --- a/LiteLoader/Header/MC/ItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemFrameDropItemPacket.hpp b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemFrameDropItemPacket.hpp rename to LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp index fa37d4f..a487a2b 100644 --- a/LiteLoader/Header/MC/ItemFrameDropItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemGroup.hpp b/LiteLoader/include/llapi/mc/ItemGroup.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemGroup.hpp rename to LiteLoader/include/llapi/mc/ItemGroup.hpp index c60bca9..a67d0ee 100644 --- a/LiteLoader/Header/MC/ItemGroup.hpp +++ b/LiteLoader/include/llapi/mc/ItemGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemInstance.hpp rename to LiteLoader/include/llapi/mc/ItemInstance.hpp index 3cd17de..5dfc35c 100644 --- a/LiteLoader/Header/MC/ItemInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackBase.hpp" #include "Item.hpp" diff --git a/LiteLoader/Header/MC/ItemListSerializer.hpp b/LiteLoader/include/llapi/mc/ItemListSerializer.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemListSerializer.hpp rename to LiteLoader/include/llapi/mc/ItemListSerializer.hpp index 980209c..66794bd 100644 --- a/LiteLoader/Header/MC/ItemListSerializer.hpp +++ b/LiteLoader/include/llapi/mc/ItemListSerializer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemPack.hpp b/LiteLoader/include/llapi/mc/ItemPack.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemPack.hpp rename to LiteLoader/include/llapi/mc/ItemPack.hpp index 9d004fc..900fe0b 100644 --- a/LiteLoader/Header/MC/ItemPack.hpp +++ b/LiteLoader/include/llapi/mc/ItemPack.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemReactionComponent.hpp b/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemReactionComponent.hpp rename to LiteLoader/include/llapi/mc/ItemReactionComponent.hpp index 893eed2..d668ceb 100644 --- a/LiteLoader/Header/MC/ItemReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemRegistry.hpp b/LiteLoader/include/llapi/mc/ItemRegistry.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemRegistry.hpp rename to LiteLoader/include/llapi/mc/ItemRegistry.hpp index 9c63062..50a42cc 100644 --- a/LiteLoader/Header/MC/ItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemReleaseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemReleaseInventoryTransaction.hpp rename to LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp index ed88426..cc4d355 100644 --- a/LiteLoader/Header/MC/ItemReleaseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStack.hpp rename to LiteLoader/include/llapi/mc/ItemStack.hpp index 6bbf3eb..8767aa4 100644 --- a/LiteLoader/Header/MC/ItemStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStack.hpp @@ -1,14 +1,14 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackBase.hpp" #define BEFORE_EXTRA // Add include headers & pre-declares #include "ItemStackNetIdVariant.hpp" -#include "MC/I18n.hpp" -#include "MC/PropertiesSettings.hpp" +#include "I18n.hpp" +#include "PropertiesSettings.hpp" class Tag; class ItemActor; class CompoundTag; diff --git a/LiteLoader/Header/MC/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp similarity index 99% rename from LiteLoader/Header/MC/ItemStackBase.hpp rename to LiteLoader/include/llapi/mc/ItemStackBase.hpp index 93e071f..6a7fb43 100644 --- a/LiteLoader/Header/MC/ItemStackBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackNetIdVariant.hpp rename to LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp index beeb50a..b1676c7 100644 --- a/LiteLoader/Header/MC/ItemStackNetIdVariant.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/ItemStackNetManagerBase.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemStackNetManagerBase.hpp rename to LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp index 39ab4e9..f5155c2 100644 --- a/LiteLoader/Header/MC/ItemStackNetManagerBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackNetManagerClient.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerClient.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackNetManagerClient.hpp rename to LiteLoader/include/llapi/mc/ItemStackNetManagerClient.hpp index f885047..64381bf 100644 --- a/LiteLoader/Header/MC/ItemStackNetManagerClient.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerClient.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackNetManagerServer.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemStackNetManagerServer.hpp rename to LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp index 9c7d386..8530ca5 100644 --- a/LiteLoader/Header/MC/ItemStackNetManagerServer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackNetManagerBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestAction.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestAction.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp index 6c1ee8f..0bd4d99 100644 --- a/LiteLoader/Header/MC/ItemStackRequestAction.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionBeaconPayment.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionBeaconPayment.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp index b53db41..5ec9496 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionBeaconPayment.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionConsume.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionConsume.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp index 1b783b7..6d7d6ad 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionConsume.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionCraftBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionCraftBase.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp index e7f0338..b9c3d33 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionCraftBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionCraftHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionCraftHandler.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp index e820b79..4225527 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionCraftHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp index 4b0ee35..292f0c6 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp index 59a5487..71eab91 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionCreate.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionCreate.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp index 3021d58..a039779 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionCreate.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionDestroy.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionDestroy.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp index d595af6..38cbc47 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionDestroy.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionDrop.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionDrop.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp index 488acba..5ad9044 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionDrop.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp similarity index 98% rename from LiteLoader/Header/MC/ItemStackRequestActionHandler.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp index 621f69c..3531aea 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionPlace.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemStackRequestActionPlace.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp index 00ab613..0aa7e73 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionPlace.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionSwap.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionSwap.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp index d9faede..4ea8149 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionSwap.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionTake.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionTake.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp index 3acf167..eca58b9 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionTake.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestActionTransferBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestActionTransferBase.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp index 901c42d..ca4c5ee 100644 --- a/LiteLoader/Header/MC/ItemStackRequestActionTransferBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestPacket.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackRequestPacket.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp index 2881b10..ef75374 100644 --- a/LiteLoader/Header/MC/ItemStackRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackRequestSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemStackRequestSlotInfo.hpp rename to LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp index 314ad7f..fd0b08e 100644 --- a/LiteLoader/Header/MC/ItemStackRequestSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackResponseContainerInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackResponseContainerInfo.hpp rename to LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp index 380bfbd..5245bd2 100644 --- a/LiteLoader/Header/MC/ItemStackResponseContainerInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackResponseInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemStackResponseInfo.hpp rename to LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp index 2e11c93..0bc9ee5 100644 --- a/LiteLoader/Header/MC/ItemStackResponseInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStackResponsePacket.hpp b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ItemStackResponsePacket.hpp rename to LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp index 1102dc4..875cf3e 100644 --- a/LiteLoader/Header/MC/ItemStackResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemState.hpp b/LiteLoader/include/llapi/mc/ItemState.hpp similarity index 94% rename from LiteLoader/Header/MC/ItemState.hpp rename to LiteLoader/include/llapi/mc/ItemState.hpp index 9204209..d5f6e25 100644 --- a/LiteLoader/Header/MC/ItemState.hpp +++ b/LiteLoader/include/llapi/mc/ItemState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemStateInstance.hpp b/LiteLoader/include/llapi/mc/ItemStateInstance.hpp similarity index 94% rename from LiteLoader/Header/MC/ItemStateInstance.hpp rename to LiteLoader/include/llapi/mc/ItemStateInstance.hpp index c9ea9ed..f3e469f 100644 --- a/LiteLoader/Header/MC/ItemStateInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemStateInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemUseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemUseInventoryTransaction.hpp rename to LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp index 6539f46..49ce523 100644 --- a/LiteLoader/Header/MC/ItemUseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemUseMethodMap.hpp b/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp similarity index 95% rename from LiteLoader/Header/MC/ItemUseMethodMap.hpp rename to LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp index 21a4bac..7653795 100644 --- a/LiteLoader/Header/MC/ItemUseMethodMap.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ItemUseOnActorInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp similarity index 97% rename from LiteLoader/Header/MC/ItemUseOnActorInventoryTransaction.hpp rename to LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp index 261db29..1728bac 100644 --- a/LiteLoader/Header/MC/ItemUseOnActorInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawBlock.hpp b/LiteLoader/include/llapi/mc/JigsawBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/JigsawBlock.hpp rename to LiteLoader/include/llapi/mc/JigsawBlock.hpp index e656d96..9b5d872 100644 --- a/LiteLoader/Header/MC/JigsawBlock.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawBlockActor.hpp b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawBlockActor.hpp rename to LiteLoader/include/llapi/mc/JigsawBlockActor.hpp index fea028a..487b6dd 100644 --- a/LiteLoader/Header/MC/JigsawBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawBlockInfo.hpp b/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp similarity index 96% rename from LiteLoader/Header/MC/JigsawBlockInfo.hpp rename to LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp index c10a0fc..85fd929 100644 --- a/LiteLoader/Header/MC/JigsawBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawEditorData.hpp b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawEditorData.hpp rename to LiteLoader/include/llapi/mc/JigsawEditorData.hpp index dc358a4..25bad23 100644 --- a/LiteLoader/Header/MC/JigsawEditorData.hpp +++ b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawPlacement.hpp b/LiteLoader/include/llapi/mc/JigsawPlacement.hpp similarity index 98% rename from LiteLoader/Header/MC/JigsawPlacement.hpp rename to LiteLoader/include/llapi/mc/JigsawPlacement.hpp index 0d8b005..7bf5fe4 100644 --- a/LiteLoader/Header/MC/JigsawPlacement.hpp +++ b/LiteLoader/include/llapi/mc/JigsawPlacement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawStructureActorRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawStructureActorRulesRegistry.hpp rename to LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp index 4eb9dd0..2d4613e 100644 --- a/LiteLoader/Header/MC/JigsawStructureActorRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawStructureBlockRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawStructureBlockRulesRegistry.hpp rename to LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp index 26002fd..2ee490a 100644 --- a/LiteLoader/Header/MC/JigsawStructureBlockRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawStructureBlockTagRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawStructureBlockTagRulesRegistry.hpp rename to LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp index 1a9b699..13ff476 100644 --- a/LiteLoader/Header/MC/JigsawStructureBlockTagRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawStructureElementRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp similarity index 96% rename from LiteLoader/Header/MC/JigsawStructureElementRegistry.hpp rename to LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp index 8ce77c8..d248b01 100644 --- a/LiteLoader/Header/MC/JigsawStructureElementRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JigsawStructureRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/JigsawStructureRegistry.hpp rename to LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp index db06840..00a904d 100644 --- a/LiteLoader/Header/MC/JigsawStructureRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JournaledFile.hpp b/LiteLoader/include/llapi/mc/JournaledFile.hpp similarity index 97% rename from LiteLoader/Header/MC/JournaledFile.hpp rename to LiteLoader/include/llapi/mc/JournaledFile.hpp index fe87a9b..62da897 100644 --- a/LiteLoader/Header/MC/JournaledFile.hpp +++ b/LiteLoader/include/llapi/mc/JournaledFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Json.hpp b/LiteLoader/include/llapi/mc/Json.hpp similarity index 99% rename from LiteLoader/Header/MC/Json.hpp rename to LiteLoader/include/llapi/mc/Json.hpp index 592db0a..aafef22 100644 --- a/LiteLoader/Header/MC/Json.hpp +++ b/LiteLoader/include/llapi/mc/Json.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JsonHelpers.hpp b/LiteLoader/include/llapi/mc/JsonHelpers.hpp similarity index 95% rename from LiteLoader/Header/MC/JsonHelpers.hpp rename to LiteLoader/include/llapi/mc/JsonHelpers.hpp index 3637320..ef51735 100644 --- a/LiteLoader/Header/MC/JsonHelpers.hpp +++ b/LiteLoader/include/llapi/mc/JsonHelpers.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/JsonPackUtils.hpp b/LiteLoader/include/llapi/mc/JsonPackUtils.hpp similarity index 97% rename from LiteLoader/Header/MC/JsonPackUtils.hpp rename to LiteLoader/include/llapi/mc/JsonPackUtils.hpp index 980cd9e..d4ec55b 100644 --- a/LiteLoader/Header/MC/JsonPackUtils.hpp +++ b/LiteLoader/include/llapi/mc/JsonPackUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JsonUtil.hpp b/LiteLoader/include/llapi/mc/JsonUtil.hpp similarity index 98% rename from LiteLoader/Header/MC/JsonUtil.hpp rename to LiteLoader/include/llapi/mc/JsonUtil.hpp index aed3bc8..ba24473 100644 --- a/LiteLoader/Header/MC/JsonUtil.hpp +++ b/LiteLoader/include/llapi/mc/JsonUtil.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JsonValidator.hpp b/LiteLoader/include/llapi/mc/JsonValidator.hpp similarity index 95% rename from LiteLoader/Header/MC/JsonValidator.hpp rename to LiteLoader/include/llapi/mc/JsonValidator.hpp index 866c2c5..51de4ac 100644 --- a/LiteLoader/Header/MC/JsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/JsonValidator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JukeboxBlock.hpp b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/JukeboxBlock.hpp rename to LiteLoader/include/llapi/mc/JukeboxBlock.hpp index fa9a65b..94f9b27 100644 --- a/LiteLoader/Header/MC/JukeboxBlock.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JukeboxBlockActor.hpp b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/JukeboxBlockActor.hpp rename to LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp index 75733b8..4739068 100644 --- a/LiteLoader/Header/MC/JukeboxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JumpControl.hpp b/LiteLoader/include/llapi/mc/JumpControl.hpp similarity index 97% rename from LiteLoader/Header/MC/JumpControl.hpp rename to LiteLoader/include/llapi/mc/JumpControl.hpp index 06ec08a..d99e135 100644 --- a/LiteLoader/Header/MC/JumpControl.hpp +++ b/LiteLoader/include/llapi/mc/JumpControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JumpControlComponent.hpp b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/JumpControlComponent.hpp rename to LiteLoader/include/llapi/mc/JumpControlComponent.hpp index b3f9c8c..b9a7d85 100644 --- a/LiteLoader/Header/MC/JumpControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JumpControlDescription.hpp b/LiteLoader/include/llapi/mc/JumpControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/JumpControlDescription.hpp rename to LiteLoader/include/llapi/mc/JumpControlDescription.hpp index ea2dc26..63fd825 100644 --- a/LiteLoader/Header/MC/JumpControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JumpControlSystem.hpp b/LiteLoader/include/llapi/mc/JumpControlSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/JumpControlSystem.hpp rename to LiteLoader/include/llapi/mc/JumpControlSystem.hpp index 583f30f..1ae7e77 100644 --- a/LiteLoader/Header/MC/JumpControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/JunglePyramidPiece.hpp b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp similarity index 96% rename from LiteLoader/Header/MC/JunglePyramidPiece.hpp rename to LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp index 64f40ca..5b38ab6 100644 --- a/LiteLoader/Header/MC/JunglePyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KelpBlock.hpp b/LiteLoader/include/llapi/mc/KelpBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/KelpBlock.hpp rename to LiteLoader/include/llapi/mc/KelpBlock.hpp index b07d662..1517996 100644 --- a/LiteLoader/Header/MC/KelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/KelpBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KelpFeature.hpp b/LiteLoader/include/llapi/mc/KelpFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/KelpFeature.hpp rename to LiteLoader/include/llapi/mc/KelpFeature.hpp index 607ee16..ccf5f0b 100644 --- a/LiteLoader/Header/MC/KelpFeature.hpp +++ b/LiteLoader/include/llapi/mc/KelpFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KeyFrameLerpMode.hpp b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp similarity index 95% rename from LiteLoader/Header/MC/KeyFrameLerpMode.hpp rename to LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp index 30088c5..f340d47 100644 --- a/LiteLoader/Header/MC/KeyFrameLerpMode.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KeyFrameTransform.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp similarity index 96% rename from LiteLoader/Header/MC/KeyFrameTransform.hpp rename to LiteLoader/include/llapi/mc/KeyFrameTransform.hpp index f448bf4..23914bc 100644 --- a/LiteLoader/Header/MC/KeyFrameTransform.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KeyFrameTransformData.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp similarity index 95% rename from LiteLoader/Header/MC/KeyFrameTransformData.hpp rename to LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp index 85fbedc..d18e38d 100644 --- a/LiteLoader/Header/MC/KeyFrameTransformData.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KeyManager.hpp b/LiteLoader/include/llapi/mc/KeyManager.hpp similarity index 95% rename from LiteLoader/Header/MC/KeyManager.hpp rename to LiteLoader/include/llapi/mc/KeyManager.hpp index a4ca8c9..d09cc87 100644 --- a/LiteLoader/Header/MC/KeyManager.hpp +++ b/LiteLoader/include/llapi/mc/KeyManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KeyOrNameResult.hpp b/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp similarity index 95% rename from LiteLoader/Header/MC/KeyOrNameResult.hpp rename to LiteLoader/include/llapi/mc/KeyOrNameResult.hpp index 86b44b8..5a51981 100644 --- a/LiteLoader/Header/MC/KeyOrNameResult.hpp +++ b/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KickCommand.hpp b/LiteLoader/include/llapi/mc/KickCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/KickCommand.hpp rename to LiteLoader/include/llapi/mc/KickCommand.hpp index ac3fc00..7ac5100 100644 --- a/LiteLoader/Header/MC/KickCommand.hpp +++ b/LiteLoader/include/llapi/mc/KickCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KillCommand.hpp b/LiteLoader/include/llapi/mc/KillCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/KillCommand.hpp rename to LiteLoader/include/llapi/mc/KillCommand.hpp index a57563b..f6bf1ef 100644 --- a/LiteLoader/Header/MC/KillCommand.hpp +++ b/LiteLoader/include/llapi/mc/KillCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KnockbackArmorUpdater.hpp b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp similarity index 98% rename from LiteLoader/Header/MC/KnockbackArmorUpdater.hpp rename to LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp index 5741ca6..f40b17f 100644 --- a/LiteLoader/Header/MC/KnockbackArmorUpdater.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KnockbackRoarGoal.hpp b/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/KnockbackRoarGoal.hpp rename to LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp index 06b1d9d..ebaf5b5 100644 --- a/LiteLoader/Header/MC/KnockbackRoarGoal.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/KnockbackRules.hpp b/LiteLoader/include/llapi/mc/KnockbackRules.hpp similarity index 92% rename from LiteLoader/Header/MC/KnockbackRules.hpp rename to LiteLoader/include/llapi/mc/KnockbackRules.hpp index d2be279..294b021 100644 --- a/LiteLoader/Header/MC/KnockbackRules.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LabTableContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/LabTableContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp index 341e958..114c282 100644 --- a/LiteLoader/Header/MC/LabTableContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LabTablePacket.hpp rename to LiteLoader/include/llapi/mc/LabTablePacket.hpp index 42bd3c7..e9306d9 100644 --- a/LiteLoader/Header/MC/LabTablePacket.hpp +++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LabTableReaction.hpp b/LiteLoader/include/llapi/mc/LabTableReaction.hpp similarity index 96% rename from LiteLoader/Header/MC/LabTableReaction.hpp rename to LiteLoader/include/llapi/mc/LabTableReaction.hpp index 589da4e..1c8e635 100644 --- a/LiteLoader/Header/MC/LabTableReaction.hpp +++ b/LiteLoader/include/llapi/mc/LabTableReaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LabTableReactionComponent.hpp b/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/LabTableReactionComponent.hpp rename to LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp index 496f594..368b13f 100644 --- a/LiteLoader/Header/MC/LabTableReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LadderBlock.hpp b/LiteLoader/include/llapi/mc/LadderBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LadderBlock.hpp rename to LiteLoader/include/llapi/mc/LadderBlock.hpp index a6ba109..4dd33bd 100644 --- a/LiteLoader/Header/MC/LadderBlock.hpp +++ b/LiteLoader/include/llapi/mc/LadderBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LakeFeature.hpp b/LiteLoader/include/llapi/mc/LakeFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LakeFeature.hpp rename to LiteLoader/include/llapi/mc/LakeFeature.hpp index a9010ed..43e26f2 100644 --- a/LiteLoader/Header/MC/LakeFeature.hpp +++ b/LiteLoader/include/llapi/mc/LakeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LanternBlock.hpp b/LiteLoader/include/llapi/mc/LanternBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LanternBlock.hpp rename to LiteLoader/include/llapi/mc/LanternBlock.hpp index 006f21a..dd85e69 100644 --- a/LiteLoader/Header/MC/LanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LanternBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LargeCaveFeature.hpp b/LiteLoader/include/llapi/mc/LargeCaveFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/LargeCaveFeature.hpp rename to LiteLoader/include/llapi/mc/LargeCaveFeature.hpp index b694860..80f46e8 100644 --- a/LiteLoader/Header/MC/LargeCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/LargeCaveFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LargeFireball.hpp b/LiteLoader/include/llapi/mc/LargeFireball.hpp similarity index 98% rename from LiteLoader/Header/MC/LargeFireball.hpp rename to LiteLoader/include/llapi/mc/LargeFireball.hpp index 3bc56a7..3fde329 100644 --- a/LiteLoader/Header/MC/LargeFireball.hpp +++ b/LiteLoader/include/llapi/mc/LargeFireball.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fireball.hpp" diff --git a/LiteLoader/Header/MC/LargeHellCaveFeature.hpp b/LiteLoader/include/llapi/mc/LargeHellCaveFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LargeHellCaveFeature.hpp rename to LiteLoader/include/llapi/mc/LargeHellCaveFeature.hpp index 9f4092d..a8aac3c 100644 --- a/LiteLoader/Header/MC/LargeHellCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/LargeHellCaveFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LavaSlime.hpp b/LiteLoader/include/llapi/mc/LavaSlime.hpp similarity index 98% rename from LiteLoader/Header/MC/LavaSlime.hpp rename to LiteLoader/include/llapi/mc/LavaSlime.hpp index 9526b46..d4763e0 100644 --- a/LiteLoader/Header/MC/LavaSlime.hpp +++ b/LiteLoader/include/llapi/mc/LavaSlime.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Slime.hpp" diff --git a/LiteLoader/Header/MC/LayDownGoal.hpp b/LiteLoader/include/llapi/mc/LayDownGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/LayDownGoal.hpp rename to LiteLoader/include/llapi/mc/LayDownGoal.hpp index cc08020..dfe2b90 100644 --- a/LiteLoader/Header/MC/LayDownGoal.hpp +++ b/LiteLoader/include/llapi/mc/LayDownGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LayEggGoal.hpp b/LiteLoader/include/llapi/mc/LayEggGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/LayEggGoal.hpp rename to LiteLoader/include/llapi/mc/LayEggGoal.hpp index 02f9f0c..818415e 100644 --- a/LiteLoader/Header/MC/LayEggGoal.hpp +++ b/LiteLoader/include/llapi/mc/LayEggGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LayerBiomeSource.hpp b/LiteLoader/include/llapi/mc/LayerBiomeSource.hpp similarity index 97% rename from LiteLoader/Header/MC/LayerBiomeSource.hpp rename to LiteLoader/include/llapi/mc/LayerBiomeSource.hpp index a0b51bc..550dc7f 100644 --- a/LiteLoader/Header/MC/LayerBiomeSource.hpp +++ b/LiteLoader/include/llapi/mc/LayerBiomeSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeadItem.hpp b/LiteLoader/include/llapi/mc/LeadItem.hpp similarity index 98% rename from LiteLoader/Header/MC/LeadItem.hpp rename to LiteLoader/include/llapi/mc/LeadItem.hpp index 960302f..9e40a54 100644 --- a/LiteLoader/Header/MC/LeadItem.hpp +++ b/LiteLoader/include/llapi/mc/LeadItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeafBlock.hpp b/LiteLoader/include/llapi/mc/LeafBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LeafBlock.hpp rename to LiteLoader/include/llapi/mc/LeafBlock.hpp index 76c74b0..680ebd6 100644 --- a/LiteLoader/Header/MC/LeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeafBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeafBlockItem.hpp b/LiteLoader/include/llapi/mc/LeafBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/LeafBlockItem.hpp rename to LiteLoader/include/llapi/mc/LeafBlockItem.hpp index b4a8ce7..1dae26e 100644 --- a/LiteLoader/Header/MC/LeafBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/LeafBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeapAtTargetGoal.hpp b/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/LeapAtTargetGoal.hpp rename to LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp index 241b815..cbdfa26 100644 --- a/LiteLoader/Header/MC/LeapAtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeashFenceKnotActor.hpp b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp similarity index 98% rename from LiteLoader/Header/MC/LeashFenceKnotActor.hpp rename to LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp index fccedfe..26918a7 100644 --- a/LiteLoader/Header/MC/LeashFenceKnotActor.hpp +++ b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeashableComponent.hpp b/LiteLoader/include/llapi/mc/LeashableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/LeashableComponent.hpp rename to LiteLoader/include/llapi/mc/LeashableComponent.hpp index 4d4069e..1e05fe0 100644 --- a/LiteLoader/Header/MC/LeashableComponent.hpp +++ b/LiteLoader/include/llapi/mc/LeashableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeashableDefinition.hpp b/LiteLoader/include/llapi/mc/LeashableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/LeashableDefinition.hpp rename to LiteLoader/include/llapi/mc/LeashableDefinition.hpp index 2a6cd3c..0fc88c9 100644 --- a/LiteLoader/Header/MC/LeashableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LeashableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeashableSystem.hpp b/LiteLoader/include/llapi/mc/LeashableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/LeashableSystem.hpp rename to LiteLoader/include/llapi/mc/LeashableSystem.hpp index b084c94..c5d1210 100644 --- a/LiteLoader/Header/MC/LeashableSystem.hpp +++ b/LiteLoader/include/llapi/mc/LeashableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LecternBlock.hpp b/LiteLoader/include/llapi/mc/LecternBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LecternBlock.hpp rename to LiteLoader/include/llapi/mc/LecternBlock.hpp index 66e4749..bb26466 100644 --- a/LiteLoader/Header/MC/LecternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LecternBlockActor.hpp b/LiteLoader/include/llapi/mc/LecternBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/LecternBlockActor.hpp rename to LiteLoader/include/llapi/mc/LecternBlockActor.hpp index 6a5426f..1d2b427 100644 --- a/LiteLoader/Header/MC/LecternBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LecternUpdatePacket.hpp b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LecternUpdatePacket.hpp rename to LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp index f848f12..8697c4d 100644 --- a/LiteLoader/Header/MC/LecternUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyBlockPlacementProcessor.hpp b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyBlockPlacementProcessor.hpp rename to LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp index e23f668..ff12b39 100644 --- a/LiteLoader/Header/MC/LegacyBlockPlacementProcessor.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyBodyControl.hpp b/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp similarity index 95% rename from LiteLoader/Header/MC/LegacyBodyControl.hpp rename to LiteLoader/include/llapi/mc/LegacyBodyControl.hpp index 6ad9756..c4024d9 100644 --- a/LiteLoader/Header/MC/LegacyBodyControl.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyChunkStorage.hpp b/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp similarity index 97% rename from LiteLoader/Header/MC/LegacyChunkStorage.hpp rename to LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp index b5ac302..27802d4 100644 --- a/LiteLoader/Header/MC/LegacyChunkStorage.hpp +++ b/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyEmeraldOreFeature.hpp b/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyEmeraldOreFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp index 9934c7f..56d579a 100644 --- a/LiteLoader/Header/MC/LegacyEmeraldOreFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyFlowerFeature.hpp b/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyFlowerFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp index ad8279e..39bb362 100644 --- a/LiteLoader/Header/MC/LegacyFlowerFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyForestFoliageFeature.hpp b/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyForestFoliageFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp index 2cae8e1..c39b9a2 100644 --- a/LiteLoader/Header/MC/LegacyForestFoliageFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyForestRockFeature.hpp b/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyForestRockFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp index 751b520..c73d40a 100644 --- a/LiteLoader/Header/MC/LegacyForestRockFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyIceFeature.hpp b/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyIceFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyIceFeature.hpp index d6778d7..49d326a 100644 --- a/LiteLoader/Header/MC/LegacyIceFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyJigsawPlacement.hpp b/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp similarity index 98% rename from LiteLoader/Header/MC/LegacyJigsawPlacement.hpp rename to LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp index 7c19800..dc9aedd 100644 --- a/LiteLoader/Header/MC/LegacyJigsawPlacement.hpp +++ b/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyPackIdVersion.hpp b/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp similarity index 95% rename from LiteLoader/Header/MC/LegacyPackIdVersion.hpp rename to LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp index ca74812..d9e5890 100644 --- a/LiteLoader/Header/MC/LegacyPackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacySmallMushroomsFeature.hpp b/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacySmallMushroomsFeature.hpp rename to LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp index 7b919ff..4ea7339 100644 --- a/LiteLoader/Header/MC/LegacySmallMushroomsFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacySpringsFeature.hpp b/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacySpringsFeature.hpp rename to LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp index 59238b1..47f0f5c 100644 --- a/LiteLoader/Header/MC/LegacySpringsFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyStructureActorInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyStructureActorInfo.hpp rename to LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp index f15b5a1..277b5f5 100644 --- a/LiteLoader/Header/MC/LegacyStructureActorInfo.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyStructureBlockInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyStructureBlockInfo.hpp rename to LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp index 2e8d193..0907a25 100644 --- a/LiteLoader/Header/MC/LegacyStructureBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyStructureBlockPalette.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyStructureBlockPalette.hpp rename to LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp index 9a57167..cc69c3c 100644 --- a/LiteLoader/Header/MC/LegacyStructureBlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyStructureSettings.hpp b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyStructureSettings.hpp rename to LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp index 96d6023..46855cd 100644 --- a/LiteLoader/Header/MC/LegacyStructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyStructureTemplate.hpp b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp similarity index 98% rename from LiteLoader/Header/MC/LegacyStructureTemplate.hpp rename to LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp index f669b3b..5008c7a 100644 --- a/LiteLoader/Header/MC/LegacyStructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacySwampFoliageFeature.hpp b/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacySwampFoliageFeature.hpp rename to LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp index d9bb5cc..f1ce4ba 100644 --- a/LiteLoader/Header/MC/LegacySwampFoliageFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/LegacyTradeableComponent.hpp rename to LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp index 8915763..5811594 100644 --- a/LiteLoader/Header/MC/LegacyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyTreeFeature.hpp b/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/LegacyTreeFeature.hpp rename to LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp index 82afbb0..6926b3b 100644 --- a/LiteLoader/Header/MC/LegacyTreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LegacyTreeFeatureHelpers.hpp b/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp similarity index 94% rename from LiteLoader/Header/MC/LegacyTreeFeatureHelpers.hpp rename to LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp index a34d748..30eefb8 100644 --- a/LiteLoader/Header/MC/LegacyTreeFeatureHelpers.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Level.hpp b/LiteLoader/include/llapi/mc/Level.hpp similarity index 99% rename from LiteLoader/Header/MC/Level.hpp rename to LiteLoader/include/llapi/mc/Level.hpp index 2354581..00aad7c 100644 --- a/LiteLoader/Header/MC/Level.hpp +++ b/LiteLoader/include/llapi/mc/Level.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp similarity index 99% rename from LiteLoader/Header/MC/LevelChunk.hpp rename to LiteLoader/include/llapi/mc/LevelChunk.hpp index 89b379f..85f3595 100644 --- a/LiteLoader/Header/MC/LevelChunk.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunkBuilderData.hpp b/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelChunkBuilderData.hpp rename to LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp index be1f559..99d370e 100644 --- a/LiteLoader/Header/MC/LevelChunkBuilderData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunkFinalDeleter.hpp b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelChunkFinalDeleter.hpp rename to LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp index 8fc2f01..9e1260d 100644 --- a/LiteLoader/Header/MC/LevelChunkFinalDeleter.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunkGarbageCollector.hpp b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelChunkGarbageCollector.hpp rename to LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp index 2a6a0c9..617b9c2 100644 --- a/LiteLoader/Header/MC/LevelChunkGarbageCollector.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunkPacket.hpp b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelChunkPacket.hpp rename to LiteLoader/include/llapi/mc/LevelChunkPacket.hpp index a351fa5..5768495 100644 --- a/LiteLoader/Header/MC/LevelChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelChunkPhase1Deleter.hpp b/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelChunkPhase1Deleter.hpp rename to LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp index 2d7e206..5971038 100644 --- a/LiteLoader/Header/MC/LevelChunkPhase1Deleter.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/LevelContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp index a0b10ed..bd8c56b 100644 --- a/LiteLoader/Header/MC/LevelContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelContainerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp similarity index 98% rename from LiteLoader/Header/MC/LevelContainerModel.hpp rename to LiteLoader/include/llapi/mc/LevelContainerModel.hpp index 9de0a82..6a02abe 100644 --- a/LiteLoader/Header/MC/LevelContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp similarity index 98% rename from LiteLoader/Header/MC/LevelData.hpp rename to LiteLoader/include/llapi/mc/LevelData.hpp index f6b82cb..14024c1 100644 --- a/LiteLoader/Header/MC/LevelData.hpp +++ b/LiteLoader/include/llapi/mc/LevelData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDataKeys.hpp b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelDataKeys.hpp rename to LiteLoader/include/llapi/mc/LevelDataKeys.hpp index 8654626..4888dfa 100644 --- a/LiteLoader/Header/MC/LevelDataKeys.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDataValue.hpp b/LiteLoader/include/llapi/mc/LevelDataValue.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelDataValue.hpp rename to LiteLoader/include/llapi/mc/LevelDataValue.hpp index b875b25..c7c9134 100644 --- a/LiteLoader/Header/MC/LevelDataValue.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataValue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDataWrapper.hpp b/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelDataWrapper.hpp rename to LiteLoader/include/llapi/mc/LevelDataWrapper.hpp index 74da64b..8d2ea9b 100644 --- a/LiteLoader/Header/MC/LevelDataWrapper.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbEnv.hpp b/LiteLoader/include/llapi/mc/LevelDbEnv.hpp similarity index 98% rename from LiteLoader/Header/MC/LevelDbEnv.hpp rename to LiteLoader/include/llapi/mc/LevelDbEnv.hpp index 11cace7..9877c85 100644 --- a/LiteLoader/Header/MC/LevelDbEnv.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbFileLock.hpp b/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp similarity index 94% rename from LiteLoader/Header/MC/LevelDbFileLock.hpp rename to LiteLoader/include/llapi/mc/LevelDbFileLock.hpp index 66ec726..b8dec32 100644 --- a/LiteLoader/Header/MC/LevelDbFileLock.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbLogger.hpp b/LiteLoader/include/llapi/mc/LevelDbLogger.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelDbLogger.hpp rename to LiteLoader/include/llapi/mc/LevelDbLogger.hpp index 86126f8..30ab8df 100644 --- a/LiteLoader/Header/MC/LevelDbLogger.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbLogger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbRandomAccessFile.hpp b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelDbRandomAccessFile.hpp rename to LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp index edf9ab1..4c7a10e 100644 --- a/LiteLoader/Header/MC/LevelDbRandomAccessFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbSequentialFile.hpp b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelDbSequentialFile.hpp rename to LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp index e47d677..ee6644e 100644 --- a/LiteLoader/Header/MC/LevelDbSequentialFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelDbWritableFile.hpp b/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp similarity index 97% rename from LiteLoader/Header/MC/LevelDbWritableFile.hpp rename to LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp index ac1193f..d972cb3 100644 --- a/LiteLoader/Header/MC/LevelDbWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp similarity index 95% rename from LiteLoader/Header/MC/LevelEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp index b6b9ebd..8b6abe0 100644 --- a/LiteLoader/Header/MC/LevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelEventGenericPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelEventGenericPacket.hpp rename to LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp index 37af4ea..4aaf897 100644 --- a/LiteLoader/Header/MC/LevelEventGenericPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelEventListener.hpp b/LiteLoader/include/llapi/mc/LevelEventListener.hpp similarity index 97% rename from LiteLoader/Header/MC/LevelEventListener.hpp rename to LiteLoader/include/llapi/mc/LevelEventListener.hpp index e70ea9c..dc55996 100644 --- a/LiteLoader/Header/MC/LevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelEventPacket.hpp rename to LiteLoader/include/llapi/mc/LevelEventPacket.hpp index 1b86b91..4c01dc0 100644 --- a/LiteLoader/Header/MC/LevelEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelListener.hpp b/LiteLoader/include/llapi/mc/LevelListener.hpp similarity index 99% rename from LiteLoader/Header/MC/LevelListener.hpp rename to LiteLoader/include/llapi/mc/LevelListener.hpp index 4681f99..910fa5e 100644 --- a/LiteLoader/Header/MC/LevelListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp similarity index 97% rename from LiteLoader/Header/MC/LevelSettings.hpp rename to LiteLoader/include/llapi/mc/LevelSettings.hpp index 8dff852..80189fb 100644 --- a/LiteLoader/Header/MC/LevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSoundEventMap.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelSoundEventMap.hpp rename to LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp index d518e9a..9fb3b5a 100644 --- a/LiteLoader/Header/MC/LevelSoundEventMap.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSoundEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelSoundEventPacket.hpp rename to LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp index 84fd0ed..0d68627 100644 --- a/LiteLoader/Header/MC/LevelSoundEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSoundEventPacketV1.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelSoundEventPacketV1.hpp rename to LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp index e3baf42..2965e17 100644 --- a/LiteLoader/Header/MC/LevelSoundEventPacketV1.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSoundEventPacketV2.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelSoundEventPacketV2.hpp rename to LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp index f2c8550..818d90d 100644 --- a/LiteLoader/Header/MC/LevelSoundEventPacketV2.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelStorage.hpp b/LiteLoader/include/llapi/mc/LevelStorage.hpp similarity index 99% rename from LiteLoader/Header/MC/LevelStorage.hpp rename to LiteLoader/include/llapi/mc/LevelStorage.hpp index 2c24f55..b274d07 100644 --- a/LiteLoader/Header/MC/LevelStorage.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Bedrock.hpp" diff --git a/LiteLoader/Header/MC/LevelStorageSource.hpp b/LiteLoader/include/llapi/mc/LevelStorageSource.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelStorageSource.hpp rename to LiteLoader/include/llapi/mc/LevelStorageSource.hpp index bf8cbd6..6795d4c 100644 --- a/LiteLoader/Header/MC/LevelStorageSource.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelStorageWriteBatch.hpp b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp similarity index 97% rename from LiteLoader/Header/MC/LevelStorageWriteBatch.hpp rename to LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp index e46f7bc..5872f3d 100644 --- a/LiteLoader/Header/MC/LevelStorageWriteBatch.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp similarity index 96% rename from LiteLoader/Header/MC/LevelSummary.hpp rename to LiteLoader/include/llapi/mc/LevelSummary.hpp index 660e6db..71781c8 100644 --- a/LiteLoader/Header/MC/LevelSummary.hpp +++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LeverBlock.hpp b/LiteLoader/include/llapi/mc/LeverBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LeverBlock.hpp rename to LiteLoader/include/llapi/mc/LeverBlock.hpp index f3e86b1..bb0d458 100644 --- a/LiteLoader/Header/MC/LeverBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeverBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LibraryItemScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/LibraryItemScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/LibraryItemScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/LibraryItemScreenCapabilities.hpp index d06be82..db114f4 100644 --- a/LiteLoader/Header/MC/LibraryItemScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/LibraryItemScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LightBlock.hpp b/LiteLoader/include/llapi/mc/LightBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/LightBlock.hpp rename to LiteLoader/include/llapi/mc/LightBlock.hpp index 0f911fb..6587942 100644 --- a/LiteLoader/Header/MC/LightBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LightGemBlock.hpp b/LiteLoader/include/llapi/mc/LightGemBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/LightGemBlock.hpp rename to LiteLoader/include/llapi/mc/LightGemBlock.hpp index dcd2a25..45dc9d1 100644 --- a/LiteLoader/Header/MC/LightGemBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightGemBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LightningBolt.hpp b/LiteLoader/include/llapi/mc/LightningBolt.hpp similarity index 98% rename from LiteLoader/Header/MC/LightningBolt.hpp rename to LiteLoader/include/llapi/mc/LightningBolt.hpp index 0a672f0..833860b 100644 --- a/LiteLoader/Header/MC/LightningBolt.hpp +++ b/LiteLoader/include/llapi/mc/LightningBolt.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LingeringPotionItem.hpp b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp similarity index 98% rename from LiteLoader/Header/MC/LingeringPotionItem.hpp rename to LiteLoader/include/llapi/mc/LingeringPotionItem.hpp index 2185186..0b3dbd7 100644 --- a/LiteLoader/Header/MC/LingeringPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Potion.hpp" #include "PotionItem.hpp" diff --git a/LiteLoader/Header/MC/LiquidBlock.hpp b/LiteLoader/include/llapi/mc/LiquidBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LiquidBlock.hpp rename to LiteLoader/include/llapi/mc/LiquidBlock.hpp index e1a24e1..5a586a4 100644 --- a/LiteLoader/Header/MC/LiquidBlock.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LiquidBlockDynamic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp similarity index 99% rename from LiteLoader/Header/MC/LiquidBlockDynamic.hpp rename to LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp index 4d25293..c3bd518 100644 --- a/LiteLoader/Header/MC/LiquidBlockDynamic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LiquidBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LiquidBlockStatic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp similarity index 98% rename from LiteLoader/Header/MC/LiquidBlockStatic.hpp rename to LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp index 34a0250..61789d3 100644 --- a/LiteLoader/Header/MC/LiquidBlockStatic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LiquidBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListCommand.hpp b/LiteLoader/include/llapi/mc/ListCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ListCommand.hpp rename to LiteLoader/include/llapi/mc/ListCommand.hpp index 6663969..5747080 100644 --- a/LiteLoader/Header/MC/ListCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListDCommand.hpp b/LiteLoader/include/llapi/mc/ListDCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ListDCommand.hpp rename to LiteLoader/include/llapi/mc/ListDCommand.hpp index 5edb97c..8ac7955 100644 --- a/LiteLoader/Header/MC/ListDCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListDCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListTag.hpp b/LiteLoader/include/llapi/mc/ListTag.hpp similarity index 99% rename from LiteLoader/Header/MC/ListTag.hpp rename to LiteLoader/include/llapi/mc/ListTag.hpp index fc57a09..9a68876 100644 --- a/LiteLoader/Header/MC/ListTag.hpp +++ b/LiteLoader/include/llapi/mc/ListTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListTagFloatAdder.hpp b/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp similarity index 95% rename from LiteLoader/Header/MC/ListTagFloatAdder.hpp rename to LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp index 3f01ce7..ca6b284 100644 --- a/LiteLoader/Header/MC/ListTagFloatAdder.hpp +++ b/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListTagIntAdder.hpp b/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp similarity index 95% rename from LiteLoader/Header/MC/ListTagIntAdder.hpp rename to LiteLoader/include/llapi/mc/ListTagIntAdder.hpp index 351f075..13e8074 100644 --- a/LiteLoader/Header/MC/ListTagIntAdder.hpp +++ b/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ListenerInfo.hpp b/LiteLoader/include/llapi/mc/ListenerInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/ListenerInfo.hpp rename to LiteLoader/include/llapi/mc/ListenerInfo.hpp index 4f25fdd..fa3d61e 100644 --- a/LiteLoader/Header/MC/ListenerInfo.hpp +++ b/LiteLoader/include/llapi/mc/ListenerInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Llama.hpp b/LiteLoader/include/llapi/mc/Llama.hpp similarity index 98% rename from LiteLoader/Header/MC/Llama.hpp rename to LiteLoader/include/llapi/mc/Llama.hpp index e061676..c113c0e 100644 --- a/LiteLoader/Header/MC/Llama.hpp +++ b/LiteLoader/include/llapi/mc/Llama.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/LlamaSpit.hpp b/LiteLoader/include/llapi/mc/LlamaSpit.hpp similarity index 98% rename from LiteLoader/Header/MC/LlamaSpit.hpp rename to LiteLoader/include/llapi/mc/LlamaSpit.hpp index 49452ef..dc1fcdf 100644 --- a/LiteLoader/Header/MC/LlamaSpit.hpp +++ b/LiteLoader/include/llapi/mc/LlamaSpit.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LocalConnector.hpp b/LiteLoader/include/llapi/mc/LocalConnector.hpp similarity index 98% rename from LiteLoader/Header/MC/LocalConnector.hpp rename to LiteLoader/include/llapi/mc/LocalConnector.hpp index 7c95e05..0cc392a 100644 --- a/LiteLoader/Header/MC/LocalConnector.hpp +++ b/LiteLoader/include/llapi/mc/LocalConnector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Social.hpp" #include "Connector.hpp" #include "RakNet.hpp" diff --git a/LiteLoader/Header/MC/Localization.hpp b/LiteLoader/include/llapi/mc/Localization.hpp similarity index 98% rename from LiteLoader/Header/MC/Localization.hpp rename to LiteLoader/include/llapi/mc/Localization.hpp index 542c8f2..b1bd516 100644 --- a/LiteLoader/Header/MC/Localization.hpp +++ b/LiteLoader/include/llapi/mc/Localization.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LocateCommand.hpp b/LiteLoader/include/llapi/mc/LocateCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/LocateCommand.hpp rename to LiteLoader/include/llapi/mc/LocateCommand.hpp index e148779..5b49f20 100644 --- a/LiteLoader/Header/MC/LocateCommand.hpp +++ b/LiteLoader/include/llapi/mc/LocateCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LodestoneBlock.hpp b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/LodestoneBlock.hpp rename to LiteLoader/include/llapi/mc/LodestoneBlock.hpp index e9811eb..b3021af 100644 --- a/LiteLoader/Header/MC/LodestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LodestoneBlockActor.hpp b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/LodestoneBlockActor.hpp rename to LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp index 9b4ffc4..ea9f53a 100644 --- a/LiteLoader/Header/MC/LodestoneBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LodestoneCompassComponent.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/LodestoneCompassComponent.hpp rename to LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp index da8c959..a006547 100644 --- a/LiteLoader/Header/MC/LodestoneCompassComponent.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LodestoneCompassComponentCalculator.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp similarity index 96% rename from LiteLoader/Header/MC/LodestoneCompassComponentCalculator.hpp rename to LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp index 6a3b1c5..015406a 100644 --- a/LiteLoader/Header/MC/LodestoneCompassComponentCalculator.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LodestoneCompassItem.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp similarity index 98% rename from LiteLoader/Header/MC/LodestoneCompassItem.hpp rename to LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp index cf1d38f..043f285 100644 --- a/LiteLoader/Header/MC/LodestoneCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LogBlock.hpp b/LiteLoader/include/llapi/mc/LogBlock.hpp similarity index 96% rename from LiteLoader/Header/MC/LogBlock.hpp rename to LiteLoader/include/llapi/mc/LogBlock.hpp index 21ce2a5..23b6e01 100644 --- a/LiteLoader/Header/MC/LogBlock.hpp +++ b/LiteLoader/include/llapi/mc/LogBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LoginPacket.hpp b/LiteLoader/include/llapi/mc/LoginPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/LoginPacket.hpp rename to LiteLoader/include/llapi/mc/LoginPacket.hpp index f1ec176..e39c320 100644 --- a/LiteLoader/Header/MC/LoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/LoginPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtActorDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtActorDefinition.hpp rename to LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp index 7c0c6a2..269c29f 100644 --- a/LiteLoader/Header/MC/LookAtActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/LookAtActorGoal.hpp b/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/LookAtActorGoal.hpp rename to LiteLoader/include/llapi/mc/LookAtActorGoal.hpp index ba0a25e..ee20a83 100644 --- a/LiteLoader/Header/MC/LookAtActorGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtActorNode.hpp b/LiteLoader/include/llapi/mc/LookAtActorNode.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtActorNode.hpp rename to LiteLoader/include/llapi/mc/LookAtActorNode.hpp index 923f2c7..dbd97a7 100644 --- a/LiteLoader/Header/MC/LookAtActorNode.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtBlockDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp index 1db0cc2..e6f7ec4 100644 --- a/LiteLoader/Header/MC/LookAtBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/LookAtBlockNode.hpp b/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtBlockNode.hpp rename to LiteLoader/include/llapi/mc/LookAtBlockNode.hpp index c968ac1..9b43741 100644 --- a/LiteLoader/Header/MC/LookAtBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtDefinition.hpp rename to LiteLoader/include/llapi/mc/LookAtDefinition.hpp index 746191d..001cd83 100644 --- a/LiteLoader/Header/MC/LookAtDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/LookAtEntityGoal.hpp b/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp similarity index 95% rename from LiteLoader/Header/MC/LookAtEntityGoal.hpp rename to LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp index b0149ef..62298d1 100644 --- a/LiteLoader/Header/MC/LookAtEntityGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LookAtActorGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtPlayerGoal.hpp b/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp similarity index 95% rename from LiteLoader/Header/MC/LookAtPlayerGoal.hpp rename to LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp index a2e24c9..66040e6 100644 --- a/LiteLoader/Header/MC/LookAtPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LookAtActorGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtSystem.hpp b/LiteLoader/include/llapi/mc/LookAtSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/LookAtSystem.hpp rename to LiteLoader/include/llapi/mc/LookAtSystem.hpp index 2193053..14420d1 100644 --- a/LiteLoader/Header/MC/LookAtSystem.hpp +++ b/LiteLoader/include/llapi/mc/LookAtSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtTargetGoal.hpp b/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp similarity index 95% rename from LiteLoader/Header/MC/LookAtTargetGoal.hpp rename to LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp index 51edea9..6c59aad 100644 --- a/LiteLoader/Header/MC/LookAtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LookAtActorGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookAtTradingPlayerGoal.hpp b/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/LookAtTradingPlayerGoal.hpp rename to LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp index eae9637..66039dd 100644 --- a/LiteLoader/Header/MC/LookAtTradingPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LookAtActorGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookControl.hpp b/LiteLoader/include/llapi/mc/LookControl.hpp similarity index 95% rename from LiteLoader/Header/MC/LookControl.hpp rename to LiteLoader/include/llapi/mc/LookControl.hpp index 54a572d..347a23c 100644 --- a/LiteLoader/Header/MC/LookControl.hpp +++ b/LiteLoader/include/llapi/mc/LookControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookControlComponent.hpp b/LiteLoader/include/llapi/mc/LookControlComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/LookControlComponent.hpp rename to LiteLoader/include/llapi/mc/LookControlComponent.hpp index fc8ede7..33a4db0 100644 --- a/LiteLoader/Header/MC/LookControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/LookControlComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LookControlSystem.hpp b/LiteLoader/include/llapi/mc/LookControlSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/LookControlSystem.hpp rename to LiteLoader/include/llapi/mc/LookControlSystem.hpp index 050bbc6..27e9d3c 100644 --- a/LiteLoader/Header/MC/LookControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/LookControlSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LoomBlock.hpp b/LiteLoader/include/llapi/mc/LoomBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/LoomBlock.hpp rename to LiteLoader/include/llapi/mc/LoomBlock.hpp index 1152fc0..3057637 100644 --- a/LiteLoader/Header/MC/LoomBlock.hpp +++ b/LiteLoader/include/llapi/mc/LoomBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LoomContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/LoomContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp index 277f2f0..fab8f6c 100644 --- a/LiteLoader/Header/MC/LoomContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LoopbackPacketSender.hpp b/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp similarity index 97% rename from LiteLoader/Header/MC/LoopbackPacketSender.hpp rename to LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp index a311ac8..57a45ba 100644 --- a/LiteLoader/Header/MC/LoopbackPacketSender.hpp +++ b/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootComponent.hpp b/LiteLoader/include/llapi/mc/LootComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/LootComponent.hpp rename to LiteLoader/include/llapi/mc/LootComponent.hpp index 9293397..4ce5c70 100644 --- a/LiteLoader/Header/MC/LootComponent.hpp +++ b/LiteLoader/include/llapi/mc/LootComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootComponentDescription.hpp b/LiteLoader/include/llapi/mc/LootComponentDescription.hpp similarity index 97% rename from LiteLoader/Header/MC/LootComponentDescription.hpp rename to LiteLoader/include/llapi/mc/LootComponentDescription.hpp index cbe4f6b..e1f2ab6 100644 --- a/LiteLoader/Header/MC/LootComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/LootComponentDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootEnchant.hpp b/LiteLoader/include/llapi/mc/LootEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/LootEnchant.hpp rename to LiteLoader/include/llapi/mc/LootEnchant.hpp index c834b1b..d0f6790 100644 --- a/LiteLoader/Header/MC/LootEnchant.hpp +++ b/LiteLoader/include/llapi/mc/LootEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItem.hpp b/LiteLoader/include/llapi/mc/LootItem.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItem.hpp rename to LiteLoader/include/llapi/mc/LootItem.hpp index 65b4780..0be2d55 100644 --- a/LiteLoader/Header/MC/LootItem.hpp +++ b/LiteLoader/include/llapi/mc/LootItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemActorHasMarkVariantCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemActorHasMarkVariantCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp index 7338b39..800957a 100644 --- a/LiteLoader/Header/MC/LootItemActorHasMarkVariantCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemCondition.hpp b/LiteLoader/include/llapi/mc/LootItemCondition.hpp similarity index 95% rename from LiteLoader/Header/MC/LootItemCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemCondition.hpp index 12294ec..2381835 100644 --- a/LiteLoader/Header/MC/LootItemCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemConditions.hpp b/LiteLoader/include/llapi/mc/LootItemConditions.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemConditions.hpp rename to LiteLoader/include/llapi/mc/LootItemConditions.hpp index 7eb6ec1..054f2e8 100644 --- a/LiteLoader/Header/MC/LootItemConditions.hpp +++ b/LiteLoader/include/llapi/mc/LootItemConditions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemFunction.hpp b/LiteLoader/include/llapi/mc/LootItemFunction.hpp similarity index 98% rename from LiteLoader/Header/MC/LootItemFunction.hpp rename to LiteLoader/include/llapi/mc/LootItemFunction.hpp index 1941389..39b6f86 100644 --- a/LiteLoader/Header/MC/LootItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemFunctions.hpp b/LiteLoader/include/llapi/mc/LootItemFunctions.hpp similarity index 95% rename from LiteLoader/Header/MC/LootItemFunctions.hpp rename to LiteLoader/include/llapi/mc/LootItemFunctions.hpp index f32729d..d8465d0 100644 --- a/LiteLoader/Header/MC/LootItemFunctions.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunctions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemKilledByActorCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemKilledByActorCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp index 57472b7..20a87f1 100644 --- a/LiteLoader/Header/MC/LootItemKilledByActorCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemKilledByPlayerCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemKilledByPlayerCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp index 62574a9..f37ac02 100644 --- a/LiteLoader/Header/MC/LootItemKilledByPlayerCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemKilledByPlayerOrPetsCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemKilledByPlayerOrPetsCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp index aa86a19..80166d1 100644 --- a/LiteLoader/Header/MC/LootItemKilledByPlayerOrPetsCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemRandomChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemRandomChanceCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp index dea775b..17de2e5 100644 --- a/LiteLoader/Header/MC/LootItemRandomChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemRandomChanceWithLootingCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp similarity index 96% rename from LiteLoader/Header/MC/LootItemRandomChanceWithLootingCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp index 4fb1800..11d50f8 100644 --- a/LiteLoader/Header/MC/LootItemRandomChanceWithLootingCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemRandomChanceWithSpecialModifierCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp similarity index 97% rename from LiteLoader/Header/MC/LootItemRandomChanceWithSpecialModifierCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp index 6a2832e..117d8a7 100644 --- a/LiteLoader/Header/MC/LootItemRandomChanceWithSpecialModifierCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootItemRandomDifficultyChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp similarity index 97% rename from LiteLoader/Header/MC/LootItemRandomDifficultyChanceCondition.hpp rename to LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp index a23a038..d74df1a 100644 --- a/LiteLoader/Header/MC/LootItemRandomDifficultyChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootPool.hpp b/LiteLoader/include/llapi/mc/LootPool.hpp similarity index 96% rename from LiteLoader/Header/MC/LootPool.hpp rename to LiteLoader/include/llapi/mc/LootPool.hpp index 0a3c92a..e10064f 100644 --- a/LiteLoader/Header/MC/LootPool.hpp +++ b/LiteLoader/include/llapi/mc/LootPool.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootPoolEntry.hpp b/LiteLoader/include/llapi/mc/LootPoolEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/LootPoolEntry.hpp rename to LiteLoader/include/llapi/mc/LootPoolEntry.hpp index c86ed8f..0463703 100644 --- a/LiteLoader/Header/MC/LootPoolEntry.hpp +++ b/LiteLoader/include/llapi/mc/LootPoolEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootPoolTiers.hpp b/LiteLoader/include/llapi/mc/LootPoolTiers.hpp similarity index 95% rename from LiteLoader/Header/MC/LootPoolTiers.hpp rename to LiteLoader/include/llapi/mc/LootPoolTiers.hpp index f202f39..f82851f 100644 --- a/LiteLoader/Header/MC/LootPoolTiers.hpp +++ b/LiteLoader/include/llapi/mc/LootPoolTiers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTable.hpp b/LiteLoader/include/llapi/mc/LootTable.hpp similarity index 96% rename from LiteLoader/Header/MC/LootTable.hpp rename to LiteLoader/include/llapi/mc/LootTable.hpp index 3b1f9d6..33453f6 100644 --- a/LiteLoader/Header/MC/LootTable.hpp +++ b/LiteLoader/include/llapi/mc/LootTable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTableContext.hpp b/LiteLoader/include/llapi/mc/LootTableContext.hpp similarity index 96% rename from LiteLoader/Header/MC/LootTableContext.hpp rename to LiteLoader/include/llapi/mc/LootTableContext.hpp index 0d926fd..53d345f 100644 --- a/LiteLoader/Header/MC/LootTableContext.hpp +++ b/LiteLoader/include/llapi/mc/LootTableContext.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTableDescription.hpp b/LiteLoader/include/llapi/mc/LootTableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/LootTableDescription.hpp rename to LiteLoader/include/llapi/mc/LootTableDescription.hpp index c6b7e6b..52b0ad8 100644 --- a/LiteLoader/Header/MC/LootTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/LootTableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTableEntry.hpp b/LiteLoader/include/llapi/mc/LootTableEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/LootTableEntry.hpp rename to LiteLoader/include/llapi/mc/LootTableEntry.hpp index 8a5012f..4a84035 100644 --- a/LiteLoader/Header/MC/LootTableEntry.hpp +++ b/LiteLoader/include/llapi/mc/LootTableEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTableReference.hpp b/LiteLoader/include/llapi/mc/LootTableReference.hpp similarity index 96% rename from LiteLoader/Header/MC/LootTableReference.hpp rename to LiteLoader/include/llapi/mc/LootTableReference.hpp index 7db7d58..a960ff9 100644 --- a/LiteLoader/Header/MC/LootTableReference.hpp +++ b/LiteLoader/include/llapi/mc/LootTableReference.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootTables.hpp b/LiteLoader/include/llapi/mc/LootTables.hpp similarity index 95% rename from LiteLoader/Header/MC/LootTables.hpp rename to LiteLoader/include/llapi/mc/LootTables.hpp index 15bf71c..eebb787 100644 --- a/LiteLoader/Header/MC/LootTables.hpp +++ b/LiteLoader/include/llapi/mc/LootTables.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LootingEnchantFunction.hpp b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/LootingEnchantFunction.hpp rename to LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp index e8d6254..8096cc9 100644 --- a/LiteLoader/Header/MC/LootingEnchantFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/LowMemoryWatcher.hpp b/LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp similarity index 96% rename from LiteLoader/Header/MC/LowMemoryWatcher.hpp rename to LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp index 7c6a241..0ee52c4 100644 --- a/LiteLoader/Header/MC/LowMemoryWatcher.hpp +++ b/LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MCRESULT.hpp b/LiteLoader/include/llapi/mc/MCRESULT.hpp similarity index 97% rename from LiteLoader/Header/MC/MCRESULT.hpp rename to LiteLoader/include/llapi/mc/MCRESULT.hpp index a256501..648b111 100644 --- a/LiteLoader/Header/MC/MCRESULT.hpp +++ b/LiteLoader/include/llapi/mc/MCRESULT.hpp @@ -5,7 +5,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/MagmaBlock.hpp b/LiteLoader/include/llapi/mc/MagmaBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MagmaBlock.hpp rename to LiteLoader/include/llapi/mc/MagmaBlock.hpp index c917074..80a34d2 100644 --- a/LiteLoader/Header/MC/MagmaBlock.hpp +++ b/LiteLoader/include/llapi/mc/MagmaBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MainChunkSource.hpp b/LiteLoader/include/llapi/mc/MainChunkSource.hpp similarity index 98% rename from LiteLoader/Header/MC/MainChunkSource.hpp rename to LiteLoader/include/llapi/mc/MainChunkSource.hpp index 27f0a33..5e25e60 100644 --- a/LiteLoader/Header/MC/MainChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/MainChunkSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MakeLoveGoal.hpp b/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/MakeLoveGoal.hpp rename to LiteLoader/include/llapi/mc/MakeLoveGoal.hpp index 56074c5..5b45ddc 100644 --- a/LiteLoader/Header/MC/MakeLoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ManagedWanderingTraderDescription.hpp b/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ManagedWanderingTraderDescription.hpp rename to LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp index 9bdf892..e59bad5 100644 --- a/LiteLoader/Header/MC/ManagedWanderingTraderDescription.hpp +++ b/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapCloningRecipe.hpp b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/MapCloningRecipe.hpp rename to LiteLoader/include/llapi/mc/MapCloningRecipe.hpp index a9094db..fa025cd 100644 --- a/LiteLoader/Header/MC/MapCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapConstants.hpp b/LiteLoader/include/llapi/mc/MapConstants.hpp similarity index 98% rename from LiteLoader/Header/MC/MapConstants.hpp rename to LiteLoader/include/llapi/mc/MapConstants.hpp index a340da5..c75aef6 100644 --- a/LiteLoader/Header/MC/MapConstants.hpp +++ b/LiteLoader/include/llapi/mc/MapConstants.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapCreateLockedCopyPacket.hpp b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/MapCreateLockedCopyPacket.hpp rename to LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp index 9687640..81e1ed6 100644 --- a/LiteLoader/Header/MC/MapCreateLockedCopyPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapDecoration.hpp b/LiteLoader/include/llapi/mc/MapDecoration.hpp similarity index 95% rename from LiteLoader/Header/MC/MapDecoration.hpp rename to LiteLoader/include/llapi/mc/MapDecoration.hpp index 98d3c5c..5cfcf70 100644 --- a/LiteLoader/Header/MC/MapDecoration.hpp +++ b/LiteLoader/include/llapi/mc/MapDecoration.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapExtendingRecipe.hpp b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/MapExtendingRecipe.hpp rename to LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp index 34d66c7..878ec43 100644 --- a/LiteLoader/Header/MC/MapExtendingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/MapInfoRequestPacket.hpp rename to LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp index 244b677..ea1a2df 100644 --- a/LiteLoader/Header/MC/MapInfoRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapItem.hpp b/LiteLoader/include/llapi/mc/MapItem.hpp similarity index 99% rename from LiteLoader/Header/MC/MapItem.hpp rename to LiteLoader/include/llapi/mc/MapItem.hpp index 1ec5656..5d87c85 100644 --- a/LiteLoader/Header/MC/MapItem.hpp +++ b/LiteLoader/include/llapi/mc/MapItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MapItemSavedData.hpp" #include "Item.hpp" diff --git a/LiteLoader/Header/MC/MapItemSavedData.hpp b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp similarity index 98% rename from LiteLoader/Header/MC/MapItemSavedData.hpp rename to LiteLoader/include/llapi/mc/MapItemSavedData.hpp index 55fb4ad..b98f5a9 100644 --- a/LiteLoader/Header/MC/MapItemSavedData.hpp +++ b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MapDecoration.hpp" #include "MapItemTrackedActor.hpp" diff --git a/LiteLoader/Header/MC/MapItemTrackedActor.hpp b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp similarity index 96% rename from LiteLoader/Header/MC/MapItemTrackedActor.hpp rename to LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp index a4f68ad..7aca4a7 100644 --- a/LiteLoader/Header/MC/MapItemTrackedActor.hpp +++ b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapLockingRecipe.hpp b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/MapLockingRecipe.hpp rename to LiteLoader/include/llapi/mc/MapLockingRecipe.hpp index 2164f23..d3c4995 100644 --- a/LiteLoader/Header/MC/MapLockingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MapUpgradingRecipe.hpp b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/MapUpgradingRecipe.hpp rename to LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp index 2416efd..86adf49 100644 --- a/LiteLoader/Header/MC/MapUpgradingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MarkVariantDescription.hpp b/LiteLoader/include/llapi/mc/MarkVariantDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MarkVariantDescription.hpp rename to LiteLoader/include/llapi/mc/MarkVariantDescription.hpp index e607cdf..98bec3b 100644 --- a/LiteLoader/Header/MC/MarkVariantDescription.hpp +++ b/LiteLoader/include/llapi/mc/MarkVariantDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MarketplaceSkinValidator.hpp b/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp similarity index 95% rename from LiteLoader/Header/MC/MarketplaceSkinValidator.hpp rename to LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp index 6f133ae..3d73cdf 100644 --- a/LiteLoader/Header/MC/MarketplaceSkinValidator.hpp +++ b/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Material.hpp b/LiteLoader/include/llapi/mc/Material.hpp similarity index 96% rename from LiteLoader/Header/MC/Material.hpp rename to LiteLoader/include/llapi/mc/Material.hpp index 41cccb0..7fa4c07 100644 --- a/LiteLoader/Header/MC/Material.hpp +++ b/LiteLoader/include/llapi/mc/Material.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MaterialReducerContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/MaterialReducerContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp index 1cdfd36..458a050 100644 --- a/LiteLoader/Header/MC/MaterialReducerContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MeCommand.hpp b/LiteLoader/include/llapi/mc/MeCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/MeCommand.hpp rename to LiteLoader/include/llapi/mc/MeCommand.hpp index 3a534f1..65e7a40 100644 --- a/LiteLoader/Header/MC/MeCommand.hpp +++ b/LiteLoader/include/llapi/mc/MeCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MedicineItem.hpp b/LiteLoader/include/llapi/mc/MedicineItem.hpp similarity index 98% rename from LiteLoader/Header/MC/MedicineItem.hpp rename to LiteLoader/include/llapi/mc/MedicineItem.hpp index e189036..ef62eab 100644 --- a/LiteLoader/Header/MC/MedicineItem.hpp +++ b/LiteLoader/include/llapi/mc/MedicineItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MegaPineTreeCanopy.hpp b/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/MegaPineTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp index 2933e01..9831875 100644 --- a/LiteLoader/Header/MC/MegaPineTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MegaTreeCanopy.hpp b/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/MegaTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp index f8ed516..7e9ecfd 100644 --- a/LiteLoader/Header/MC/MegaTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MegaTreeTrunk.hpp b/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp similarity index 97% rename from LiteLoader/Header/MC/MegaTreeTrunk.hpp rename to LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp index c53ea70..de5b118 100644 --- a/LiteLoader/Header/MC/MegaTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MeleeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/MeleeAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp index 6a21096..a7b6acc 100644 --- a/LiteLoader/Header/MC/MeleeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MeleeAttackGoal.hpp b/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MeleeAttackGoal.hpp rename to LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp index db3a06f..4be2c8c 100644 --- a/LiteLoader/Header/MC/MeleeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MeleeWeaponEnchant.hpp b/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp similarity index 97% rename from LiteLoader/Header/MC/MeleeWeaponEnchant.hpp rename to LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp index aa75ac9..c06ac14 100644 --- a/LiteLoader/Header/MC/MeleeWeaponEnchant.hpp +++ b/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MelonBlock.hpp b/LiteLoader/include/llapi/mc/MelonBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MelonBlock.hpp rename to LiteLoader/include/llapi/mc/MelonBlock.hpp index c2664a8..12288f3 100644 --- a/LiteLoader/Header/MC/MelonBlock.hpp +++ b/LiteLoader/include/llapi/mc/MelonBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MelonFeature.hpp b/LiteLoader/include/llapi/mc/MelonFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/MelonFeature.hpp rename to LiteLoader/include/llapi/mc/MelonFeature.hpp index fcd14ea..06f1169 100644 --- a/LiteLoader/Header/MC/MelonFeature.hpp +++ b/LiteLoader/include/llapi/mc/MelonFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MemoryMappedFileAccess.hpp b/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp similarity index 97% rename from LiteLoader/Header/MC/MemoryMappedFileAccess.hpp rename to LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp index d075f5a..0de7163 100644 --- a/LiteLoader/Header/MC/MemoryMappedFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MemorySecureStorage.hpp b/LiteLoader/include/llapi/mc/MemorySecureStorage.hpp similarity index 96% rename from LiteLoader/Header/MC/MemorySecureStorage.hpp rename to LiteLoader/include/llapi/mc/MemorySecureStorage.hpp index ca7222e..2528b62 100644 --- a/LiteLoader/Header/MC/MemorySecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/MemorySecureStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MendingEnchant.hpp b/LiteLoader/include/llapi/mc/MendingEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/MendingEnchant.hpp rename to LiteLoader/include/llapi/mc/MendingEnchant.hpp index 1d9a9db..e41e535 100644 --- a/LiteLoader/Header/MC/MendingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/MendingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MerchantRecipe.hpp b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp similarity index 96% rename from LiteLoader/Header/MC/MerchantRecipe.hpp rename to LiteLoader/include/llapi/mc/MerchantRecipe.hpp index 926f763..70bd34d 100644 --- a/LiteLoader/Header/MC/MerchantRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MerchantRecipeList.hpp b/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp similarity index 97% rename from LiteLoader/Header/MC/MerchantRecipeList.hpp rename to LiteLoader/include/llapi/mc/MerchantRecipeList.hpp index 41d825d..006012e 100644 --- a/LiteLoader/Header/MC/MerchantRecipeList.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MessagingCommand.hpp b/LiteLoader/include/llapi/mc/MessagingCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/MessagingCommand.hpp rename to LiteLoader/include/llapi/mc/MessagingCommand.hpp index e190be9..5d59012 100644 --- a/LiteLoader/Header/MC/MessagingCommand.hpp +++ b/LiteLoader/include/llapi/mc/MessagingCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MetalBlock.hpp b/LiteLoader/include/llapi/mc/MetalBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MetalBlock.hpp rename to LiteLoader/include/llapi/mc/MetalBlock.hpp index e2a13c2..15d2e7e 100644 --- a/LiteLoader/Header/MC/MetalBlock.hpp +++ b/LiteLoader/include/llapi/mc/MetalBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Minecart.hpp b/LiteLoader/include/llapi/mc/Minecart.hpp similarity index 99% rename from LiteLoader/Header/MC/Minecart.hpp rename to LiteLoader/include/llapi/mc/Minecart.hpp index 178a096..a00c852 100644 --- a/LiteLoader/Header/MC/Minecart.hpp +++ b/LiteLoader/include/llapi/mc/Minecart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecartBlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp similarity index 97% rename from LiteLoader/Header/MC/MinecartBlockCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp index ce4a6ed..0b32aba 100644 --- a/LiteLoader/Header/MC/MinecartBlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BlockCommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/MinecartChest.hpp b/LiteLoader/include/llapi/mc/MinecartChest.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartChest.hpp rename to LiteLoader/include/llapi/mc/MinecartChest.hpp index cd35549..caa1e66 100644 --- a/LiteLoader/Header/MC/MinecartChest.hpp +++ b/LiteLoader/include/llapi/mc/MinecartChest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Minecart.hpp" diff --git a/LiteLoader/Header/MC/MinecartCommandBlock.hpp b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartCommandBlock.hpp rename to LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp index 80beaa1..8b51f4e 100644 --- a/LiteLoader/Header/MC/MinecartCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Minecart.hpp" diff --git a/LiteLoader/Header/MC/MinecartHopper.hpp b/LiteLoader/include/llapi/mc/MinecartHopper.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartHopper.hpp rename to LiteLoader/include/llapi/mc/MinecartHopper.hpp index 2e0d669..238d03a 100644 --- a/LiteLoader/Header/MC/MinecartHopper.hpp +++ b/LiteLoader/include/llapi/mc/MinecartHopper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Minecart.hpp" diff --git a/LiteLoader/Header/MC/MinecartItem.hpp b/LiteLoader/include/llapi/mc/MinecartItem.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartItem.hpp rename to LiteLoader/include/llapi/mc/MinecartItem.hpp index 21d25d1..f0a4c41 100644 --- a/LiteLoader/Header/MC/MinecartItem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecartRideable.hpp b/LiteLoader/include/llapi/mc/MinecartRideable.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartRideable.hpp rename to LiteLoader/include/llapi/mc/MinecartRideable.hpp index fbbbbaf..aafe629 100644 --- a/LiteLoader/Header/MC/MinecartRideable.hpp +++ b/LiteLoader/include/llapi/mc/MinecartRideable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Minecart.hpp" diff --git a/LiteLoader/Header/MC/MinecartTNT.hpp b/LiteLoader/include/llapi/mc/MinecartTNT.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecartTNT.hpp rename to LiteLoader/include/llapi/mc/MinecartTNT.hpp index da2b5c6..93901c1 100644 --- a/LiteLoader/Header/MC/MinecartTNT.hpp +++ b/LiteLoader/include/llapi/mc/MinecartTNT.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Minecart.hpp" diff --git a/LiteLoader/Header/MC/Minecraft.hpp b/LiteLoader/include/llapi/mc/Minecraft.hpp similarity index 98% rename from LiteLoader/Header/MC/Minecraft.hpp rename to LiteLoader/include/llapi/mc/Minecraft.hpp index 6aeb51f..a54b823 100644 --- a/LiteLoader/Header/MC/Minecraft.hpp +++ b/LiteLoader/include/llapi/mc/Minecraft.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecraftCommands.hpp b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecraftCommands.hpp rename to LiteLoader/include/llapi/mc/MinecraftCommands.hpp index 31d8ed7..81b32b8 100644 --- a/LiteLoader/Header/MC/MinecraftCommands.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/MinecraftEventing.hpp b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp similarity index 99% rename from LiteLoader/Header/MC/MinecraftEventing.hpp rename to LiteLoader/include/llapi/mc/MinecraftEventing.hpp index b2439af..964e514 100644 --- a/LiteLoader/Header/MC/MinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "IMinecraftEventing.hpp" diff --git a/LiteLoader/Header/MC/MinecraftPackets.hpp b/LiteLoader/include/llapi/mc/MinecraftPackets.hpp similarity index 96% rename from LiteLoader/Header/MC/MinecraftPackets.hpp rename to LiteLoader/include/llapi/mc/MinecraftPackets.hpp index d1c6a23..107b656 100644 --- a/LiteLoader/Header/MC/MinecraftPackets.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftPackets.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecraftScheduler.hpp b/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp similarity index 95% rename from LiteLoader/Header/MC/MinecraftScheduler.hpp rename to LiteLoader/include/llapi/mc/MinecraftScheduler.hpp index 51576ad..e1d6f83 100644 --- a/LiteLoader/Header/MC/MinecraftScheduler.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecraftServerScriptEngine.hpp b/LiteLoader/include/llapi/mc/MinecraftServerScriptEngine.hpp similarity index 98% rename from LiteLoader/Header/MC/MinecraftServerScriptEngine.hpp rename to LiteLoader/include/llapi/mc/MinecraftServerScriptEngine.hpp index c320f81..2b23d73 100644 --- a/LiteLoader/Header/MC/MinecraftServerScriptEngine.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftServerScriptEngine.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MinecraftWorkerPool.hpp b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp similarity index 97% rename from LiteLoader/Header/MC/MinecraftWorkerPool.hpp rename to LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp index dcaa142..19d94bd 100644 --- a/LiteLoader/Header/MC/MinecraftWorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftCorridor.hpp b/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp similarity index 98% rename from LiteLoader/Header/MC/MineshaftCorridor.hpp rename to LiteLoader/include/llapi/mc/MineshaftCorridor.hpp index d8434d1..53b143f 100644 --- a/LiteLoader/Header/MC/MineshaftCorridor.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftCrossing.hpp b/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp similarity index 97% rename from LiteLoader/Header/MC/MineshaftCrossing.hpp rename to LiteLoader/include/llapi/mc/MineshaftCrossing.hpp index 52a46ba..9e45416 100644 --- a/LiteLoader/Header/MC/MineshaftCrossing.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftData.hpp b/LiteLoader/include/llapi/mc/MineshaftData.hpp similarity index 94% rename from LiteLoader/Header/MC/MineshaftData.hpp rename to LiteLoader/include/llapi/mc/MineshaftData.hpp index 1117420..a7f5f14 100644 --- a/LiteLoader/Header/MC/MineshaftData.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftFeature.hpp b/LiteLoader/include/llapi/mc/MineshaftFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/MineshaftFeature.hpp rename to LiteLoader/include/llapi/mc/MineshaftFeature.hpp index 8de87a1..7049a31 100644 --- a/LiteLoader/Header/MC/MineshaftFeature.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftPiece.hpp b/LiteLoader/include/llapi/mc/MineshaftPiece.hpp similarity index 97% rename from LiteLoader/Header/MC/MineshaftPiece.hpp rename to LiteLoader/include/llapi/mc/MineshaftPiece.hpp index 9c24e10..7b7ac73 100644 --- a/LiteLoader/Header/MC/MineshaftPiece.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftRoom.hpp b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp similarity index 97% rename from LiteLoader/Header/MC/MineshaftRoom.hpp rename to LiteLoader/include/llapi/mc/MineshaftRoom.hpp index ee9d554..be24f57 100644 --- a/LiteLoader/Header/MC/MineshaftRoom.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftStairs.hpp b/LiteLoader/include/llapi/mc/MineshaftStairs.hpp similarity index 96% rename from LiteLoader/Header/MC/MineshaftStairs.hpp rename to LiteLoader/include/llapi/mc/MineshaftStairs.hpp index b5a6f12..3251c95 100644 --- a/LiteLoader/Header/MC/MineshaftStairs.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftStairs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MineshaftStart.hpp b/LiteLoader/include/llapi/mc/MineshaftStart.hpp similarity index 96% rename from LiteLoader/Header/MC/MineshaftStart.hpp rename to LiteLoader/include/llapi/mc/MineshaftStart.hpp index 8355976..20a362c 100644 --- a/LiteLoader/Header/MC/MineshaftStart.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MingleGoal.hpp b/LiteLoader/include/llapi/mc/MingleGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MingleGoal.hpp rename to LiteLoader/include/llapi/mc/MingleGoal.hpp index 2b7fad8..e252c55 100644 --- a/LiteLoader/Header/MC/MingleGoal.hpp +++ b/LiteLoader/include/llapi/mc/MingleGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveToPOIGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MissingTextureAtlasItem.hpp b/LiteLoader/include/llapi/mc/MissingTextureAtlasItem.hpp similarity index 91% rename from LiteLoader/Header/MC/MissingTextureAtlasItem.hpp rename to LiteLoader/include/llapi/mc/MissingTextureAtlasItem.hpp index f731ba1..e501c5f 100644 --- a/LiteLoader/Header/MC/MissingTextureAtlasItem.hpp +++ b/LiteLoader/include/llapi/mc/MissingTextureAtlasItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp similarity index 99% rename from LiteLoader/Header/MC/Mob.hpp rename to LiteLoader/include/llapi/mc/Mob.hpp index 441b95c..631885b 100644 --- a/LiteLoader/Header/MC/Mob.hpp +++ b/LiteLoader/include/llapi/mc/Mob.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobArmorEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/MobArmorEquipmentPacket.hpp rename to LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp index f2fd512..da471ee 100644 --- a/LiteLoader/Header/MC/MobArmorEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobDescriptor.hpp b/LiteLoader/include/llapi/mc/MobDescriptor.hpp similarity index 94% rename from LiteLoader/Header/MC/MobDescriptor.hpp rename to LiteLoader/include/llapi/mc/MobDescriptor.hpp index fbdda58..90be4cc 100644 --- a/LiteLoader/Header/MC/MobDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/MobDescriptor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffect.hpp b/LiteLoader/include/llapi/mc/MobEffect.hpp similarity index 99% rename from LiteLoader/Header/MC/MobEffect.hpp rename to LiteLoader/include/llapi/mc/MobEffect.hpp index 37d34e6..f017165 100644 --- a/LiteLoader/Header/MC/MobEffect.hpp +++ b/LiteLoader/include/llapi/mc/MobEffect.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "HashedString.hpp" diff --git a/LiteLoader/Header/MC/MobEffectChangeDescription.hpp b/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEffectChangeDescription.hpp rename to LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp index af1b2e9..da55ece 100644 --- a/LiteLoader/Header/MC/MobEffectChangeDescription.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffectComponent.hpp b/LiteLoader/include/llapi/mc/MobEffectComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/MobEffectComponent.hpp rename to LiteLoader/include/llapi/mc/MobEffectComponent.hpp index 628559f..883e93a 100644 --- a/LiteLoader/Header/MC/MobEffectComponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffectDefinition.hpp b/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEffectDefinition.hpp rename to LiteLoader/include/llapi/mc/MobEffectDefinition.hpp index 558195d..bf5293c 100644 --- a/LiteLoader/Header/MC/MobEffectDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp similarity index 97% rename from LiteLoader/Header/MC/MobEffectInstance.hpp rename to LiteLoader/include/llapi/mc/MobEffectInstance.hpp index 8682a76..a11db36 100644 --- a/LiteLoader/Header/MC/MobEffectInstance.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/MobEffectPacket.hpp b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEffectPacket.hpp rename to LiteLoader/include/llapi/mc/MobEffectPacket.hpp index 219a624..8a0a919 100644 --- a/LiteLoader/Header/MC/MobEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEffectSubcomponent.hpp rename to LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp index 7bd66d1..f7e2535 100644 --- a/LiteLoader/Header/MC/MobEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEffectSystem.hpp b/LiteLoader/include/llapi/mc/MobEffectSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEffectSystem.hpp rename to LiteLoader/include/llapi/mc/MobEffectSystem.hpp index c13c21b..e7eaa76 100644 --- a/LiteLoader/Header/MC/MobEffectSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/MobEquipmentPacket.hpp rename to LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp index 304af69..81d7b31 100644 --- a/LiteLoader/Header/MC/MobEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEvent.hpp b/LiteLoader/include/llapi/mc/MobEvent.hpp similarity index 94% rename from LiteLoader/Header/MC/MobEvent.hpp rename to LiteLoader/include/llapi/mc/MobEvent.hpp index 752b3cd..987bbec 100644 --- a/LiteLoader/Header/MC/MobEvent.hpp +++ b/LiteLoader/include/llapi/mc/MobEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEventCommand.hpp b/LiteLoader/include/llapi/mc/MobEventCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEventCommand.hpp rename to LiteLoader/include/llapi/mc/MobEventCommand.hpp index c2cfc96..5a7f2f4 100644 --- a/LiteLoader/Header/MC/MobEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/MobEventCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobEvents.hpp b/LiteLoader/include/llapi/mc/MobEvents.hpp similarity index 96% rename from LiteLoader/Header/MC/MobEvents.hpp rename to LiteLoader/include/llapi/mc/MobEvents.hpp index a96b4a1..7542cbe 100644 --- a/LiteLoader/Header/MC/MobEvents.hpp +++ b/LiteLoader/include/llapi/mc/MobEvents.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobPredicates.hpp b/LiteLoader/include/llapi/mc/MobPredicates.hpp similarity index 94% rename from LiteLoader/Header/MC/MobPredicates.hpp rename to LiteLoader/include/llapi/mc/MobPredicates.hpp index 3f1958f..254b41b 100644 --- a/LiteLoader/Header/MC/MobPredicates.hpp +++ b/LiteLoader/include/llapi/mc/MobPredicates.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnHerdInfo.hpp b/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/MobSpawnHerdInfo.hpp rename to LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp index da3461b..0c2a38d 100644 --- a/LiteLoader/Header/MC/MobSpawnHerdInfo.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnRules.hpp b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp similarity index 97% rename from LiteLoader/Header/MC/MobSpawnRules.hpp rename to LiteLoader/include/llapi/mc/MobSpawnRules.hpp index f5f42bf..bdc3e80 100644 --- a/LiteLoader/Header/MC/MobSpawnRules.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnerBlock.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/MobSpawnerBlock.hpp rename to LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp index dc98c5c..f71b5bb 100644 --- a/LiteLoader/Header/MC/MobSpawnerBlock.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnerBlockActor.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/MobSpawnerBlockActor.hpp rename to LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp index 0461759..6061218 100644 --- a/LiteLoader/Header/MC/MobSpawnerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnerData.hpp b/LiteLoader/include/llapi/mc/MobSpawnerData.hpp similarity index 95% rename from LiteLoader/Header/MC/MobSpawnerData.hpp rename to LiteLoader/include/llapi/mc/MobSpawnerData.hpp index 0c7d236..5887524 100644 --- a/LiteLoader/Header/MC/MobSpawnerData.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MobSpawnerPermutation.hpp b/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp similarity index 95% rename from LiteLoader/Header/MC/MobSpawnerPermutation.hpp rename to LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp index 9b4af3a..082b49d 100644 --- a/LiteLoader/Header/MC/MobSpawnerPermutation.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ModalFormRequestPacket.hpp b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ModalFormRequestPacket.hpp rename to LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp index 4c4c5f3..03e290a 100644 --- a/LiteLoader/Header/MC/ModalFormRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ModalFormResponsePacket.hpp b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ModalFormResponsePacket.hpp rename to LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp index 61b3d72..facf0fd 100644 --- a/LiteLoader/Header/MC/ModalFormResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangArrayVariable.hpp b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangArrayVariable.hpp rename to LiteLoader/include/llapi/mc/MolangArrayVariable.hpp index 80ef5a2..91a9cad 100644 --- a/LiteLoader/Header/MC/MolangArrayVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangDataDrivenGeometry.hpp b/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangDataDrivenGeometry.hpp rename to LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp index f5af340..085bbdc 100644 --- a/LiteLoader/Header/MC/MolangDataDrivenGeometry.hpp +++ b/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangEntityVariable.hpp b/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangEntityVariable.hpp rename to LiteLoader/include/llapi/mc/MolangEntityVariable.hpp index 60508c6..932a6ff 100644 --- a/LiteLoader/Header/MC/MolangEntityVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangGenericQueryFunction.hpp b/LiteLoader/include/llapi/mc/MolangGenericQueryFunction.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangGenericQueryFunction.hpp rename to LiteLoader/include/llapi/mc/MolangGenericQueryFunction.hpp index 8ff6244..8390cbd 100644 --- a/LiteLoader/Header/MC/MolangGenericQueryFunction.hpp +++ b/LiteLoader/include/llapi/mc/MolangGenericQueryFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangGenericQueryFunctionPtr.hpp b/LiteLoader/include/llapi/mc/MolangGenericQueryFunctionPtr.hpp similarity index 96% rename from LiteLoader/Header/MC/MolangGenericQueryFunctionPtr.hpp rename to LiteLoader/include/llapi/mc/MolangGenericQueryFunctionPtr.hpp index af1d027..adec0d8 100644 --- a/LiteLoader/Header/MC/MolangGenericQueryFunctionPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangGenericQueryFunctionPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangGeometryVariable.hpp b/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp similarity index 96% rename from LiteLoader/Header/MC/MolangGeometryVariable.hpp rename to LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp index e8ff5ec..175ef19 100644 --- a/LiteLoader/Header/MC/MolangGeometryVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangMaterialVariable.hpp b/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp similarity index 96% rename from LiteLoader/Header/MC/MolangMaterialVariable.hpp rename to LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp index 18dc05f..604cc6b 100644 --- a/LiteLoader/Header/MC/MolangMaterialVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangQueryFunction.hpp b/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangQueryFunction.hpp rename to LiteLoader/include/llapi/mc/MolangQueryFunction.hpp index d256479..e527f13 100644 --- a/LiteLoader/Header/MC/MolangQueryFunction.hpp +++ b/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangQueryFunctionPtr.hpp b/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp similarity index 96% rename from LiteLoader/Header/MC/MolangQueryFunctionPtr.hpp rename to LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp index 2cd3cee..5f60c4a 100644 --- a/LiteLoader/Header/MC/MolangQueryFunctionPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangScriptArg.hpp b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangScriptArg.hpp rename to LiteLoader/include/llapi/mc/MolangScriptArg.hpp index 2ac07ab..514638b 100644 --- a/LiteLoader/Header/MC/MolangScriptArg.hpp +++ b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangTempVariable.hpp b/LiteLoader/include/llapi/mc/MolangTempVariable.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangTempVariable.hpp rename to LiteLoader/include/llapi/mc/MolangTempVariable.hpp index a078a7f..0389a54 100644 --- a/LiteLoader/Header/MC/MolangTempVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangTempVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangTextureVariable.hpp b/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp similarity index 95% rename from LiteLoader/Header/MC/MolangTextureVariable.hpp rename to LiteLoader/include/llapi/mc/MolangTextureVariable.hpp index 75a6131..c7bafc9 100644 --- a/LiteLoader/Header/MC/MolangTextureVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MolangVariableMap.hpp b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp similarity index 97% rename from LiteLoader/Header/MC/MolangVariableMap.hpp rename to LiteLoader/include/llapi/mc/MolangVariableMap.hpp index 077db2d..698c777 100644 --- a/LiteLoader/Header/MC/MolangVariableMap.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Monster.hpp b/LiteLoader/include/llapi/mc/Monster.hpp similarity index 98% rename from LiteLoader/Header/MC/Monster.hpp rename to LiteLoader/include/llapi/mc/Monster.hpp index 31d704d..27c61e9 100644 --- a/LiteLoader/Header/MC/Monster.hpp +++ b/LiteLoader/include/llapi/mc/Monster.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/MonsterEggBlock.hpp b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MonsterEggBlock.hpp rename to LiteLoader/include/llapi/mc/MonsterEggBlock.hpp index 2203aa0..a4b8ae6 100644 --- a/LiteLoader/Header/MC/MonsterEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MonsterRoomFeature.hpp b/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/MonsterRoomFeature.hpp rename to LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp index 48fcdd3..c9186b7 100644 --- a/LiteLoader/Header/MC/MonsterRoomFeature.hpp +++ b/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MonumentBuilding.hpp b/LiteLoader/include/llapi/mc/MonumentBuilding.hpp similarity index 98% rename from LiteLoader/Header/MC/MonumentBuilding.hpp rename to LiteLoader/include/llapi/mc/MonumentBuilding.hpp index afd5c7f..3bf1a1c 100644 --- a/LiteLoader/Header/MC/MonumentBuilding.hpp +++ b/LiteLoader/include/llapi/mc/MonumentBuilding.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MonumentRoomFitter.hpp b/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp similarity index 95% rename from LiteLoader/Header/MC/MonumentRoomFitter.hpp rename to LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp index 53fb850..9e02550 100644 --- a/LiteLoader/Header/MC/MonumentRoomFitter.hpp +++ b/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MossStoneSelector.hpp b/LiteLoader/include/llapi/mc/MossStoneSelector.hpp similarity index 95% rename from LiteLoader/Header/MC/MossStoneSelector.hpp rename to LiteLoader/include/llapi/mc/MossStoneSelector.hpp index 9198ed7..a2034a5 100644 --- a/LiteLoader/Header/MC/MossStoneSelector.hpp +++ b/LiteLoader/include/llapi/mc/MossStoneSelector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Motive.hpp b/LiteLoader/include/llapi/mc/Motive.hpp similarity index 98% rename from LiteLoader/Header/MC/Motive.hpp rename to LiteLoader/include/llapi/mc/Motive.hpp index 7b38d19..fd9abb6 100644 --- a/LiteLoader/Header/MC/Motive.hpp +++ b/LiteLoader/include/llapi/mc/Motive.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MountPathingGoal.hpp b/LiteLoader/include/llapi/mc/MountPathingGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MountPathingGoal.hpp rename to LiteLoader/include/llapi/mc/MountPathingGoal.hpp index 3bd8910..cc9b20c 100644 --- a/LiteLoader/Header/MC/MountPathingGoal.hpp +++ b/LiteLoader/include/llapi/mc/MountPathingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MountTameableDefinition.hpp b/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/MountTameableDefinition.hpp rename to LiteLoader/include/llapi/mc/MountTameableDefinition.hpp index 1d59ffa..71f75ad 100644 --- a/LiteLoader/Header/MC/MountTameableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MountTamingComponent.hpp b/LiteLoader/include/llapi/mc/MountTamingComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/MountTamingComponent.hpp rename to LiteLoader/include/llapi/mc/MountTamingComponent.hpp index aff331a..bc2bcf9 100644 --- a/LiteLoader/Header/MC/MountTamingComponent.hpp +++ b/LiteLoader/include/llapi/mc/MountTamingComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MountTamingSystem.hpp b/LiteLoader/include/llapi/mc/MountTamingSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/MountTamingSystem.hpp rename to LiteLoader/include/llapi/mc/MountTamingSystem.hpp index a78ae24..96a21e1 100644 --- a/LiteLoader/Header/MC/MountTamingSystem.hpp +++ b/LiteLoader/include/llapi/mc/MountTamingSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveActorAbsoluteData.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveActorAbsoluteData.hpp rename to LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp index c3f3b5c..74136e9 100644 --- a/LiteLoader/Header/MC/MoveActorAbsoluteData.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveActorAbsolutePacket.hpp rename to LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp index 046c151..a5ec391 100644 --- a/LiteLoader/Header/MC/MoveActorAbsolutePacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveActorDeltaPacket.hpp b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveActorDeltaPacket.hpp rename to LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp index b9933bb..f4d7f85 100644 --- a/LiteLoader/Header/MC/MoveActorDeltaPacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControl.hpp b/LiteLoader/include/llapi/mc/MoveControl.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveControl.hpp rename to LiteLoader/include/llapi/mc/MoveControl.hpp index 1145390..4c1a538 100644 --- a/LiteLoader/Header/MC/MoveControl.hpp +++ b/LiteLoader/include/llapi/mc/MoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlBasicDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlBasicDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp index a5227bb..cfa53c3 100644 --- a/LiteLoader/Header/MC/MoveControlBasicDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlComponent.hpp b/LiteLoader/include/llapi/mc/MoveControlComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlComponent.hpp rename to LiteLoader/include/llapi/mc/MoveControlComponent.hpp index c754ed8..e1b7588 100644 --- a/LiteLoader/Header/MC/MoveControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlDescription.hpp index 3fc0b3e..dd7e8d5 100644 --- a/LiteLoader/Header/MC/MoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlDolphinDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlDolphinDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp index 2bdf1f3..8352a1a 100644 --- a/LiteLoader/Header/MC/MoveControlDolphinDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlFlyDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlFlyDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp index 47c6a6f..d23a166 100644 --- a/LiteLoader/Header/MC/MoveControlFlyDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlHoverDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlHoverDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp index 96b351d..9f82c01 100644 --- a/LiteLoader/Header/MC/MoveControlHoverDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlSkipDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlSkipDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp index 6e9e6a7..9990706 100644 --- a/LiteLoader/Header/MC/MoveControlSkipDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlSwayDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveControlSwayDescription.hpp rename to LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp index d962e91..cb619c5 100644 --- a/LiteLoader/Header/MC/MoveControlSwayDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveControlSystem.hpp b/LiteLoader/include/llapi/mc/MoveControlSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/MoveControlSystem.hpp rename to LiteLoader/include/llapi/mc/MoveControlSystem.hpp index 6c8821b..38d8da4 100644 --- a/LiteLoader/Header/MC/MoveControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveDefinition.hpp b/LiteLoader/include/llapi/mc/MoveDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveDefinition.hpp rename to LiteLoader/include/llapi/mc/MoveDefinition.hpp index ba8b9ee..988f783 100644 --- a/LiteLoader/Header/MC/MoveDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/MoveIndoorsGoal.hpp b/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveIndoorsGoal.hpp rename to LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp index 1884763..00293ec 100644 --- a/LiteLoader/Header/MC/MoveIndoorsGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveInput.hpp b/LiteLoader/include/llapi/mc/MoveInput.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveInput.hpp rename to LiteLoader/include/llapi/mc/MoveInput.hpp index b7b8e4b..3f93509 100644 --- a/LiteLoader/Header/MC/MoveInput.hpp +++ b/LiteLoader/include/llapi/mc/MoveInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveInputHandler.hpp b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveInputHandler.hpp rename to LiteLoader/include/llapi/mc/MoveInputHandler.hpp index bdb1967..3e49bfd 100644 --- a/LiteLoader/Header/MC/MoveInputHandler.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveNode.hpp b/LiteLoader/include/llapi/mc/MoveNode.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveNode.hpp rename to LiteLoader/include/llapi/mc/MoveNode.hpp index 72c2e7a..ac4c7f2 100644 --- a/LiteLoader/Header/MC/MoveNode.hpp +++ b/LiteLoader/include/llapi/mc/MoveNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/MovePlayerPacket.hpp rename to LiteLoader/include/llapi/mc/MovePlayerPacket.hpp index 2d95c6f..d45fc8e 100644 --- a/LiteLoader/Header/MC/MovePlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Player.hpp" #include "Packet.hpp" diff --git a/LiteLoader/Header/MC/MoveThroughVillageGoal.hpp b/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveThroughVillageGoal.hpp rename to LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp index edf00fc..2110e04 100644 --- a/LiteLoader/Header/MC/MoveThroughVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToBlockGoal.hpp b/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveToBlockGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp index bacbbe6..c68b156 100644 --- a/LiteLoader/Header/MC/MoveToBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToDefinition.hpp b/LiteLoader/include/llapi/mc/MoveToDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveToDefinition.hpp rename to LiteLoader/include/llapi/mc/MoveToDefinition.hpp index 0d1bc56..a65317b 100644 --- a/LiteLoader/Header/MC/MoveToDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveToDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/MoveToLandGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/MoveToLandGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToLandGoal.hpp index fd40263..e2c5015 100644 --- a/LiteLoader/Header/MC/MoveToLandGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToLavaGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/MoveToLavaGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp index 094c4e5..ac3fd0e 100644 --- a/LiteLoader/Header/MC/MoveToLavaGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToLiquidGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveToLiquidGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp index e938e21..3403842 100644 --- a/LiteLoader/Header/MC/MoveToLiquidGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToNode.hpp b/LiteLoader/include/llapi/mc/MoveToNode.hpp similarity index 95% rename from LiteLoader/Header/MC/MoveToNode.hpp rename to LiteLoader/include/llapi/mc/MoveToNode.hpp index 98d2eec..ecd17e1 100644 --- a/LiteLoader/Header/MC/MoveToNode.hpp +++ b/LiteLoader/include/llapi/mc/MoveToNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToPOIGoal.hpp b/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveToPOIGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp index 81c7993..b377c6c 100644 --- a/LiteLoader/Header/MC/MoveToPOIGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToRandomBlockGoal.hpp b/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveToRandomBlockGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp index b6e3f10..008f41d 100644 --- a/LiteLoader/Header/MC/MoveToRandomBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToVillageGoal.hpp b/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveToVillageGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp index 6e11572..91db95b 100644 --- a/LiteLoader/Header/MC/MoveToVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveToWaterGoal.hpp b/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/MoveToWaterGoal.hpp rename to LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp index 4c3af24..6a69015 100644 --- a/LiteLoader/Header/MC/MoveToWaterGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveTowardsRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/MoveTowardsRestrictionGoal.hpp rename to LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp index 6b02172..b09626e 100644 --- a/LiteLoader/Header/MC/MoveTowardsRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MoveTowardsTargetGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/MoveTowardsTargetGoal.hpp rename to LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp index 8147c1a..cb7aecf 100644 --- a/LiteLoader/Header/MC/MoveTowardsTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MovementInterpolator.hpp b/LiteLoader/include/llapi/mc/MovementInterpolator.hpp similarity index 95% rename from LiteLoader/Header/MC/MovementInterpolator.hpp rename to LiteLoader/include/llapi/mc/MovementInterpolator.hpp index 7106b78..99b6a55 100644 --- a/LiteLoader/Header/MC/MovementInterpolator.hpp +++ b/LiteLoader/include/llapi/mc/MovementInterpolator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MovingBlock.hpp b/LiteLoader/include/llapi/mc/MovingBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/MovingBlock.hpp rename to LiteLoader/include/llapi/mc/MovingBlock.hpp index ddc8bb4..edb340a 100644 --- a/LiteLoader/Header/MC/MovingBlock.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MovingBlockActor.hpp b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/MovingBlockActor.hpp rename to LiteLoader/include/llapi/mc/MovingBlockActor.hpp index 1313ec0..3e9069f 100644 --- a/LiteLoader/Header/MC/MovingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MultiRecipe.hpp b/LiteLoader/include/llapi/mc/MultiRecipe.hpp similarity index 96% rename from LiteLoader/Header/MC/MultiRecipe.hpp rename to LiteLoader/include/llapi/mc/MultiRecipe.hpp index c94eb94..43d54fc 100644 --- a/LiteLoader/Header/MC/MultiRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MultiRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MultiplayerSettingsPacket.hpp b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/MultiplayerSettingsPacket.hpp rename to LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp index f339fdc..69d8c0c 100644 --- a/LiteLoader/Header/MC/MultiplayerSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MultiplyValueAmplifier.hpp b/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp similarity index 95% rename from LiteLoader/Header/MC/MultiplyValueAmplifier.hpp rename to LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp index c51600b..ea2efb7 100644 --- a/LiteLoader/Header/MC/MultiplyValueAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MushroomBlock.hpp b/LiteLoader/include/llapi/mc/MushroomBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MushroomBlock.hpp rename to LiteLoader/include/llapi/mc/MushroomBlock.hpp index b92b81d..7e9b276 100644 --- a/LiteLoader/Header/MC/MushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/MushroomBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MushroomCow.hpp b/LiteLoader/include/llapi/mc/MushroomCow.hpp similarity index 98% rename from LiteLoader/Header/MC/MushroomCow.hpp rename to LiteLoader/include/llapi/mc/MushroomCow.hpp index 5aa217d..206f712 100644 --- a/LiteLoader/Header/MC/MushroomCow.hpp +++ b/LiteLoader/include/llapi/mc/MushroomCow.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/MusicBlockActor.hpp b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/MusicBlockActor.hpp rename to LiteLoader/include/llapi/mc/MusicBlockActor.hpp index 09393ef..604188f 100644 --- a/LiteLoader/Header/MC/MusicBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/MyceliumBlock.hpp b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/MyceliumBlock.hpp rename to LiteLoader/include/llapi/mc/MyceliumBlock.hpp index 6f32cfd..9182d68 100644 --- a/LiteLoader/Header/MC/MyceliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBBridgeCrossing.hpp b/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp similarity index 98% rename from LiteLoader/Header/MC/NBBridgeCrossing.hpp rename to LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp index c783f44..23778d1 100644 --- a/LiteLoader/Header/MC/NBBridgeCrossing.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBBridgeEndFiller.hpp b/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp similarity index 98% rename from LiteLoader/Header/MC/NBBridgeEndFiller.hpp rename to LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp index 9302e10..d48c77c 100644 --- a/LiteLoader/Header/MC/NBBridgeEndFiller.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBBridgeStraight.hpp b/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp similarity index 98% rename from LiteLoader/Header/MC/NBBridgeStraight.hpp rename to LiteLoader/include/llapi/mc/NBBridgeStraight.hpp index 5b8d129..5892d5d 100644 --- a/LiteLoader/Header/MC/NBBridgeStraight.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleCorridorStairsPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleCorridorStairsPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp index 72442e0..9d46bfc 100644 --- a/LiteLoader/Header/MC/NBCastleCorridorStairsPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleCorridorTBalconyPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleCorridorTBalconyPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp index 7cfdc03..8c23513 100644 --- a/LiteLoader/Header/MC/NBCastleCorridorTBalconyPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleEntrance.hpp b/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleEntrance.hpp rename to LiteLoader/include/llapi/mc/NBCastleEntrance.hpp index 02ab972..63e31c5 100644 --- a/LiteLoader/Header/MC/NBCastleEntrance.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleSmallCorridorCrossingPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleSmallCorridorCrossingPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp index 05080c2..dab8a2e 100644 --- a/LiteLoader/Header/MC/NBCastleSmallCorridorCrossingPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleSmallCorridorLeftTurnPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleSmallCorridorLeftTurnPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp index f692ebd..bce5424 100644 --- a/LiteLoader/Header/MC/NBCastleSmallCorridorLeftTurnPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleSmallCorridorPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleSmallCorridorPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp index 4cb2836..a913247 100644 --- a/LiteLoader/Header/MC/NBCastleSmallCorridorPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleSmallCorridorRightTurnPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleSmallCorridorRightTurnPiece.hpp rename to LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp index 07cd3c7..e59551c 100644 --- a/LiteLoader/Header/MC/NBCastleSmallCorridorRightTurnPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBCastleStalkRoom.hpp b/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp similarity index 98% rename from LiteLoader/Header/MC/NBCastleStalkRoom.hpp rename to LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp index 7f47493..30a4b54 100644 --- a/LiteLoader/Header/MC/NBCastleStalkRoom.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBMonsterThrone.hpp b/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp similarity index 98% rename from LiteLoader/Header/MC/NBMonsterThrone.hpp rename to LiteLoader/include/llapi/mc/NBMonsterThrone.hpp index 4e017a5..395b629 100644 --- a/LiteLoader/Header/MC/NBMonsterThrone.hpp +++ b/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBRoomCrossing.hpp b/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp similarity index 98% rename from LiteLoader/Header/MC/NBRoomCrossing.hpp rename to LiteLoader/include/llapi/mc/NBRoomCrossing.hpp index c9f9502..1382a7a 100644 --- a/LiteLoader/Header/MC/NBRoomCrossing.hpp +++ b/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBStairsRoom.hpp b/LiteLoader/include/llapi/mc/NBStairsRoom.hpp similarity index 98% rename from LiteLoader/Header/MC/NBStairsRoom.hpp rename to LiteLoader/include/llapi/mc/NBStairsRoom.hpp index 19a3fc8..437e8e7 100644 --- a/LiteLoader/Header/MC/NBStairsRoom.hpp +++ b/LiteLoader/include/llapi/mc/NBStairsRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NetherFortressPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NBStartPiece.hpp b/LiteLoader/include/llapi/mc/NBStartPiece.hpp similarity index 96% rename from LiteLoader/Header/MC/NBStartPiece.hpp rename to LiteLoader/include/llapi/mc/NBStartPiece.hpp index 6966829..72db37d 100644 --- a/LiteLoader/Header/MC/NBStartPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBStartPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NBBridgeCrossing.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NameAction.hpp b/LiteLoader/include/llapi/mc/NameAction.hpp similarity index 95% rename from LiteLoader/Header/MC/NameAction.hpp rename to LiteLoader/include/llapi/mc/NameAction.hpp index 63ec10d..9dc2b73 100644 --- a/LiteLoader/Header/MC/NameAction.hpp +++ b/LiteLoader/include/llapi/mc/NameAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NameableComponent.hpp b/LiteLoader/include/llapi/mc/NameableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/NameableComponent.hpp rename to LiteLoader/include/llapi/mc/NameableComponent.hpp index 16f2fb8..3d06373 100644 --- a/LiteLoader/Header/MC/NameableComponent.hpp +++ b/LiteLoader/include/llapi/mc/NameableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NameableDefinition.hpp b/LiteLoader/include/llapi/mc/NameableDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/NameableDefinition.hpp rename to LiteLoader/include/llapi/mc/NameableDefinition.hpp index 0b7711c..00829eb 100644 --- a/LiteLoader/Header/MC/NameableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/NameableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/NapGoal.hpp b/LiteLoader/include/llapi/mc/NapGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/NapGoal.hpp rename to LiteLoader/include/llapi/mc/NapGoal.hpp index 10d8b4f..dad4e74 100644 --- a/LiteLoader/Header/MC/NapGoal.hpp +++ b/LiteLoader/include/llapi/mc/NapGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationClimbDescription.hpp b/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationClimbDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp index 24dad7c..2143e7a 100644 --- a/LiteLoader/Header/MC/NavigationClimbDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationComponent.hpp rename to LiteLoader/include/llapi/mc/NavigationComponent.hpp index 7f027d2..d1b25b2 100644 --- a/LiteLoader/Header/MC/NavigationComponent.hpp +++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationDescription.hpp b/LiteLoader/include/llapi/mc/NavigationDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationDescription.hpp index 9eb60af..90f7997 100644 --- a/LiteLoader/Header/MC/NavigationDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationFloatDescription.hpp b/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationFloatDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp index 315fd08..d883345 100644 --- a/LiteLoader/Header/MC/NavigationFloatDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationFlyDescription.hpp b/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationFlyDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp index fdb4473..6fbdc83 100644 --- a/LiteLoader/Header/MC/NavigationFlyDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationGenericDescription.hpp b/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationGenericDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp index 223f52d..8e16d56 100644 --- a/LiteLoader/Header/MC/NavigationGenericDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationHoverDescription.hpp b/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationHoverDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp index 2b01f3f..2fc50bd 100644 --- a/LiteLoader/Header/MC/NavigationHoverDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationSwimDescription.hpp b/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationSwimDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp index 7386ba5..8884785 100644 --- a/LiteLoader/Header/MC/NavigationSwimDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationSystem.hpp b/LiteLoader/include/llapi/mc/NavigationSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/NavigationSystem.hpp rename to LiteLoader/include/llapi/mc/NavigationSystem.hpp index 9d659d7..2602a06 100644 --- a/LiteLoader/Header/MC/NavigationSystem.hpp +++ b/LiteLoader/include/llapi/mc/NavigationSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationUtility.hpp b/LiteLoader/include/llapi/mc/NavigationUtility.hpp similarity index 97% rename from LiteLoader/Header/MC/NavigationUtility.hpp rename to LiteLoader/include/llapi/mc/NavigationUtility.hpp index 7abab00..74acd1b 100644 --- a/LiteLoader/Header/MC/NavigationUtility.hpp +++ b/LiteLoader/include/llapi/mc/NavigationUtility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NavigationWalkDescription.hpp b/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/NavigationWalkDescription.hpp rename to LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp index fa3390d..26c0d37 100644 --- a/LiteLoader/Header/MC/NavigationWalkDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NbtIo.hpp b/LiteLoader/include/llapi/mc/NbtIo.hpp similarity index 95% rename from LiteLoader/Header/MC/NbtIo.hpp rename to LiteLoader/include/llapi/mc/NbtIo.hpp index a29431c..bca7b7e 100644 --- a/LiteLoader/Header/MC/NbtIo.hpp +++ b/LiteLoader/include/llapi/mc/NbtIo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NearestAttackableTargetDefinition.hpp b/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/NearestAttackableTargetDefinition.hpp rename to LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp index f8828ef..245fd68 100644 --- a/LiteLoader/Header/MC/NearestAttackableTargetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NearestAttackableTargetGoal.hpp b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/NearestAttackableTargetGoal.hpp rename to LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp index d73ebbd..02d52dc 100644 --- a/LiteLoader/Header/MC/NearestAttackableTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NearestPrioritizedAttackableTargetGoal.hpp b/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/NearestPrioritizedAttackableTargetGoal.hpp rename to LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp index 27351da..28f7fea 100644 --- a/LiteLoader/Header/MC/NearestPrioritizedAttackableTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "NearestAttackableTargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetEventCallback.hpp b/LiteLoader/include/llapi/mc/NetEventCallback.hpp similarity index 99% rename from LiteLoader/Header/MC/NetEventCallback.hpp rename to LiteLoader/include/llapi/mc/NetEventCallback.hpp index 06c96a7..c75be3c 100644 --- a/LiteLoader/Header/MC/NetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/NetEventCallback.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp similarity index 96% rename from LiteLoader/Header/MC/NetherBrightnessRamp.hpp rename to LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp index 804a229..6ae3463 100644 --- a/LiteLoader/Header/MC/NetherBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "DimensionBrightnessRamp.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherDimension.hpp b/LiteLoader/include/llapi/mc/NetherDimension.hpp similarity index 97% rename from LiteLoader/Header/MC/NetherDimension.hpp rename to LiteLoader/include/llapi/mc/NetherDimension.hpp index 015a816..050ba7c 100644 --- a/LiteLoader/Header/MC/NetherDimension.hpp +++ b/LiteLoader/include/llapi/mc/NetherDimension.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherFortressFeature.hpp b/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/NetherFortressFeature.hpp rename to LiteLoader/include/llapi/mc/NetherFortressFeature.hpp index f7651e4..509a839 100644 --- a/LiteLoader/Header/MC/NetherFortressFeature.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherFortressPiece.hpp b/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/NetherFortressPiece.hpp rename to LiteLoader/include/llapi/mc/NetherFortressPiece.hpp index 65e7ad6..e71dc6b 100644 --- a/LiteLoader/Header/MC/NetherFortressPiece.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherFortressStart.hpp b/LiteLoader/include/llapi/mc/NetherFortressStart.hpp similarity index 96% rename from LiteLoader/Header/MC/NetherFortressStart.hpp rename to LiteLoader/include/llapi/mc/NetherFortressStart.hpp index 971663a..7542882 100644 --- a/LiteLoader/Header/MC/NetherFortressStart.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherFossilFeature.hpp b/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/NetherFossilFeature.hpp rename to LiteLoader/include/llapi/mc/NetherFossilFeature.hpp index 962a6d5..1fee8de 100644 --- a/LiteLoader/Header/MC/NetherFossilFeature.hpp +++ b/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherFungusBlock.hpp b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/NetherFungusBlock.hpp rename to LiteLoader/include/llapi/mc/NetherFungusBlock.hpp index fc32281..bf78c70 100644 --- a/LiteLoader/Header/MC/NetherFungusBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherGenerator.hpp b/LiteLoader/include/llapi/mc/NetherGenerator.hpp similarity index 98% rename from LiteLoader/Header/MC/NetherGenerator.hpp rename to LiteLoader/include/llapi/mc/NetherGenerator.hpp index 12e3bc1..88407d9 100644 --- a/LiteLoader/Header/MC/NetherGenerator.hpp +++ b/LiteLoader/include/llapi/mc/NetherGenerator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherReactorBlock.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/NetherReactorBlock.hpp rename to LiteLoader/include/llapi/mc/NetherReactorBlock.hpp index ec32cc3..bdb9d28 100644 --- a/LiteLoader/Header/MC/NetherReactorBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherReactorBlockActor.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/NetherReactorBlockActor.hpp rename to LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp index 498de6e..f2796d8 100644 --- a/LiteLoader/Header/MC/NetherReactorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherSprouts.hpp b/LiteLoader/include/llapi/mc/NetherSprouts.hpp similarity index 99% rename from LiteLoader/Header/MC/NetherSprouts.hpp rename to LiteLoader/include/llapi/mc/NetherSprouts.hpp index 4426af7..20814cd 100644 --- a/LiteLoader/Header/MC/NetherSprouts.hpp +++ b/LiteLoader/include/llapi/mc/NetherSprouts.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherStructureFeatureHelper.hpp b/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp similarity index 93% rename from LiteLoader/Header/MC/NetherStructureFeatureHelper.hpp rename to LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp index 087cc22..78e979a 100644 --- a/LiteLoader/Header/MC/NetherStructureFeatureHelper.hpp +++ b/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherWartBlock.hpp b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/NetherWartBlock.hpp rename to LiteLoader/include/llapi/mc/NetherWartBlock.hpp index b9b53e7..d237a9f 100644 --- a/LiteLoader/Header/MC/NetherWartBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetheriteArmorEquippedListener.hpp b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp similarity index 98% rename from LiteLoader/Header/MC/NetheriteArmorEquippedListener.hpp rename to LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp index b62d140..5a038f2 100644 --- a/LiteLoader/Header/MC/NetheriteArmorEquippedListener.hpp +++ b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetherrackBlock.hpp b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/NetherrackBlock.hpp rename to LiteLoader/include/llapi/mc/NetherrackBlock.hpp index d8b7604..4e9e047 100644 --- a/LiteLoader/Header/MC/NetherrackBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkAddress.hpp b/LiteLoader/include/llapi/mc/NetworkAddress.hpp similarity index 95% rename from LiteLoader/Header/MC/NetworkAddress.hpp rename to LiteLoader/include/llapi/mc/NetworkAddress.hpp index 9900482..f339f15 100644 --- a/LiteLoader/Header/MC/NetworkAddress.hpp +++ b/LiteLoader/include/llapi/mc/NetworkAddress.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkChunkPublisher.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp similarity index 97% rename from LiteLoader/Header/MC/NetworkChunkPublisher.hpp rename to LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp index 97a102a..faf8c71 100644 --- a/LiteLoader/Header/MC/NetworkChunkPublisher.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkChunkPublisherUpdatePacket.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/NetworkChunkPublisherUpdatePacket.hpp rename to LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp index 61556a7..8ea9bfb 100644 --- a/LiteLoader/Header/MC/NetworkChunkPublisherUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkChunkSource.hpp b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp similarity index 98% rename from LiteLoader/Header/MC/NetworkChunkSource.hpp rename to LiteLoader/include/llapi/mc/NetworkChunkSource.hpp index 938a6a5..4e4f487 100644 --- a/LiteLoader/Header/MC/NetworkChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkDebugManager.hpp b/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp similarity index 95% rename from LiteLoader/Header/MC/NetworkDebugManager.hpp rename to LiteLoader/include/llapi/mc/NetworkDebugManager.hpp index fb881f4..5f538df 100644 --- a/LiteLoader/Header/MC/NetworkDebugManager.hpp +++ b/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkHandler.hpp b/LiteLoader/include/llapi/mc/NetworkHandler.hpp similarity index 99% rename from LiteLoader/Header/MC/NetworkHandler.hpp rename to LiteLoader/include/llapi/mc/NetworkHandler.hpp index 9d22567..804b39c 100644 --- a/LiteLoader/Header/MC/NetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/NetworkHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkIdentifier.hpp b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp similarity index 97% rename from LiteLoader/Header/MC/NetworkIdentifier.hpp rename to LiteLoader/include/llapi/mc/NetworkIdentifier.hpp index 181c487..eaca16d 100644 --- a/LiteLoader/Header/MC/NetworkIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "RakNet.hpp" diff --git a/LiteLoader/Header/MC/NetworkPacketEventListener.hpp b/LiteLoader/include/llapi/mc/NetworkPacketEventListener.hpp similarity index 96% rename from LiteLoader/Header/MC/NetworkPacketEventListener.hpp rename to LiteLoader/include/llapi/mc/NetworkPacketEventListener.hpp index 2f4f192..0b8ece6 100644 --- a/LiteLoader/Header/MC/NetworkPacketEventListener.hpp +++ b/LiteLoader/include/llapi/mc/NetworkPacketEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkPeer.hpp b/LiteLoader/include/llapi/mc/NetworkPeer.hpp similarity index 98% rename from LiteLoader/Header/MC/NetworkPeer.hpp rename to LiteLoader/include/llapi/mc/NetworkPeer.hpp index 13aabb8..82e67be 100644 --- a/LiteLoader/Header/MC/NetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/NetworkPeer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/NetworkSettingsPacket.hpp rename to LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp index 65fc628..428e694 100644 --- a/LiteLoader/Header/MC/NetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkStackLatencyPacket.hpp b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/NetworkStackLatencyPacket.hpp rename to LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp index 29b68b6..864f97f 100644 --- a/LiteLoader/Header/MC/NetworkStackLatencyPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NetworkStatistics.hpp b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp similarity index 95% rename from LiteLoader/Header/MC/NetworkStatistics.hpp rename to LiteLoader/include/llapi/mc/NetworkStatistics.hpp index 8dc3735..def13dc 100644 --- a/LiteLoader/Header/MC/NetworkStatistics.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NewLeafBlock.hpp b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/NewLeafBlock.hpp rename to LiteLoader/include/llapi/mc/NewLeafBlock.hpp index 5521d8f..57cdf69 100644 --- a/LiteLoader/Header/MC/NewLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LeafBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NewLogBlock.hpp b/LiteLoader/include/llapi/mc/NewLogBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/NewLogBlock.hpp rename to LiteLoader/include/llapi/mc/NewLogBlock.hpp index 4fd4774..d3eeab8 100644 --- a/LiteLoader/Header/MC/NewLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLogBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NoSurfaceOreFeature.hpp b/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/NoSurfaceOreFeature.hpp rename to LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp index f45abe9..65ffa2b 100644 --- a/LiteLoader/Header/MC/NoSurfaceOreFeature.hpp +++ b/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NormalNoiseLayer.hpp b/LiteLoader/include/llapi/mc/NormalNoiseLayer.hpp similarity index 96% rename from LiteLoader/Header/MC/NormalNoiseLayer.hpp rename to LiteLoader/include/llapi/mc/NormalNoiseLayer.hpp index 7423007..fe152da 100644 --- a/LiteLoader/Header/MC/NormalNoiseLayer.hpp +++ b/LiteLoader/include/llapi/mc/NormalNoiseLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NoteBlock.hpp b/LiteLoader/include/llapi/mc/NoteBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/NoteBlock.hpp rename to LiteLoader/include/llapi/mc/NoteBlock.hpp index f1df956..325857a 100644 --- a/LiteLoader/Header/MC/NoteBlock.hpp +++ b/LiteLoader/include/llapi/mc/NoteBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Npc.hpp b/LiteLoader/include/llapi/mc/Npc.hpp similarity index 98% rename from LiteLoader/Header/MC/Npc.hpp rename to LiteLoader/include/llapi/mc/Npc.hpp index 9d6a885..7b076a1 100644 --- a/LiteLoader/Header/MC/Npc.hpp +++ b/LiteLoader/include/llapi/mc/Npc.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/NpcAction.hpp b/LiteLoader/include/llapi/mc/NpcAction.hpp similarity index 97% rename from LiteLoader/Header/MC/NpcAction.hpp rename to LiteLoader/include/llapi/mc/NpcAction.hpp index edc191e..5582bdb 100644 --- a/LiteLoader/Header/MC/NpcAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcCommandAction.hpp b/LiteLoader/include/llapi/mc/NpcCommandAction.hpp similarity index 96% rename from LiteLoader/Header/MC/NpcCommandAction.hpp rename to LiteLoader/include/llapi/mc/NpcCommandAction.hpp index a791d9e..7cedbd7 100644 --- a/LiteLoader/Header/MC/NpcCommandAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcCommandAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcComponent.hpp b/LiteLoader/include/llapi/mc/NpcComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/NpcComponent.hpp rename to LiteLoader/include/llapi/mc/NpcComponent.hpp index fc8e803..a39fbc9 100644 --- a/LiteLoader/Header/MC/NpcComponent.hpp +++ b/LiteLoader/include/llapi/mc/NpcComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcGUIOffset.hpp b/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp similarity index 95% rename from LiteLoader/Header/MC/NpcGUIOffset.hpp rename to LiteLoader/include/llapi/mc/NpcGUIOffset.hpp index 8f8a257..e3e3ff8 100644 --- a/LiteLoader/Header/MC/NpcGUIOffset.hpp +++ b/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcI18nObserver.hpp b/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp similarity index 96% rename from LiteLoader/Header/MC/NpcI18nObserver.hpp rename to LiteLoader/include/llapi/mc/NpcI18nObserver.hpp index d0a4e69..dca9243 100644 --- a/LiteLoader/Header/MC/NpcI18nObserver.hpp +++ b/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcRequestPacket.hpp b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/NpcRequestPacket.hpp rename to LiteLoader/include/llapi/mc/NpcRequestPacket.hpp index 1e79aeb..0401edf 100644 --- a/LiteLoader/Header/MC/NpcRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NpcUrlAction.hpp b/LiteLoader/include/llapi/mc/NpcUrlAction.hpp similarity index 95% rename from LiteLoader/Header/MC/NpcUrlAction.hpp rename to LiteLoader/include/llapi/mc/NpcUrlAction.hpp index 7a8d5c4..b5695d7 100644 --- a/LiteLoader/Header/MC/NpcUrlAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcUrlAction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NullLogger.hpp b/LiteLoader/include/llapi/mc/NullLogger.hpp similarity index 95% rename from LiteLoader/Header/MC/NullLogger.hpp rename to LiteLoader/include/llapi/mc/NullLogger.hpp index ab7fc80..a046ec3 100644 --- a/LiteLoader/Header/MC/NullLogger.hpp +++ b/LiteLoader/include/llapi/mc/NullLogger.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NullSecureStorage.hpp b/LiteLoader/include/llapi/mc/NullSecureStorage.hpp similarity index 96% rename from LiteLoader/Header/MC/NullSecureStorage.hpp rename to LiteLoader/include/llapi/mc/NullSecureStorage.hpp index fdbc9ec..90b66d4 100644 --- a/LiteLoader/Header/MC/NullSecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/NullSecureStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NullSoundPlayer.hpp b/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp similarity index 98% rename from LiteLoader/Header/MC/NullSoundPlayer.hpp rename to LiteLoader/include/llapi/mc/NullSoundPlayer.hpp index 395fe6d..f368796 100644 --- a/LiteLoader/Header/MC/NullSoundPlayer.hpp +++ b/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/NyliumBlock.hpp b/LiteLoader/include/llapi/mc/NyliumBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/NyliumBlock.hpp rename to LiteLoader/include/llapi/mc/NyliumBlock.hpp index 64da25a..a40cb44 100644 --- a/LiteLoader/Header/MC/NyliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/NyliumBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OSInformation.hpp b/LiteLoader/include/llapi/mc/OSInformation.hpp similarity index 94% rename from LiteLoader/Header/MC/OSInformation.hpp rename to LiteLoader/include/llapi/mc/OSInformation.hpp index 537b62a..a6efc8b 100644 --- a/LiteLoader/Header/MC/OSInformation.hpp +++ b/LiteLoader/include/llapi/mc/OSInformation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Objective.hpp b/LiteLoader/include/llapi/mc/Objective.hpp similarity index 96% rename from LiteLoader/Header/MC/Objective.hpp rename to LiteLoader/include/llapi/mc/Objective.hpp index d8a73db..45aa346 100644 --- a/LiteLoader/Header/MC/Objective.hpp +++ b/LiteLoader/include/llapi/mc/Objective.hpp @@ -1,10 +1,10 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA - +#include #undef BEFORE_EXTRA class Objective { diff --git a/LiteLoader/Header/MC/ObjectiveCriteria.hpp b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp similarity index 95% rename from LiteLoader/Header/MC/ObjectiveCriteria.hpp rename to LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp index 3ce357e..30ad319 100644 --- a/LiteLoader/Header/MC/ObjectiveCriteria.hpp +++ b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ObserverBlock.hpp b/LiteLoader/include/llapi/mc/ObserverBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ObserverBlock.hpp rename to LiteLoader/include/llapi/mc/ObserverBlock.hpp index 7347325..8e03f68 100644 --- a/LiteLoader/Header/MC/ObserverBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObserverBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ObsidianBlock.hpp b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/ObsidianBlock.hpp rename to LiteLoader/include/llapi/mc/ObsidianBlock.hpp index 13f1af3..641fcc8 100644 --- a/LiteLoader/Header/MC/ObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMixerLayer.hpp b/LiteLoader/include/llapi/mc/OceanMixerLayer.hpp similarity index 97% rename from LiteLoader/Header/MC/OceanMixerLayer.hpp rename to LiteLoader/include/llapi/mc/OceanMixerLayer.hpp index 3620e7f..ec00c37 100644 --- a/LiteLoader/Header/MC/OceanMixerLayer.hpp +++ b/LiteLoader/include/llapi/mc/OceanMixerLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentCoreRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentCoreRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp index 8b55394..f96f288 100644 --- a/LiteLoader/Header/MC/OceanMonumentCoreRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentDoubleXRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentDoubleXRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp index a51d35f..e056082 100644 --- a/LiteLoader/Header/MC/OceanMonumentDoubleXRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentDoubleXYRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentDoubleXYRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp index 1baacbd..d678132 100644 --- a/LiteLoader/Header/MC/OceanMonumentDoubleXYRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentDoubleYRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentDoubleYRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp index 4ad1429..3e18602 100644 --- a/LiteLoader/Header/MC/OceanMonumentDoubleYRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentDoubleYZRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentDoubleYZRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp index d47db54..8647449 100644 --- a/LiteLoader/Header/MC/OceanMonumentDoubleYZRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentDoubleZRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentDoubleZRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp index 8f2df80..f078c6c 100644 --- a/LiteLoader/Header/MC/OceanMonumentDoubleZRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentEntryRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentEntryRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp index 79aa60f..d0c7923 100644 --- a/LiteLoader/Header/MC/OceanMonumentEntryRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentFeature.hpp b/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/OceanMonumentFeature.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp index aa392d1..c9f942f 100644 --- a/LiteLoader/Header/MC/OceanMonumentFeature.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentPenthouse.hpp b/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp similarity index 97% rename from LiteLoader/Header/MC/OceanMonumentPenthouse.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp index c2a1c82..aa5b2cb 100644 --- a/LiteLoader/Header/MC/OceanMonumentPenthouse.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentPiece.hpp b/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/OceanMonumentPiece.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp index 0d6cac5..1e53529 100644 --- a/LiteLoader/Header/MC/OceanMonumentPiece.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentSimpleRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentSimpleRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp index 4b2a01f..2556262 100644 --- a/LiteLoader/Header/MC/OceanMonumentSimpleRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentSimpleTopRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentSimpleTopRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp index 6a08c0c..fc37ca1 100644 --- a/LiteLoader/Header/MC/OceanMonumentSimpleTopRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentStart.hpp b/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanMonumentStart.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentStart.hpp index 5440300..d3ac2de 100644 --- a/LiteLoader/Header/MC/OceanMonumentStart.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanMonumentWingRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp similarity index 97% rename from LiteLoader/Header/MC/OceanMonumentWingRoom.hpp rename to LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp index be32983..202e6f3 100644 --- a/LiteLoader/Header/MC/OceanMonumentWingRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "OceanMonumentPiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanRuinFeature.hpp b/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/OceanRuinFeature.hpp rename to LiteLoader/include/llapi/mc/OceanRuinFeature.hpp index 745ddcd..a87b4da 100644 --- a/LiteLoader/Header/MC/OceanRuinFeature.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanRuinPieces.hpp b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp similarity index 98% rename from LiteLoader/Header/MC/OceanRuinPieces.hpp rename to LiteLoader/include/llapi/mc/OceanRuinPieces.hpp index de5f717..3adcfda 100644 --- a/LiteLoader/Header/MC/OceanRuinPieces.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OceanRuinStart.hpp b/LiteLoader/include/llapi/mc/OceanRuinStart.hpp similarity index 96% rename from LiteLoader/Header/MC/OceanRuinStart.hpp rename to LiteLoader/include/llapi/mc/OceanRuinStart.hpp index 63ce243..1386e86 100644 --- a/LiteLoader/Header/MC/OceanRuinStart.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Ocelot.hpp b/LiteLoader/include/llapi/mc/Ocelot.hpp similarity index 98% rename from LiteLoader/Header/MC/Ocelot.hpp rename to LiteLoader/include/llapi/mc/Ocelot.hpp index 0cc85f4..126bc73 100644 --- a/LiteLoader/Header/MC/Ocelot.hpp +++ b/LiteLoader/include/llapi/mc/Ocelot.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/OcelotAttackDefinition.hpp b/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/OcelotAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp index e07f113..c33a563 100644 --- a/LiteLoader/Header/MC/OcelotAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OcelotAttackGoal.hpp b/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/OcelotAttackGoal.hpp rename to LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp index d1a96dc..5ee39ca 100644 --- a/LiteLoader/Header/MC/OcelotAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OcelotSitOnBlockGoal.hpp b/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/OcelotSitOnBlockGoal.hpp rename to LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp index bba23c1..d16795f 100644 --- a/LiteLoader/Header/MC/OcelotSitOnBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OculusPlatformMessagePump.hpp b/LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp similarity index 95% rename from LiteLoader/Header/MC/OculusPlatformMessagePump.hpp rename to LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp index d0d029a..33e9aca 100644 --- a/LiteLoader/Header/MC/OculusPlatformMessagePump.hpp +++ b/LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OfferFlowerGoal.hpp b/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/OfferFlowerGoal.hpp rename to LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp index 51bfbc6..612ce25 100644 --- a/LiteLoader/Header/MC/OfferFlowerGoal.hpp +++ b/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OldLeafBlock.hpp b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/OldLeafBlock.hpp rename to LiteLoader/include/llapi/mc/OldLeafBlock.hpp index 18ef347..b80a82d 100644 --- a/LiteLoader/Header/MC/OldLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LeafBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OldLogBlock.hpp b/LiteLoader/include/llapi/mc/OldLogBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/OldLogBlock.hpp rename to LiteLoader/include/llapi/mc/OldLogBlock.hpp index 38df93b..3cb9731 100644 --- a/LiteLoader/Header/MC/OldLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLogBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnDeathDescription.hpp b/LiteLoader/include/llapi/mc/OnDeathDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnDeathDescription.hpp rename to LiteLoader/include/llapi/mc/OnDeathDescription.hpp index 67899e5..c945ad9 100644 --- a/LiteLoader/Header/MC/OnDeathDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnDeathDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnFriendlyAngerDescription.hpp b/LiteLoader/include/llapi/mc/OnFriendlyAngerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnFriendlyAngerDescription.hpp rename to LiteLoader/include/llapi/mc/OnFriendlyAngerDescription.hpp index c09585b..fb37d0a 100644 --- a/LiteLoader/Header/MC/OnFriendlyAngerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnFriendlyAngerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp similarity index 95% rename from LiteLoader/Header/MC/OnHitSubcomponent.hpp rename to LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp index 6a234c0..ace3e53 100644 --- a/LiteLoader/Header/MC/OnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnHurtByPlayerDescription.hpp b/LiteLoader/include/llapi/mc/OnHurtByPlayerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnHurtByPlayerDescription.hpp rename to LiteLoader/include/llapi/mc/OnHurtByPlayerDescription.hpp index f51898a..aa1b0a4 100644 --- a/LiteLoader/Header/MC/OnHurtByPlayerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnHurtByPlayerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnHurtDescription.hpp b/LiteLoader/include/llapi/mc/OnHurtDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnHurtDescription.hpp rename to LiteLoader/include/llapi/mc/OnHurtDescription.hpp index 71e9512..bc9a2ee 100644 --- a/LiteLoader/Header/MC/OnHurtDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnHurtDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnIgniteDescription.hpp b/LiteLoader/include/llapi/mc/OnIgniteDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnIgniteDescription.hpp rename to LiteLoader/include/llapi/mc/OnIgniteDescription.hpp index 1ab0d5c..47d114d 100644 --- a/LiteLoader/Header/MC/OnIgniteDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnIgniteDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnScreenTextureAnimationPacket.hpp b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/OnScreenTextureAnimationPacket.hpp rename to LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp index ac51784..4d0d8d6 100644 --- a/LiteLoader/Header/MC/OnScreenTextureAnimationPacket.hpp +++ b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnStartLandingDescription.hpp b/LiteLoader/include/llapi/mc/OnStartLandingDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnStartLandingDescription.hpp rename to LiteLoader/include/llapi/mc/OnStartLandingDescription.hpp index b19be07..bc501d5 100644 --- a/LiteLoader/Header/MC/OnStartLandingDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStartLandingDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnStartTakeoffDescription.hpp b/LiteLoader/include/llapi/mc/OnStartTakeoffDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnStartTakeoffDescription.hpp rename to LiteLoader/include/llapi/mc/OnStartTakeoffDescription.hpp index 1eb2d36..4a4be9e 100644 --- a/LiteLoader/Header/MC/OnStartTakeoffDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStartTakeoffDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnTargetAcquiredDescription.hpp b/LiteLoader/include/llapi/mc/OnTargetAcquiredDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnTargetAcquiredDescription.hpp rename to LiteLoader/include/llapi/mc/OnTargetAcquiredDescription.hpp index f93bf12..83a98da 100644 --- a/LiteLoader/Header/MC/OnTargetAcquiredDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnTargetAcquiredDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnTargetEscapeDescription.hpp b/LiteLoader/include/llapi/mc/OnTargetEscapeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnTargetEscapeDescription.hpp rename to LiteLoader/include/llapi/mc/OnTargetEscapeDescription.hpp index 594fd4c..195495a 100644 --- a/LiteLoader/Header/MC/OnTargetEscapeDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnTargetEscapeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OnWakeWithOwnerDescription.hpp b/LiteLoader/include/llapi/mc/OnWakeWithOwnerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OnWakeWithOwnerDescription.hpp rename to LiteLoader/include/llapi/mc/OnWakeWithOwnerDescription.hpp index 5877163..2579953 100644 --- a/LiteLoader/Header/MC/OnWakeWithOwnerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnWakeWithOwnerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OpCommand.hpp b/LiteLoader/include/llapi/mc/OpCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/OpCommand.hpp rename to LiteLoader/include/llapi/mc/OpCommand.hpp index ba2d32f..3e4e60a 100644 --- a/LiteLoader/Header/MC/OpCommand.hpp +++ b/LiteLoader/include/llapi/mc/OpCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OpenDoorAnnotationComponent.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/OpenDoorAnnotationComponent.hpp rename to LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp index d9f72db..723a982 100644 --- a/LiteLoader/Header/MC/OpenDoorAnnotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OpenDoorAnnotationDescription.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/OpenDoorAnnotationDescription.hpp rename to LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp index 4576caf..076de21 100644 --- a/LiteLoader/Header/MC/OpenDoorAnnotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OpenDoorAnnotationSystem.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/OpenDoorAnnotationSystem.hpp rename to LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp index 633db0c..c1064ca 100644 --- a/LiteLoader/Header/MC/OpenDoorAnnotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OpenDoorGoal.hpp b/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/OpenDoorGoal.hpp rename to LiteLoader/include/llapi/mc/OpenDoorGoal.hpp index ed925cd..32233a5 100644 --- a/LiteLoader/Header/MC/OpenDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Option.hpp b/LiteLoader/include/llapi/mc/Option.hpp similarity index 98% rename from LiteLoader/Header/MC/Option.hpp rename to LiteLoader/include/llapi/mc/Option.hpp index 3773f8b..fd34e5d 100644 --- a/LiteLoader/Header/MC/Option.hpp +++ b/LiteLoader/include/llapi/mc/Option.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OptionalString.hpp b/LiteLoader/include/llapi/mc/OptionalString.hpp similarity index 95% rename from LiteLoader/Header/MC/OptionalString.hpp rename to LiteLoader/include/llapi/mc/OptionalString.hpp index 5acc5b3..55c49de 100644 --- a/LiteLoader/Header/MC/OptionalString.hpp +++ b/LiteLoader/include/llapi/mc/OptionalString.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OreBlock.hpp b/LiteLoader/include/llapi/mc/OreBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/OreBlock.hpp rename to LiteLoader/include/llapi/mc/OreBlock.hpp index da0480c..914316f 100644 --- a/LiteLoader/Header/MC/OreBlock.hpp +++ b/LiteLoader/include/llapi/mc/OreBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OreFeature.hpp b/LiteLoader/include/llapi/mc/OreFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/OreFeature.hpp rename to LiteLoader/include/llapi/mc/OreFeature.hpp index 0d31c90..0b02f0b 100644 --- a/LiteLoader/Header/MC/OreFeature.hpp +++ b/LiteLoader/include/llapi/mc/OreFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OverworldBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp similarity index 96% rename from LiteLoader/Header/MC/OverworldBrightnessRamp.hpp rename to LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp index 8aabdff..4225bc9 100644 --- a/LiteLoader/Header/MC/OverworldBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "DimensionBrightnessRamp.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OverworldDimension.hpp b/LiteLoader/include/llapi/mc/OverworldDimension.hpp similarity index 97% rename from LiteLoader/Header/MC/OverworldDimension.hpp rename to LiteLoader/include/llapi/mc/OverworldDimension.hpp index 222a5d4..06d3479 100644 --- a/LiteLoader/Header/MC/OverworldDimension.hpp +++ b/LiteLoader/include/llapi/mc/OverworldDimension.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OverworldGenerator.hpp b/LiteLoader/include/llapi/mc/OverworldGenerator.hpp similarity index 98% rename from LiteLoader/Header/MC/OverworldGenerator.hpp rename to LiteLoader/include/llapi/mc/OverworldGenerator.hpp index 8d25728..968af45 100644 --- a/LiteLoader/Header/MC/OverworldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGenerator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OwnerHurtByTargetGoal.hpp b/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/OwnerHurtByTargetGoal.hpp rename to LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp index 0967544..58074fe 100644 --- a/LiteLoader/Header/MC/OwnerHurtByTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OwnerHurtTargetGoal.hpp b/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/OwnerHurtTargetGoal.hpp rename to LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp index 12192a7..804da8f 100644 --- a/LiteLoader/Header/MC/OwnerHurtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/OwnerStorageEntity.hpp b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp similarity index 97% rename from LiteLoader/Header/MC/OwnerStorageEntity.hpp rename to LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp index cfa41ee..0ddffe2 100644 --- a/LiteLoader/Header/MC/OwnerStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/POIBlueprint.hpp b/LiteLoader/include/llapi/mc/POIBlueprint.hpp similarity index 95% rename from LiteLoader/Header/MC/POIBlueprint.hpp rename to LiteLoader/include/llapi/mc/POIBlueprint.hpp index 8dd3aad..375fea2 100644 --- a/LiteLoader/Header/MC/POIBlueprint.hpp +++ b/LiteLoader/include/llapi/mc/POIBlueprint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/POIInstance.hpp b/LiteLoader/include/llapi/mc/POIInstance.hpp similarity index 96% rename from LiteLoader/Header/MC/POIInstance.hpp rename to LiteLoader/include/llapi/mc/POIInstance.hpp index f814805..b6d7a55 100644 --- a/LiteLoader/Header/MC/POIInstance.hpp +++ b/LiteLoader/include/llapi/mc/POIInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Pack.hpp b/LiteLoader/include/llapi/mc/Pack.hpp similarity index 97% rename from LiteLoader/Header/MC/Pack.hpp rename to LiteLoader/include/llapi/mc/Pack.hpp index 86c850e..8ff0c28 100644 --- a/LiteLoader/Header/MC/Pack.hpp +++ b/LiteLoader/include/llapi/mc/Pack.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp similarity index 98% rename from LiteLoader/Header/MC/PackAccessStrategy.hpp rename to LiteLoader/include/llapi/mc/PackAccessStrategy.hpp index df103ad..9a066a5 100644 --- a/LiteLoader/Header/MC/PackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackAccessStrategyFactory.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp similarity index 97% rename from LiteLoader/Header/MC/PackAccessStrategyFactory.hpp rename to LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp index 55588c2..8da41c0 100644 --- a/LiteLoader/Header/MC/PackAccessStrategyFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackDependencyManager.hpp b/LiteLoader/include/llapi/mc/PackDependencyManager.hpp similarity index 92% rename from LiteLoader/Header/MC/PackDependencyManager.hpp rename to LiteLoader/include/llapi/mc/PackDependencyManager.hpp index d716c1f..897f8f6 100644 --- a/LiteLoader/Header/MC/PackDependencyManager.hpp +++ b/LiteLoader/include/llapi/mc/PackDependencyManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackDiscoveryError.hpp b/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp similarity index 97% rename from LiteLoader/Header/MC/PackDiscoveryError.hpp rename to LiteLoader/include/llapi/mc/PackDiscoveryError.hpp index a1d79b9..1156a9c 100644 --- a/LiteLoader/Header/MC/PackDiscoveryError.hpp +++ b/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PackError.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackError.hpp b/LiteLoader/include/llapi/mc/PackError.hpp similarity index 97% rename from LiteLoader/Header/MC/PackError.hpp rename to LiteLoader/include/llapi/mc/PackError.hpp index c097bc0..e3b167d 100644 --- a/LiteLoader/Header/MC/PackError.hpp +++ b/LiteLoader/include/llapi/mc/PackError.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackIdVersion.hpp b/LiteLoader/include/llapi/mc/PackIdVersion.hpp similarity index 96% rename from LiteLoader/Header/MC/PackIdVersion.hpp rename to LiteLoader/include/llapi/mc/PackIdVersion.hpp index 119f590..86048ab 100644 --- a/LiteLoader/Header/MC/PackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/PackIdVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp similarity index 96% rename from LiteLoader/Header/MC/PackInstance.hpp rename to LiteLoader/include/llapi/mc/PackInstance.hpp index 39c01db..5349af5 100644 --- a/LiteLoader/Header/MC/PackInstance.hpp +++ b/LiteLoader/include/llapi/mc/PackInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackInstanceId.hpp b/LiteLoader/include/llapi/mc/PackInstanceId.hpp similarity index 95% rename from LiteLoader/Header/MC/PackInstanceId.hpp rename to LiteLoader/include/llapi/mc/PackInstanceId.hpp index 94325fa..2dc7e3b 100644 --- a/LiteLoader/Header/MC/PackInstanceId.hpp +++ b/LiteLoader/include/llapi/mc/PackInstanceId.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackLoadError.hpp b/LiteLoader/include/llapi/mc/PackLoadError.hpp similarity index 97% rename from LiteLoader/Header/MC/PackLoadError.hpp rename to LiteLoader/include/llapi/mc/PackLoadError.hpp index 62d180a..7a7d034 100644 --- a/LiteLoader/Header/MC/PackLoadError.hpp +++ b/LiteLoader/include/llapi/mc/PackLoadError.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PackError.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackManifest.hpp b/LiteLoader/include/llapi/mc/PackManifest.hpp similarity index 98% rename from LiteLoader/Header/MC/PackManifest.hpp rename to LiteLoader/include/llapi/mc/PackManifest.hpp index 9decc8b..06ee0b0 100644 --- a/LiteLoader/Header/MC/PackManifest.hpp +++ b/LiteLoader/include/llapi/mc/PackManifest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackManifestFactory.hpp b/LiteLoader/include/llapi/mc/PackManifestFactory.hpp similarity index 98% rename from LiteLoader/Header/MC/PackManifestFactory.hpp rename to LiteLoader/include/llapi/mc/PackManifestFactory.hpp index 3de026b..178cd7e 100644 --- a/LiteLoader/Header/MC/PackManifestFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackManifestFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackReport.hpp b/LiteLoader/include/llapi/mc/PackReport.hpp similarity index 95% rename from LiteLoader/Header/MC/PackReport.hpp rename to LiteLoader/include/llapi/mc/PackReport.hpp index 4d16a49..61c012b 100644 --- a/LiteLoader/Header/MC/PackReport.hpp +++ b/LiteLoader/include/llapi/mc/PackReport.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSetting.hpp b/LiteLoader/include/llapi/mc/PackSetting.hpp similarity index 95% rename from LiteLoader/Header/MC/PackSetting.hpp rename to LiteLoader/include/llapi/mc/PackSetting.hpp index 78e3e1e..a8bcc4b 100644 --- a/LiteLoader/Header/MC/PackSetting.hpp +++ b/LiteLoader/include/llapi/mc/PackSetting.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSettings.hpp b/LiteLoader/include/llapi/mc/PackSettings.hpp similarity index 96% rename from LiteLoader/Header/MC/PackSettings.hpp rename to LiteLoader/include/llapi/mc/PackSettings.hpp index 0936323..f294014 100644 --- a/LiteLoader/Header/MC/PackSettings.hpp +++ b/LiteLoader/include/llapi/mc/PackSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSettingsError.hpp b/LiteLoader/include/llapi/mc/PackSettingsError.hpp similarity index 97% rename from LiteLoader/Header/MC/PackSettingsError.hpp rename to LiteLoader/include/llapi/mc/PackSettingsError.hpp index b444de9..1622086 100644 --- a/LiteLoader/Header/MC/PackSettingsError.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsError.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSettingsFactory.hpp b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp similarity index 96% rename from LiteLoader/Header/MC/PackSettingsFactory.hpp rename to LiteLoader/include/llapi/mc/PackSettingsFactory.hpp index ad9438b..45e93fb 100644 --- a/LiteLoader/Header/MC/PackSettingsFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSettingsJsonValidator.hpp b/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp similarity index 96% rename from LiteLoader/Header/MC/PackSettingsJsonValidator.hpp rename to LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp index ab42b7a..7aa6d7f 100644 --- a/LiteLoader/Header/MC/PackSettingsJsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonValidator.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSource.hpp b/LiteLoader/include/llapi/mc/PackSource.hpp similarity index 96% rename from LiteLoader/Header/MC/PackSource.hpp rename to LiteLoader/include/llapi/mc/PackSource.hpp index 5e31f1c..9408241 100644 --- a/LiteLoader/Header/MC/PackSource.hpp +++ b/LiteLoader/include/llapi/mc/PackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSourceFactory.hpp b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp similarity index 98% rename from LiteLoader/Header/MC/PackSourceFactory.hpp rename to LiteLoader/include/llapi/mc/PackSourceFactory.hpp index b560d80..b3e45f0 100644 --- a/LiteLoader/Header/MC/PackSourceFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackSourceReport.hpp b/LiteLoader/include/llapi/mc/PackSourceReport.hpp similarity index 95% rename from LiteLoader/Header/MC/PackSourceReport.hpp rename to LiteLoader/include/llapi/mc/PackSourceReport.hpp index 5f994ac..24fe984 100644 --- a/LiteLoader/Header/MC/PackSourceReport.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceReport.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PackUploadContent.hpp b/LiteLoader/include/llapi/mc/PackUploadContent.hpp similarity index 90% rename from LiteLoader/Header/MC/PackUploadContent.hpp rename to LiteLoader/include/llapi/mc/PackUploadContent.hpp index ea2ee2e..d80c26f 100644 --- a/LiteLoader/Header/MC/PackUploadContent.hpp +++ b/LiteLoader/include/llapi/mc/PackUploadContent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp similarity index 98% rename from LiteLoader/Header/MC/Packet.hpp rename to LiteLoader/include/llapi/mc/Packet.hpp index 33b8a62..d8bd2bb 100644 --- a/LiteLoader/Header/MC/Packet.hpp +++ b/LiteLoader/include/llapi/mc/Packet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/PacketSender.hpp b/LiteLoader/include/llapi/mc/PacketSender.hpp similarity index 94% rename from LiteLoader/Header/MC/PacketSender.hpp rename to LiteLoader/include/llapi/mc/PacketSender.hpp index bf08c2b..1840d38 100644 --- a/LiteLoader/Header/MC/PacketSender.hpp +++ b/LiteLoader/include/llapi/mc/PacketSender.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PacketViolationDetectedTelemetryData.hpp b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp similarity index 96% rename from LiteLoader/Header/MC/PacketViolationDetectedTelemetryData.hpp rename to LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp index 683cdaf..92491f6 100644 --- a/LiteLoader/Header/MC/PacketViolationDetectedTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Social.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PacketViolationHandler.hpp b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp similarity index 96% rename from LiteLoader/Header/MC/PacketViolationHandler.hpp rename to LiteLoader/include/llapi/mc/PacketViolationHandler.hpp index 1ae9d36..c56e983 100644 --- a/LiteLoader/Header/MC/PacketViolationHandler.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PacketViolationWarningPacket.hpp rename to LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp index 451e83e..1216c32 100644 --- a/LiteLoader/Header/MC/PacketViolationWarningPacket.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PageContent.hpp b/LiteLoader/include/llapi/mc/PageContent.hpp similarity index 96% rename from LiteLoader/Header/MC/PageContent.hpp rename to LiteLoader/include/llapi/mc/PageContent.hpp index d4566f1..e84e822 100644 --- a/LiteLoader/Header/MC/PageContent.hpp +++ b/LiteLoader/include/llapi/mc/PageContent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Painting.hpp b/LiteLoader/include/llapi/mc/Painting.hpp similarity index 98% rename from LiteLoader/Header/MC/Painting.hpp rename to LiteLoader/include/llapi/mc/Painting.hpp index d493a05..2b33771 100644 --- a/LiteLoader/Header/MC/Painting.hpp +++ b/LiteLoader/include/llapi/mc/Painting.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Palette.hpp b/LiteLoader/include/llapi/mc/Palette.hpp similarity index 97% rename from LiteLoader/Header/MC/Palette.hpp rename to LiteLoader/include/llapi/mc/Palette.hpp index 19175e2..6bb137f 100644 --- a/LiteLoader/Header/MC/Palette.hpp +++ b/LiteLoader/include/llapi/mc/Palette.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Panda.hpp b/LiteLoader/include/llapi/mc/Panda.hpp similarity index 98% rename from LiteLoader/Header/MC/Panda.hpp rename to LiteLoader/include/llapi/mc/Panda.hpp index 5e6ed13..5450844 100644 --- a/LiteLoader/Header/MC/Panda.hpp +++ b/LiteLoader/include/llapi/mc/Panda.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/PanicGoal.hpp b/LiteLoader/include/llapi/mc/PanicGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/PanicGoal.hpp rename to LiteLoader/include/llapi/mc/PanicGoal.hpp index 4a260f9..53a91c1 100644 --- a/LiteLoader/Header/MC/PanicGoal.hpp +++ b/LiteLoader/include/llapi/mc/PanicGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Parrot.hpp b/LiteLoader/include/llapi/mc/Parrot.hpp similarity index 98% rename from LiteLoader/Header/MC/Parrot.hpp rename to LiteLoader/include/llapi/mc/Parrot.hpp index b121d9b..7c9d42e 100644 --- a/LiteLoader/Header/MC/Parrot.hpp +++ b/LiteLoader/include/llapi/mc/Parrot.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/Parser.hpp b/LiteLoader/include/llapi/mc/Parser.hpp similarity index 99% rename from LiteLoader/Header/MC/Parser.hpp rename to LiteLoader/include/llapi/mc/Parser.hpp index 67c0f12..deab95d 100644 --- a/LiteLoader/Header/MC/Parser.hpp +++ b/LiteLoader/include/llapi/mc/Parser.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ParticleCommand.hpp b/LiteLoader/include/llapi/mc/ParticleCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ParticleCommand.hpp rename to LiteLoader/include/llapi/mc/ParticleCommand.hpp index 7a084fe..6545490 100644 --- a/LiteLoader/Header/MC/ParticleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ParticleCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ParticleOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ParticleOnHitSubcomponent.hpp rename to LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp index 432438f..2b3e82f 100644 --- a/LiteLoader/Header/MC/ParticleOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ParticleTypeMap.hpp b/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp similarity index 96% rename from LiteLoader/Header/MC/ParticleTypeMap.hpp rename to LiteLoader/include/llapi/mc/ParticleTypeMap.hpp index ce53b58..4b90016 100644 --- a/LiteLoader/Header/MC/ParticleTypeMap.hpp +++ b/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ParticlesBlockExplosionEvent.hpp b/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ParticlesBlockExplosionEvent.hpp rename to LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp index 18358fb..76349e3 100644 --- a/LiteLoader/Header/MC/ParticlesBlockExplosionEvent.hpp +++ b/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ParticlesTeleportTrailEvent.hpp b/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp similarity index 95% rename from LiteLoader/Header/MC/ParticlesTeleportTrailEvent.hpp rename to LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp index 3253be8..79c25a2 100644 --- a/LiteLoader/Header/MC/ParticlesTeleportTrailEvent.hpp +++ b/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Path.hpp b/LiteLoader/include/llapi/mc/Path.hpp similarity index 95% rename from LiteLoader/Header/MC/Path.hpp rename to LiteLoader/include/llapi/mc/Path.hpp index f86d538..6b7d92e 100644 --- a/LiteLoader/Header/MC/Path.hpp +++ b/LiteLoader/include/llapi/mc/Path.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PathFinder.hpp b/LiteLoader/include/llapi/mc/PathFinder.hpp similarity index 98% rename from LiteLoader/Header/MC/PathFinder.hpp rename to LiteLoader/include/llapi/mc/PathFinder.hpp index 8d4bf30..19c7671 100644 --- a/LiteLoader/Header/MC/PathFinder.hpp +++ b/LiteLoader/include/llapi/mc/PathFinder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PathNavigation.hpp b/LiteLoader/include/llapi/mc/PathNavigation.hpp similarity index 98% rename from LiteLoader/Header/MC/PathNavigation.hpp rename to LiteLoader/include/llapi/mc/PathNavigation.hpp index 182cfd2..995fc7b 100644 --- a/LiteLoader/Header/MC/PathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/PathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PauseScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/PauseScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp index c646339..df47314 100644 --- a/LiteLoader/Header/MC/PauseScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PeekSystem.hpp b/LiteLoader/include/llapi/mc/PeekSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/PeekSystem.hpp rename to LiteLoader/include/llapi/mc/PeekSystem.hpp index 46aca3a..c5a3770 100644 --- a/LiteLoader/Header/MC/PeekSystem.hpp +++ b/LiteLoader/include/llapi/mc/PeekSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PendingArea.hpp b/LiteLoader/include/llapi/mc/PendingArea.hpp similarity index 97% rename from LiteLoader/Header/MC/PendingArea.hpp rename to LiteLoader/include/llapi/mc/PendingArea.hpp index 7584bcc..4df8c57 100644 --- a/LiteLoader/Header/MC/PendingArea.hpp +++ b/LiteLoader/include/llapi/mc/PendingArea.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PerfContextTracker.hpp b/LiteLoader/include/llapi/mc/PerfContextTracker.hpp similarity index 95% rename from LiteLoader/Header/MC/PerfContextTracker.hpp rename to LiteLoader/include/llapi/mc/PerfContextTracker.hpp index e48e154..0cc0f0e 100644 --- a/LiteLoader/Header/MC/PerfContextTracker.hpp +++ b/LiteLoader/include/llapi/mc/PerfContextTracker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PerfContextTrackerReport.hpp b/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp similarity index 95% rename from LiteLoader/Header/MC/PerfContextTrackerReport.hpp rename to LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp index 8933cfd..56eb620 100644 --- a/LiteLoader/Header/MC/PerfContextTrackerReport.hpp +++ b/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PerfTimer.hpp b/LiteLoader/include/llapi/mc/PerfTimer.hpp similarity index 96% rename from LiteLoader/Header/MC/PerfTimer.hpp rename to LiteLoader/include/llapi/mc/PerfTimer.hpp index 07df1a7..ae6e447 100644 --- a/LiteLoader/Header/MC/PerfTimer.hpp +++ b/LiteLoader/include/llapi/mc/PerfTimer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #include "Core.hpp" diff --git a/LiteLoader/Header/MC/Performance.hpp b/LiteLoader/include/llapi/mc/Performance.hpp similarity index 94% rename from LiteLoader/Header/MC/Performance.hpp rename to LiteLoader/include/llapi/mc/Performance.hpp index 40a822c..4062a85 100644 --- a/LiteLoader/Header/MC/Performance.hpp +++ b/LiteLoader/include/llapi/mc/Performance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp similarity index 96% rename from LiteLoader/Header/MC/PerlinNoise.hpp rename to LiteLoader/include/llapi/mc/PerlinNoise.hpp index 09a3b17..b708573 100644 --- a/LiteLoader/Header/MC/PerlinNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinNoise.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp similarity index 96% rename from LiteLoader/Header/MC/PerlinSimplexNoise.hpp rename to LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp index 90e2f82..66f3094 100644 --- a/LiteLoader/Header/MC/PerlinSimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PermissionCommand.hpp b/LiteLoader/include/llapi/mc/PermissionCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/PermissionCommand.hpp rename to LiteLoader/include/llapi/mc/PermissionCommand.hpp index f284362..f69ab7e 100644 --- a/LiteLoader/Header/MC/PermissionCommand.hpp +++ b/LiteLoader/include/llapi/mc/PermissionCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PermissionsFile.hpp b/LiteLoader/include/llapi/mc/PermissionsFile.hpp similarity index 97% rename from LiteLoader/Header/MC/PermissionsFile.hpp rename to LiteLoader/include/llapi/mc/PermissionsFile.hpp index e3fe146..46a746a 100644 --- a/LiteLoader/Header/MC/PermissionsFile.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PermissionsHandler.hpp b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp similarity index 96% rename from LiteLoader/Header/MC/PermissionsHandler.hpp rename to LiteLoader/include/llapi/mc/PermissionsHandler.hpp index f8e4c45..6be0b0f 100644 --- a/LiteLoader/Header/MC/PermissionsHandler.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PersistentDescription.hpp b/LiteLoader/include/llapi/mc/PersistentDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/PersistentDescription.hpp rename to LiteLoader/include/llapi/mc/PersistentDescription.hpp index 80eea83..f6af6e5 100644 --- a/LiteLoader/Header/MC/PersistentDescription.hpp +++ b/LiteLoader/include/llapi/mc/PersistentDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PetSleepWithOwnerGoal.hpp b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/PetSleepWithOwnerGoal.hpp rename to LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp index cd99f5e..f52b08a 100644 --- a/LiteLoader/Header/MC/PetSleepWithOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PetSleepWithOwnerState.hpp b/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp similarity index 96% rename from LiteLoader/Header/MC/PetSleepWithOwnerState.hpp rename to LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp index 4599501..650b75f 100644 --- a/LiteLoader/Header/MC/PetSleepWithOwnerState.hpp +++ b/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Phantom.hpp b/LiteLoader/include/llapi/mc/Phantom.hpp similarity index 98% rename from LiteLoader/Header/MC/Phantom.hpp rename to LiteLoader/include/llapi/mc/Phantom.hpp index ab78f88..c1f0765 100644 --- a/LiteLoader/Header/MC/Phantom.hpp +++ b/LiteLoader/include/llapi/mc/Phantom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/PhotoStorage.hpp b/LiteLoader/include/llapi/mc/PhotoStorage.hpp similarity index 96% rename from LiteLoader/Header/MC/PhotoStorage.hpp rename to LiteLoader/include/llapi/mc/PhotoStorage.hpp index 76385fe..eaa5e89 100644 --- a/LiteLoader/Header/MC/PhotoStorage.hpp +++ b/LiteLoader/include/llapi/mc/PhotoStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PhotoTransferPacket.hpp b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PhotoTransferPacket.hpp rename to LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp index 7bc0b29..1d0c089 100644 --- a/LiteLoader/Header/MC/PhotoTransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PickaxeItem.hpp b/LiteLoader/include/llapi/mc/PickaxeItem.hpp similarity index 98% rename from LiteLoader/Header/MC/PickaxeItem.hpp rename to LiteLoader/include/llapi/mc/PickaxeItem.hpp index 3cbfe1e..66416fc 100644 --- a/LiteLoader/Header/MC/PickaxeItem.hpp +++ b/LiteLoader/include/llapi/mc/PickaxeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #include "DiggerItem.hpp" diff --git a/LiteLoader/Header/MC/PickupItemsGoal.hpp b/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/PickupItemsGoal.hpp rename to LiteLoader/include/llapi/mc/PickupItemsGoal.hpp index 1639b37..18b4af8 100644 --- a/LiteLoader/Header/MC/PickupItemsGoal.hpp +++ b/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PieceWeight.hpp b/LiteLoader/include/llapi/mc/PieceWeight.hpp similarity index 94% rename from LiteLoader/Header/MC/PieceWeight.hpp rename to LiteLoader/include/llapi/mc/PieceWeight.hpp index f19dee2..4a2a69d 100644 --- a/LiteLoader/Header/MC/PieceWeight.hpp +++ b/LiteLoader/include/llapi/mc/PieceWeight.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Pig.hpp b/LiteLoader/include/llapi/mc/Pig.hpp similarity index 98% rename from LiteLoader/Header/MC/Pig.hpp rename to LiteLoader/include/llapi/mc/Pig.hpp index 117bd65..7139160 100644 --- a/LiteLoader/Header/MC/Pig.hpp +++ b/LiteLoader/include/llapi/mc/Pig.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/PigZombie.hpp b/LiteLoader/include/llapi/mc/PigZombie.hpp similarity index 98% rename from LiteLoader/Header/MC/PigZombie.hpp rename to LiteLoader/include/llapi/mc/PigZombie.hpp index 3c045ad..ba74d42 100644 --- a/LiteLoader/Header/MC/PigZombie.hpp +++ b/LiteLoader/include/llapi/mc/PigZombie.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Zombie.hpp" diff --git a/LiteLoader/Header/MC/Piglin.hpp b/LiteLoader/include/llapi/mc/Piglin.hpp similarity index 98% rename from LiteLoader/Header/MC/Piglin.hpp rename to LiteLoader/include/llapi/mc/Piglin.hpp index f2be4c9..8593cfc 100644 --- a/LiteLoader/Header/MC/Piglin.hpp +++ b/LiteLoader/include/llapi/mc/Piglin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/Pillager.hpp b/LiteLoader/include/llapi/mc/Pillager.hpp similarity index 98% rename from LiteLoader/Header/MC/Pillager.hpp rename to LiteLoader/include/llapi/mc/Pillager.hpp index 7cb3d65..e68f514 100644 --- a/LiteLoader/Header/MC/Pillager.hpp +++ b/LiteLoader/include/llapi/mc/Pillager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/PillagerOutpostFeature.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/PillagerOutpostFeature.hpp rename to LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp index f0caabc..7815200 100644 --- a/LiteLoader/Header/MC/PillagerOutpostFeature.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PillagerOutpostPieces.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp similarity index 97% rename from LiteLoader/Header/MC/PillagerOutpostPieces.hpp rename to LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp index ba3ada1..f0783b0 100644 --- a/LiteLoader/Header/MC/PillagerOutpostPieces.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PillagerOutpostStart.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp similarity index 97% rename from LiteLoader/Header/MC/PillagerOutpostStart.hpp rename to LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp index fb818d6..0c93db2 100644 --- a/LiteLoader/Header/MC/PillagerOutpostStart.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PineTreeCanopy.hpp b/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/PineTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/PineTreeCanopy.hpp index a5b9455..4d84ea2 100644 --- a/LiteLoader/Header/MC/PineTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PingedCompatibleServer.hpp b/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp similarity index 96% rename from LiteLoader/Header/MC/PingedCompatibleServer.hpp rename to LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp index 9639e4a..5ee1f1c 100644 --- a/LiteLoader/Header/MC/PingedCompatibleServer.hpp +++ b/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PistonArmBlock.hpp b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/PistonArmBlock.hpp rename to LiteLoader/include/llapi/mc/PistonArmBlock.hpp index 694c2b4..ae9b7ed 100644 --- a/LiteLoader/Header/MC/PistonArmBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PistonBlock.hpp" #include "BlockLegacy.hpp" diff --git a/LiteLoader/Header/MC/PistonBlock.hpp b/LiteLoader/include/llapi/mc/PistonBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/PistonBlock.hpp rename to LiteLoader/include/llapi/mc/PistonBlock.hpp index ccb98b3..9f6f2c1 100644 --- a/LiteLoader/Header/MC/PistonBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PistonBlockActor.hpp b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/PistonBlockActor.hpp rename to LiteLoader/include/llapi/mc/PistonBlockActor.hpp index bb0cdee..9e62237 100644 --- a/LiteLoader/Header/MC/PistonBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PistonConsumer.hpp b/LiteLoader/include/llapi/mc/PistonConsumer.hpp similarity index 97% rename from LiteLoader/Header/MC/PistonConsumer.hpp rename to LiteLoader/include/llapi/mc/PistonConsumer.hpp index ad711b8..0d81ac7 100644 --- a/LiteLoader/Header/MC/PistonConsumer.hpp +++ b/LiteLoader/include/llapi/mc/PistonConsumer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ConsumerComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlaceBlockDefinition.hpp b/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/PlaceBlockDefinition.hpp rename to LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp index 69530f7..f3bcaa4 100644 --- a/LiteLoader/Header/MC/PlaceBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/PlaceBlockNode.hpp b/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp similarity index 95% rename from LiteLoader/Header/MC/PlaceBlockNode.hpp rename to LiteLoader/include/llapi/mc/PlaceBlockNode.hpp index 1807089..e165da3 100644 --- a/LiteLoader/Header/MC/PlaceBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlanksBlock.hpp b/LiteLoader/include/llapi/mc/PlanksBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PlanksBlock.hpp rename to LiteLoader/include/llapi/mc/PlanksBlock.hpp index ba2b410..2cf159f 100644 --- a/LiteLoader/Header/MC/PlanksBlock.hpp +++ b/LiteLoader/include/llapi/mc/PlanksBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayGoal.hpp b/LiteLoader/include/llapi/mc/PlayGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayGoal.hpp rename to LiteLoader/include/llapi/mc/PlayGoal.hpp index f6cd8dd..ed95494 100644 --- a/LiteLoader/Header/MC/PlayGoal.hpp +++ b/LiteLoader/include/llapi/mc/PlayGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlaySoundCommand.hpp b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/PlaySoundCommand.hpp rename to LiteLoader/include/llapi/mc/PlaySoundCommand.hpp index 780339e..233be17 100644 --- a/LiteLoader/Header/MC/PlaySoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlaySoundPacket.hpp b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlaySoundPacket.hpp rename to LiteLoader/include/llapi/mc/PlaySoundPacket.hpp index 3a99ef4..7828fb3 100644 --- a/LiteLoader/Header/MC/PlaySoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlaySoundReactionComponent.hpp b/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/PlaySoundReactionComponent.hpp rename to LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp index d1542d5..1f328fb 100644 --- a/LiteLoader/Header/MC/PlaySoundReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayStatusPacket.hpp b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayStatusPacket.hpp rename to LiteLoader/include/llapi/mc/PlayStatusPacket.hpp index cf21718..16b0ba2 100644 --- a/LiteLoader/Header/MC/PlayStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Player.hpp b/LiteLoader/include/llapi/mc/Player.hpp similarity index 99% rename from LiteLoader/Header/MC/Player.hpp rename to LiteLoader/include/llapi/mc/Player.hpp index 4293961..c7f93ae 100644 --- a/LiteLoader/Header/MC/Player.hpp +++ b/LiteLoader/include/llapi/mc/Player.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include #include "Actor.hpp" #include "Mob.hpp" @@ -16,7 +16,8 @@ class CompoundTag; //#include "UserEntityIdentifierComponent.hpp" #include "ScorePacketInfo.hpp" #include "DataItem.hpp" -#include "../I18nAPI.h" +#include +#include #include "AttributeInstance.hpp" #undef BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp similarity index 98% rename from LiteLoader/Header/MC/PlayerActionPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerActionPacket.hpp index 48ecc15..c49b9fd 100644 --- a/LiteLoader/Header/MC/PlayerActionPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerArmorDamagePacket.hpp b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerArmorDamagePacket.hpp rename to LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp index c8c125b..b5fb464 100644 --- a/LiteLoader/Header/MC/PlayerArmorDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerAuthInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerAuthInputPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp index afd8188..1707b8b 100644 --- a/LiteLoader/Header/MC/PlayerAuthInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/PlayerCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp index f71ad39..d20321c 100644 --- a/LiteLoader/Header/MC/PlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/PlayerDataSystem.hpp b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp similarity index 98% rename from LiteLoader/Header/MC/PlayerDataSystem.hpp rename to LiteLoader/include/llapi/mc/PlayerDataSystem.hpp index c86a71d..f129cf9 100644 --- a/LiteLoader/Header/MC/PlayerDataSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerEnchantOptionsPacket.hpp b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PlayerEnchantOptionsPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp index 3f56bfa..d0fb943 100644 --- a/LiteLoader/Header/MC/PlayerEnchantOptionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerEventCoordinator.hpp b/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp index 060f26d..4d5f264 100644 --- a/LiteLoader/Header/MC/PlayerEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerEventListener.hpp b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp similarity index 99% rename from LiteLoader/Header/MC/PlayerEventListener.hpp rename to LiteLoader/include/llapi/mc/PlayerEventListener.hpp index 983c81c..65e0b52 100644 --- a/LiteLoader/Header/MC/PlayerEventListener.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerHotbarPacket.hpp b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerHotbarPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp index 5f1cdc9..2dab65f 100644 --- a/LiteLoader/Header/MC/PlayerHotbarPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerInputPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerInputPacket.hpp index 3ad5b35..edff3e4 100644 --- a/LiteLoader/Header/MC/PlayerInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerInteractionSystem.hpp b/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/PlayerInteractionSystem.hpp rename to LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp index 73b4083..e477995 100644 --- a/LiteLoader/Header/MC/PlayerInteractionSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerInventory.hpp b/LiteLoader/include/llapi/mc/PlayerInventory.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerInventory.hpp rename to LiteLoader/include/llapi/mc/PlayerInventory.hpp index 853f225..1966292 100644 --- a/LiteLoader/Header/MC/PlayerInventory.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInventory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA @@ -10,7 +10,7 @@ class PlayerInventory { #define AFTER_EXTRA - +struct SlotData; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERINVENTORY public: diff --git a/LiteLoader/Header/MC/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/PlayerListEntry.hpp rename to LiteLoader/include/llapi/mc/PlayerListEntry.hpp index bc1d761..df9c746 100644 --- a/LiteLoader/Header/MC/PlayerListEntry.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerListPacket.hpp b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PlayerListPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerListPacket.hpp index 7f18685..6053e03 100644 --- a/LiteLoader/Header/MC/PlayerListPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp similarity index 94% rename from LiteLoader/Header/MC/PlayerMovement.hpp rename to LiteLoader/include/llapi/mc/PlayerMovement.hpp index 2849e80..5b2ba44 100644 --- a/LiteLoader/Header/MC/PlayerMovement.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerRespawnBlockRadiusRandomizer.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerRespawnBlockRadiusRandomizer.hpp rename to LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp index 4d9d185..73ab45c 100644 --- a/LiteLoader/Header/MC/PlayerRespawnBlockRadiusRandomizer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerRespawnTelemetryData.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerRespawnTelemetryData.hpp rename to LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp index def6626..79384da 100644 --- a/LiteLoader/Header/MC/PlayerRespawnTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Social.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerRideTamedGoal.hpp b/LiteLoader/include/llapi/mc/PlayerRideTamedGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerRideTamedGoal.hpp rename to LiteLoader/include/llapi/mc/PlayerRideTamedGoal.hpp index 9997985..0ff7f39 100644 --- a/LiteLoader/Header/MC/PlayerRideTamedGoal.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRideTamedGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerScoreboardId.hpp b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp similarity index 95% rename from LiteLoader/Header/MC/PlayerScoreboardId.hpp rename to LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp index 9bee4a9..211a936 100644 --- a/LiteLoader/Header/MC/PlayerScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerSkinPacket.hpp b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PlayerSkinPacket.hpp rename to LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp index dfc74c8..544672c 100644 --- a/LiteLoader/Header/MC/PlayerSkinPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerStorageIds.hpp b/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp similarity index 95% rename from LiteLoader/Header/MC/PlayerStorageIds.hpp rename to LiteLoader/include/llapi/mc/PlayerStorageIds.hpp index 4a629ae..d288781 100644 --- a/LiteLoader/Header/MC/PlayerStorageIds.hpp +++ b/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerUIContainer.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp similarity index 96% rename from LiteLoader/Header/MC/PlayerUIContainer.hpp rename to LiteLoader/include/llapi/mc/PlayerUIContainer.hpp index 095a63e..01b9f20 100644 --- a/LiteLoader/Header/MC/PlayerUIContainer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SimpleContainer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerUIContainerModel.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/PlayerUIContainerModel.hpp rename to LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp index cd94153..f686125 100644 --- a/LiteLoader/Header/MC/PlayerUIContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PlayerUIContainerModelBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PlayerUIContainerModelBase.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp similarity index 98% rename from LiteLoader/Header/MC/PlayerUIContainerModelBase.hpp rename to LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp index 502a53a..39905d0 100644 --- a/LiteLoader/Header/MC/PlayerUIContainerModelBase.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PodzolAreaFeature.hpp b/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/PodzolAreaFeature.hpp rename to LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp index 28f9cea..525a336 100644 --- a/LiteLoader/Header/MC/PodzolAreaFeature.hpp +++ b/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PodzolBlock.hpp b/LiteLoader/include/llapi/mc/PodzolBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PodzolBlock.hpp rename to LiteLoader/include/llapi/mc/PodzolBlock.hpp index 3de039d..dcac70a 100644 --- a/LiteLoader/Header/MC/PodzolBlock.hpp +++ b/LiteLoader/include/llapi/mc/PodzolBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PolarBear.hpp b/LiteLoader/include/llapi/mc/PolarBear.hpp similarity index 98% rename from LiteLoader/Header/MC/PolarBear.hpp rename to LiteLoader/include/llapi/mc/PolarBear.hpp index dd76925..d5b9342 100644 --- a/LiteLoader/Header/MC/PolarBear.hpp +++ b/LiteLoader/include/llapi/mc/PolarBear.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/PoolElementStructurePiece.hpp b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp similarity index 98% rename from LiteLoader/Header/MC/PoolElementStructurePiece.hpp rename to LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp index 734c586..bdee78a 100644 --- a/LiteLoader/Header/MC/PoolElementStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PortalBlock.hpp b/LiteLoader/include/llapi/mc/PortalBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/PortalBlock.hpp rename to LiteLoader/include/llapi/mc/PortalBlock.hpp index bccdae3..641c28c 100644 --- a/LiteLoader/Header/MC/PortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/PortalBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PortalForcer.hpp b/LiteLoader/include/llapi/mc/PortalForcer.hpp similarity index 97% rename from LiteLoader/Header/MC/PortalForcer.hpp rename to LiteLoader/include/llapi/mc/PortalForcer.hpp index 6f3253f..74950e0 100644 --- a/LiteLoader/Header/MC/PortalForcer.hpp +++ b/LiteLoader/include/llapi/mc/PortalForcer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PortalShape.hpp b/LiteLoader/include/llapi/mc/PortalShape.hpp similarity index 97% rename from LiteLoader/Header/MC/PortalShape.hpp rename to LiteLoader/include/llapi/mc/PortalShape.hpp index c3053f4..238deec 100644 --- a/LiteLoader/Header/MC/PortalShape.hpp +++ b/LiteLoader/include/llapi/mc/PortalShape.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Facing.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PosibleTransformation.hpp b/LiteLoader/include/llapi/mc/PosibleTransformation.hpp similarity index 95% rename from LiteLoader/Header/MC/PosibleTransformation.hpp rename to LiteLoader/include/llapi/mc/PosibleTransformation.hpp index 727fb1b..3adebfa 100644 --- a/LiteLoader/Header/MC/PosibleTransformation.hpp +++ b/LiteLoader/include/llapi/mc/PosibleTransformation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PositionTrackingDBClientRequestPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PositionTrackingDBClientRequestPacket.hpp rename to LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp index 241447f..57439a3 100644 --- a/LiteLoader/Header/MC/PositionTrackingDBClientRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PositionTrackingDBServerBroadcastPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/PositionTrackingDBServerBroadcastPacket.hpp rename to LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp index 854f5e5..0915aba 100644 --- a/LiteLoader/Header/MC/PositionTrackingDBServerBroadcastPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PositionTrackingId.hpp b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp similarity index 96% rename from LiteLoader/Header/MC/PositionTrackingId.hpp rename to LiteLoader/include/llapi/mc/PositionTrackingId.hpp index 94f4eef..528db80 100644 --- a/LiteLoader/Header/MC/PositionTrackingId.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PostprocessingManager.hpp b/LiteLoader/include/llapi/mc/PostprocessingManager.hpp similarity index 96% rename from LiteLoader/Header/MC/PostprocessingManager.hpp rename to LiteLoader/include/llapi/mc/PostprocessingManager.hpp index 3f4dcf1..51f7749 100644 --- a/LiteLoader/Header/MC/PostprocessingManager.hpp +++ b/LiteLoader/include/llapi/mc/PostprocessingManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PotatoBlock.hpp b/LiteLoader/include/llapi/mc/PotatoBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PotatoBlock.hpp rename to LiteLoader/include/llapi/mc/PotatoBlock.hpp index b50d6d6..46188fd 100644 --- a/LiteLoader/Header/MC/PotatoBlock.hpp +++ b/LiteLoader/include/llapi/mc/PotatoBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "CropBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Potion.hpp b/LiteLoader/include/llapi/mc/Potion.hpp similarity index 99% rename from LiteLoader/Header/MC/Potion.hpp rename to LiteLoader/include/llapi/mc/Potion.hpp index b69b00d..a71fd47 100644 --- a/LiteLoader/Header/MC/Potion.hpp +++ b/LiteLoader/include/llapi/mc/Potion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PotionBrewing.hpp b/LiteLoader/include/llapi/mc/PotionBrewing.hpp similarity index 98% rename from LiteLoader/Header/MC/PotionBrewing.hpp rename to LiteLoader/include/llapi/mc/PotionBrewing.hpp index 8751e16..ea4f4d9 100644 --- a/LiteLoader/Header/MC/PotionBrewing.hpp +++ b/LiteLoader/include/llapi/mc/PotionBrewing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PotionItem.hpp b/LiteLoader/include/llapi/mc/PotionItem.hpp similarity index 98% rename from LiteLoader/Header/MC/PotionItem.hpp rename to LiteLoader/include/llapi/mc/PotionItem.hpp index 6817431..66eb3c1 100644 --- a/LiteLoader/Header/MC/PotionItem.hpp +++ b/LiteLoader/include/llapi/mc/PotionItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Potion.hpp" #include "Item.hpp" diff --git a/LiteLoader/Header/MC/PoweredBlockComponent.hpp b/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/PoweredBlockComponent.hpp rename to LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp index 238ec25..a9960ba 100644 --- a/LiteLoader/Header/MC/PoweredBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseCircuitComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PoweredRailBlock.hpp b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PoweredRailBlock.hpp rename to LiteLoader/include/llapi/mc/PoweredRailBlock.hpp index 39afa6f..d3100c2 100644 --- a/LiteLoader/Header/MC/PoweredRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseRailBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrecompiledCommandOrigin.hpp b/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/PrecompiledCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp index 99a7ed2..c38d9bf 100644 --- a/LiteLoader/Header/MC/PrecompiledCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/Predicate.hpp b/LiteLoader/include/llapi/mc/Predicate.hpp similarity index 90% rename from LiteLoader/Header/MC/Predicate.hpp rename to LiteLoader/include/llapi/mc/Predicate.hpp index 964dc84..8c72fcd 100644 --- a/LiteLoader/Header/MC/Predicate.hpp +++ b/LiteLoader/include/llapi/mc/Predicate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PreferredPathDescription.hpp b/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/PreferredPathDescription.hpp rename to LiteLoader/include/llapi/mc/PreferredPathDescription.hpp index 213feca..3257ff4 100644 --- a/LiteLoader/Header/MC/PreferredPathDescription.hpp +++ b/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PressurePlateBlock.hpp rename to LiteLoader/include/llapi/mc/PressurePlateBlock.hpp index 8102cbb..5df7f9c 100644 --- a/LiteLoader/Header/MC/PressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BasePressurePlateBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrettySnbtFormat.hpp b/LiteLoader/include/llapi/mc/PrettySnbtFormat.hpp similarity index 97% rename from LiteLoader/Header/MC/PrettySnbtFormat.hpp rename to LiteLoader/include/llapi/mc/PrettySnbtFormat.hpp index 51c3f1f..c36f233 100644 --- a/LiteLoader/Header/MC/PrettySnbtFormat.hpp +++ b/LiteLoader/include/llapi/mc/PrettySnbtFormat.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../Global.h" -#include +#include "llapi/Global.h" +#include "Tag.hpp" struct PrettySnbtFormat { diff --git a/LiteLoader/Header/MC/PrimedTnt.hpp b/LiteLoader/include/llapi/mc/PrimedTnt.hpp similarity index 98% rename from LiteLoader/Header/MC/PrimedTnt.hpp rename to LiteLoader/include/llapi/mc/PrimedTnt.hpp index 2bdd6e6..c8fa31b 100644 --- a/LiteLoader/Header/MC/PrimedTnt.hpp +++ b/LiteLoader/include/llapi/mc/PrimedTnt.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrintStream.hpp b/LiteLoader/include/llapi/mc/PrintStream.hpp similarity index 94% rename from LiteLoader/Header/MC/PrintStream.hpp rename to LiteLoader/include/llapi/mc/PrintStream.hpp index 9286c15..8b695ed 100644 --- a/LiteLoader/Header/MC/PrintStream.hpp +++ b/LiteLoader/include/llapi/mc/PrintStream.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrioritizedGoal.hpp b/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp similarity index 95% rename from LiteLoader/Header/MC/PrioritizedGoal.hpp rename to LiteLoader/include/llapi/mc/PrioritizedGoal.hpp index 8e76d70..d0b18a8 100644 --- a/LiteLoader/Header/MC/PrioritizedGoal.hpp +++ b/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrismarineBlock.hpp b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/PrismarineBlock.hpp rename to LiteLoader/include/llapi/mc/PrismarineBlock.hpp index acb7246..be7700f 100644 --- a/LiteLoader/Header/MC/PrismarineBlock.hpp +++ b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PrivateKeyManager.hpp b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp similarity index 96% rename from LiteLoader/Header/MC/PrivateKeyManager.hpp rename to LiteLoader/include/llapi/mc/PrivateKeyManager.hpp index f2f3dca..a07d423 100644 --- a/LiteLoader/Header/MC/PrivateKeyManager.hpp +++ b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProducerComponent.hpp b/LiteLoader/include/llapi/mc/ProducerComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ProducerComponent.hpp rename to LiteLoader/include/llapi/mc/ProducerComponent.hpp index fe5cb23..e77f309 100644 --- a/LiteLoader/Header/MC/ProducerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProducerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseCircuitComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProfilerLite.hpp b/LiteLoader/include/llapi/mc/ProfilerLite.hpp similarity index 95% rename from LiteLoader/Header/MC/ProfilerLite.hpp rename to LiteLoader/include/llapi/mc/ProfilerLite.hpp index 7713d64..5e19218 100644 --- a/LiteLoader/Header/MC/ProfilerLite.hpp +++ b/LiteLoader/include/llapi/mc/ProfilerLite.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProjectileComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ProjectileComponent.hpp rename to LiteLoader/include/llapi/mc/ProjectileComponent.hpp index cb92693..0ce69d9 100644 --- a/LiteLoader/Header/MC/ProjectileComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProjectileDescription.hpp b/LiteLoader/include/llapi/mc/ProjectileDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ProjectileDescription.hpp rename to LiteLoader/include/llapi/mc/ProjectileDescription.hpp index 43f2c5d..a39da37 100644 --- a/LiteLoader/Header/MC/ProjectileDescription.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProjectileFactory.hpp b/LiteLoader/include/llapi/mc/ProjectileFactory.hpp similarity index 97% rename from LiteLoader/Header/MC/ProjectileFactory.hpp rename to LiteLoader/include/llapi/mc/ProjectileFactory.hpp index 0e1bb58..4ba6d22 100644 --- a/LiteLoader/Header/MC/ProjectileFactory.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProjectileSystem.hpp b/LiteLoader/include/llapi/mc/ProjectileSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/ProjectileSystem.hpp rename to LiteLoader/include/llapi/mc/ProjectileSystem.hpp index 172b9f8..7c16905 100644 --- a/LiteLoader/Header/MC/ProjectileSystem.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PropertiesSettings.hpp b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp similarity index 97% rename from LiteLoader/Header/MC/PropertiesSettings.hpp rename to LiteLoader/include/llapi/mc/PropertiesSettings.hpp index 1c941a3..fa9de4e 100644 --- a/LiteLoader/Header/MC/PropertiesSettings.hpp +++ b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PropertyBag.hpp b/LiteLoader/include/llapi/mc/PropertyBag.hpp similarity index 94% rename from LiteLoader/Header/MC/PropertyBag.hpp rename to LiteLoader/include/llapi/mc/PropertyBag.hpp index 2cee5e9..39ecc0f 100644 --- a/LiteLoader/Header/MC/PropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/PropertyBag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PropertyDescription.hpp b/LiteLoader/include/llapi/mc/PropertyDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/PropertyDescription.hpp rename to LiteLoader/include/llapi/mc/PropertyDescription.hpp index 8b2b68c..c3d0faf 100644 --- a/LiteLoader/Header/MC/PropertyDescription.hpp +++ b/LiteLoader/include/llapi/mc/PropertyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ProtectionEnchant.hpp b/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp similarity index 97% rename from LiteLoader/Header/MC/ProtectionEnchant.hpp rename to LiteLoader/include/llapi/mc/ProtectionEnchant.hpp index f40619f..de80516 100644 --- a/LiteLoader/Header/MC/ProtectionEnchant.hpp +++ b/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Pufferfish.hpp b/LiteLoader/include/llapi/mc/Pufferfish.hpp similarity index 98% rename from LiteLoader/Header/MC/Pufferfish.hpp rename to LiteLoader/include/llapi/mc/Pufferfish.hpp index a28ef47..cf2144f 100644 --- a/LiteLoader/Header/MC/Pufferfish.hpp +++ b/LiteLoader/include/llapi/mc/Pufferfish.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fish.hpp" diff --git a/LiteLoader/Header/MC/PulseCapacitor.hpp b/LiteLoader/include/llapi/mc/PulseCapacitor.hpp similarity index 97% rename from LiteLoader/Header/MC/PulseCapacitor.hpp rename to LiteLoader/include/llapi/mc/PulseCapacitor.hpp index c18c611..014c407 100644 --- a/LiteLoader/Header/MC/PulseCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/PulseCapacitor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ProducerComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PumpkinBlock.hpp b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/PumpkinBlock.hpp rename to LiteLoader/include/llapi/mc/PumpkinBlock.hpp index 58c67fb..34320b8 100644 --- a/LiteLoader/Header/MC/PumpkinBlock.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PumpkinBlockItem.hpp b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/PumpkinBlockItem.hpp rename to LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp index fcb81ee..9403d40 100644 --- a/LiteLoader/Header/MC/PumpkinBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PurchaseReceiptPacket.hpp b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/PurchaseReceiptPacket.hpp rename to LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp index 45f8a91..1f56602 100644 --- a/LiteLoader/Header/MC/PurchaseReceiptPacket.hpp +++ b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PushThroughDescription.hpp b/LiteLoader/include/llapi/mc/PushThroughDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/PushThroughDescription.hpp rename to LiteLoader/include/llapi/mc/PushThroughDescription.hpp index e0ef9b8..890d3cf 100644 --- a/LiteLoader/Header/MC/PushThroughDescription.hpp +++ b/LiteLoader/include/llapi/mc/PushThroughDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PushableComponent.hpp b/LiteLoader/include/llapi/mc/PushableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/PushableComponent.hpp rename to LiteLoader/include/llapi/mc/PushableComponent.hpp index 19bbd17..e8907db 100644 --- a/LiteLoader/Header/MC/PushableComponent.hpp +++ b/LiteLoader/include/llapi/mc/PushableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/PushableDescription.hpp b/LiteLoader/include/llapi/mc/PushableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/PushableDescription.hpp rename to LiteLoader/include/llapi/mc/PushableDescription.hpp index 80d64ea..7a8725d 100644 --- a/LiteLoader/Header/MC/PushableDescription.hpp +++ b/LiteLoader/include/llapi/mc/PushableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/QuartzBlockBlock.hpp b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/QuartzBlockBlock.hpp rename to LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp index bb75ca3..1c8554e 100644 --- a/LiteLoader/Header/MC/QuartzBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/QueryTargetCommand.hpp b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/QueryTargetCommand.hpp rename to LiteLoader/include/llapi/mc/QueryTargetCommand.hpp index 9123ea3..aa5f164 100644 --- a/LiteLoader/Header/MC/QueryTargetCommand.hpp +++ b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Rabbit.hpp b/LiteLoader/include/llapi/mc/Rabbit.hpp similarity index 98% rename from LiteLoader/Header/MC/Rabbit.hpp rename to LiteLoader/include/llapi/mc/Rabbit.hpp index 3c0ab6b..14d12fb 100644 --- a/LiteLoader/Header/MC/Rabbit.hpp +++ b/LiteLoader/include/llapi/mc/Rabbit.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/RabbitPanicGoal.hpp b/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp similarity index 95% rename from LiteLoader/Header/MC/RabbitPanicGoal.hpp rename to LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp index 1ccd09e..dff5cf1 100644 --- a/LiteLoader/Header/MC/RabbitPanicGoal.hpp +++ b/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PanicGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Raid.hpp b/LiteLoader/include/llapi/mc/Raid.hpp similarity index 96% rename from LiteLoader/Header/MC/Raid.hpp rename to LiteLoader/include/llapi/mc/Raid.hpp index 78cf3ba..b3d5440 100644 --- a/LiteLoader/Header/MC/Raid.hpp +++ b/LiteLoader/include/llapi/mc/Raid.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaidBossComponent.hpp b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/RaidBossComponent.hpp rename to LiteLoader/include/llapi/mc/RaidBossComponent.hpp index d0c784b..5c53a79 100644 --- a/LiteLoader/Header/MC/RaidBossComponent.hpp +++ b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaidBossSystem.hpp b/LiteLoader/include/llapi/mc/RaidBossSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/RaidBossSystem.hpp rename to LiteLoader/include/llapi/mc/RaidBossSystem.hpp index 2b0339a..3359ef8 100644 --- a/LiteLoader/Header/MC/RaidBossSystem.hpp +++ b/LiteLoader/include/llapi/mc/RaidBossSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaidGardenGoal.hpp b/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp similarity index 98% rename from LiteLoader/Header/MC/RaidGardenGoal.hpp rename to LiteLoader/include/llapi/mc/RaidGardenGoal.hpp index b743531..97bdac8 100644 --- a/LiteLoader/Header/MC/RaidGardenGoal.hpp +++ b/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToBlockGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaidTriggerComponent.hpp b/LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/RaidTriggerComponent.hpp rename to LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp index 76f0b86..e17c44a 100644 --- a/LiteLoader/Header/MC/RaidTriggerComponent.hpp +++ b/LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaidTriggerDescription.hpp b/LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/RaidTriggerDescription.hpp rename to LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp index a0d4a29..ed67b13 100644 --- a/LiteLoader/Header/MC/RaidTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RaiderCelebrationGoal.hpp b/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RaiderCelebrationGoal.hpp rename to LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp index 9bb1960..bcbfbe6 100644 --- a/LiteLoader/Header/MC/RaiderCelebrationGoal.hpp +++ b/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailActivatorComponent.hpp b/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/RailActivatorComponent.hpp rename to LiteLoader/include/llapi/mc/RailActivatorComponent.hpp index 76f8276..6907a96 100644 --- a/LiteLoader/Header/MC/RailActivatorComponent.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailActivatorDefinition.hpp b/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RailActivatorDefinition.hpp rename to LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp index 036e7fc..53f2db1 100644 --- a/LiteLoader/Header/MC/RailActivatorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailActivatorSystem.hpp b/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/RailActivatorSystem.hpp rename to LiteLoader/include/llapi/mc/RailActivatorSystem.hpp index 7faa69a..ebc7768 100644 --- a/LiteLoader/Header/MC/RailActivatorSystem.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailBlock.hpp b/LiteLoader/include/llapi/mc/RailBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/RailBlock.hpp rename to LiteLoader/include/llapi/mc/RailBlock.hpp index 623e77b..1b605eb 100644 --- a/LiteLoader/Header/MC/RailBlock.hpp +++ b/LiteLoader/include/llapi/mc/RailBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseRailBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailMovement.hpp b/LiteLoader/include/llapi/mc/RailMovement.hpp similarity index 95% rename from LiteLoader/Header/MC/RailMovement.hpp rename to LiteLoader/include/llapi/mc/RailMovement.hpp index 859b7eb..02f086f 100644 --- a/LiteLoader/Header/MC/RailMovement.hpp +++ b/LiteLoader/include/llapi/mc/RailMovement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RailMovementComponent.hpp b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/RailMovementComponent.hpp rename to LiteLoader/include/llapi/mc/RailMovementComponent.hpp index cc413a5..57aee48 100644 --- a/LiteLoader/Header/MC/RailMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakDataInput.hpp b/LiteLoader/include/llapi/mc/RakDataInput.hpp similarity index 97% rename from LiteLoader/Header/MC/RakDataInput.hpp rename to LiteLoader/include/llapi/mc/RakDataInput.hpp index b9bc1dd..a27008e 100644 --- a/LiteLoader/Header/MC/RakDataInput.hpp +++ b/LiteLoader/include/llapi/mc/RakDataInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BytesDataInput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakDataOutput.hpp b/LiteLoader/include/llapi/mc/RakDataOutput.hpp similarity index 97% rename from LiteLoader/Header/MC/RakDataOutput.hpp rename to LiteLoader/include/llapi/mc/RakDataOutput.hpp index 9892f85..3aa2535 100644 --- a/LiteLoader/Header/MC/RakDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/RakDataOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BytesDataOutput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakNet.hpp b/LiteLoader/include/llapi/mc/RakNet.hpp similarity index 98% rename from LiteLoader/Header/MC/RakNet.hpp rename to LiteLoader/include/llapi/mc/RakNet.hpp index 7348d58..d2d03a6 100644 --- a/LiteLoader/Header/MC/RakNet.hpp +++ b/LiteLoader/include/llapi/mc/RakNet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/RakNetInstance.hpp b/LiteLoader/include/llapi/mc/RakNetInstance.hpp similarity index 98% rename from LiteLoader/Header/MC/RakNetInstance.hpp rename to LiteLoader/include/llapi/mc/RakNetInstance.hpp index 51328b1..d1bbe35 100644 --- a/LiteLoader/Header/MC/RakNetInstance.hpp +++ b/LiteLoader/include/llapi/mc/RakNetInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #include "Social.hpp" #include "Connector.hpp" diff --git a/LiteLoader/Header/MC/RakNetServerLocator.hpp b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp similarity index 98% rename from LiteLoader/Header/MC/RakNetServerLocator.hpp rename to LiteLoader/include/llapi/mc/RakNetServerLocator.hpp index 5f06515..dc7de4f 100644 --- a/LiteLoader/Header/MC/RakNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #include "RakPeerHelper.hpp" diff --git a/LiteLoader/Header/MC/RakPeerHelper.hpp b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp similarity index 84% rename from LiteLoader/Header/MC/RakPeerHelper.hpp rename to LiteLoader/include/llapi/mc/RakPeerHelper.hpp index c19da56..5a28900 100644 --- a/LiteLoader/Header/MC/RakPeerHelper.hpp +++ b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA @@ -12,10 +12,10 @@ class RakPeerHelper { #define AFTER_EXTRA public: - struct IPSupportInterface{ + class IPSupportInterface{ IPSupportInterface() = delete; - IPSupportInterface(struct IPSupportInterface&) = delete; - IPSupportInterface(struct IPSupportInterface&&) = delete; + IPSupportInterface(class IPSupportInterface&) = delete; + IPSupportInterface(class IPSupportInterface&&) = delete; }; #undef AFTER_EXTRA diff --git a/LiteLoader/Header/MC/RakTcpProxy.hpp b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp similarity index 97% rename from LiteLoader/Header/MC/RakTcpProxy.hpp rename to LiteLoader/include/llapi/mc/RakTcpProxy.hpp index 4601cf3..6ab6d06 100644 --- a/LiteLoader/Header/MC/RakTcpProxy.hpp +++ b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakWebSocket.hpp b/LiteLoader/include/llapi/mc/RakWebSocket.hpp similarity index 98% rename from LiteLoader/Header/MC/RakWebSocket.hpp rename to LiteLoader/include/llapi/mc/RakWebSocket.hpp index 9e34ff2..429fb7b 100644 --- a/LiteLoader/Header/MC/RakWebSocket.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakWebSocketClient.hpp b/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp similarity index 96% rename from LiteLoader/Header/MC/RakWebSocketClient.hpp rename to LiteLoader/include/llapi/mc/RakWebSocketClient.hpp index 3e4024b..2751615 100644 --- a/LiteLoader/Header/MC/RakWebSocketClient.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakWebSocket.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakWebSocketDataFrame.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp similarity index 96% rename from LiteLoader/Header/MC/RakWebSocketDataFrame.hpp rename to LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp index 56d3c87..f1122d3 100644 --- a/LiteLoader/Header/MC/RakWebSocketDataFrame.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RakWebSocketDataFrameParser.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp similarity index 97% rename from LiteLoader/Header/MC/RakWebSocketDataFrameParser.hpp rename to LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp index 0a43431..bed6aad 100644 --- a/LiteLoader/Header/MC/RakWebSocketDataFrameParser.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RakNet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Random.hpp b/LiteLoader/include/llapi/mc/Random.hpp similarity index 96% rename from LiteLoader/Header/MC/Random.hpp rename to LiteLoader/include/llapi/mc/Random.hpp index 4f71efd..a483522 100644 --- a/LiteLoader/Header/MC/Random.hpp +++ b/LiteLoader/include/llapi/mc/Random.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomAuxValueFunction.hpp b/LiteLoader/include/llapi/mc/RandomAuxValueFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/RandomAuxValueFunction.hpp rename to LiteLoader/include/llapi/mc/RandomAuxValueFunction.hpp index 44474bc..8feed9c 100644 --- a/LiteLoader/Header/MC/RandomAuxValueFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomAuxValueFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomBlockStateFunction.hpp b/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomBlockStateFunction.hpp rename to LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp index 0721c33..c2f8db6 100644 --- a/LiteLoader/Header/MC/RandomBlockStateFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/RandomBreachingGoal.hpp b/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomBreachingGoal.hpp rename to LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp index 2c5a15c..ae687bf 100644 --- a/LiteLoader/Header/MC/RandomBreachingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomStrollGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomDyeFunction.hpp b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomDyeFunction.hpp rename to LiteLoader/include/llapi/mc/RandomDyeFunction.hpp index 660bd9a..177bb50 100644 --- a/LiteLoader/Header/MC/RandomDyeFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomFlyingGoal.hpp b/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RandomFlyingGoal.hpp rename to LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp index 2237ef8..020f11d 100644 --- a/LiteLoader/Header/MC/RandomFlyingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomStrollGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomHoverGoal.hpp b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomHoverGoal.hpp rename to LiteLoader/include/llapi/mc/RandomHoverGoal.hpp index 1da17fe..0bea1f6 100644 --- a/LiteLoader/Header/MC/RandomHoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomLookAroundAndSitGoal.hpp b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomLookAroundAndSitGoal.hpp rename to LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp index 9ee4a2c..fea6e37 100644 --- a/LiteLoader/Header/MC/RandomLookAroundAndSitGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomLookAroundGoal.hpp b/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RandomLookAroundGoal.hpp rename to LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp index a1ecd5f..90a152a 100644 --- a/LiteLoader/Header/MC/RandomLookAroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomPos.hpp b/LiteLoader/include/llapi/mc/RandomPos.hpp similarity index 98% rename from LiteLoader/Header/MC/RandomPos.hpp rename to LiteLoader/include/llapi/mc/RandomPos.hpp index 29d1b4d..6ed58ae 100644 --- a/LiteLoader/Header/MC/RandomPos.hpp +++ b/LiteLoader/include/llapi/mc/RandomPos.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomScatteredLargeFeature.hpp b/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomScatteredLargeFeature.hpp rename to LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp index 11ff2d3..3849b2b 100644 --- a/LiteLoader/Header/MC/RandomScatteredLargeFeature.hpp +++ b/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomSitGoal.hpp b/LiteLoader/include/llapi/mc/RandomSitGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RandomSitGoal.hpp rename to LiteLoader/include/llapi/mc/RandomSitGoal.hpp index 34ce837..a270ffb 100644 --- a/LiteLoader/Header/MC/RandomSitGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomSitGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomStrollGoal.hpp b/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomStrollGoal.hpp rename to LiteLoader/include/llapi/mc/RandomStrollGoal.hpp index 125ef88..13cd420 100644 --- a/LiteLoader/Header/MC/RandomStrollGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomSwimmingGoal.hpp b/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomSwimmingGoal.hpp rename to LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp index b537e0c..c45f457 100644 --- a/LiteLoader/Header/MC/RandomSwimmingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomStrollGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomThreadCheckManager.hpp b/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomThreadCheckManager.hpp rename to LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp index b6b4b15..7f90dc6 100644 --- a/LiteLoader/Header/MC/RandomThreadCheckManager.hpp +++ b/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomValueBounds.hpp b/LiteLoader/include/llapi/mc/RandomValueBounds.hpp similarity index 96% rename from LiteLoader/Header/MC/RandomValueBounds.hpp rename to LiteLoader/include/llapi/mc/RandomValueBounds.hpp index 2e15aab..21f0aae 100644 --- a/LiteLoader/Header/MC/RandomValueBounds.hpp +++ b/LiteLoader/include/llapi/mc/RandomValueBounds.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomizableBlockActorContainer.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomizableBlockActorContainer.hpp rename to LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp index 1a649ef..b57fbdc 100644 --- a/LiteLoader/Header/MC/RandomizableBlockActorContainer.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomizableBlockActorContainerBase.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomizableBlockActorContainerBase.hpp rename to LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp index 217f5f1..5e218fc 100644 --- a/LiteLoader/Header/MC/RandomizableBlockActorContainerBase.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RandomizableBlockActorFillingContainer.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp similarity index 97% rename from LiteLoader/Header/MC/RandomizableBlockActorFillingContainer.hpp rename to LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp index 8ef2601..0de6516 100644 --- a/LiteLoader/Header/MC/RandomizableBlockActorFillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomizableBlockActorContainerBase.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RangedAttackDefinition.hpp b/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RangedAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp index 4b2b4c9..9be26be 100644 --- a/LiteLoader/Header/MC/RangedAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RangedAttackGoal.hpp b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RangedAttackGoal.hpp rename to LiteLoader/include/llapi/mc/RangedAttackGoal.hpp index ce8bd56..69234f6 100644 --- a/LiteLoader/Header/MC/RangedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RangedWeaponItem.hpp b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp similarity index 97% rename from LiteLoader/Header/MC/RangedWeaponItem.hpp rename to LiteLoader/include/llapi/mc/RangedWeaponItem.hpp index 6cd20e9..2976a91 100644 --- a/LiteLoader/Header/MC/RangedWeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RapidFertilizerItem.hpp b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp similarity index 99% rename from LiteLoader/Header/MC/RapidFertilizerItem.hpp rename to LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp index 0f6c392..d15cccc 100644 --- a/LiteLoader/Header/MC/RapidFertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FertilizerItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ReadOnlyBinaryStream.hpp b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp similarity index 98% rename from LiteLoader/Header/MC/ReadOnlyBinaryStream.hpp rename to LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp index bc6b545..e0ab4ad 100644 --- a/LiteLoader/Header/MC/ReadOnlyBinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RealmsUnknownPackSource.hpp b/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp similarity index 97% rename from LiteLoader/Header/MC/RealmsUnknownPackSource.hpp rename to LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp index 6c26a30..c3b7522 100644 --- a/LiteLoader/Header/MC/RealmsUnknownPackSource.hpp +++ b/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ReceiveLoveGoal.hpp b/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ReceiveLoveGoal.hpp rename to LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp index fc53ab1..0aa744b 100644 --- a/LiteLoader/Header/MC/ReceiveLoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp similarity index 98% rename from LiteLoader/Header/MC/Recipe.hpp rename to LiteLoader/include/llapi/mc/Recipe.hpp index 6f80906..295b17d 100644 --- a/LiteLoader/Header/MC/Recipe.hpp +++ b/LiteLoader/include/llapi/mc/Recipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp similarity index 96% rename from LiteLoader/Header/MC/RecipeIngredient.hpp rename to LiteLoader/include/llapi/mc/RecipeIngredient.hpp index 7e32d26..9f6b300 100644 --- a/LiteLoader/Header/MC/RecipeIngredient.hpp +++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp similarity index 99% rename from LiteLoader/Header/MC/Recipes.hpp rename to LiteLoader/include/llapi/mc/Recipes.hpp index a1efa75..508642e 100644 --- a/LiteLoader/Header/MC/Recipes.hpp +++ b/LiteLoader/include/llapi/mc/Recipes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RecordItem.hpp b/LiteLoader/include/llapi/mc/RecordItem.hpp similarity index 98% rename from LiteLoader/Header/MC/RecordItem.hpp rename to LiteLoader/include/llapi/mc/RecordItem.hpp index 7f411ab..412340f 100644 --- a/LiteLoader/Header/MC/RecordItem.hpp +++ b/LiteLoader/include/llapi/mc/RecordItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedStoneDustItem.hpp b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp similarity index 98% rename from LiteLoader/Header/MC/RedStoneDustItem.hpp rename to LiteLoader/include/llapi/mc/RedStoneDustItem.hpp index 41d8367..8690e11 100644 --- a/LiteLoader/Header/MC/RedStoneDustItem.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/RedStoneOreBlock.hpp rename to LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp index dbad38f..a0177b2 100644 --- a/LiteLoader/Header/MC/RedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedStoneWireBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/RedStoneWireBlock.hpp rename to LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp index c5cc03f..bd9edb8 100644 --- a/LiteLoader/Header/MC/RedStoneWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedstoneBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/RedstoneBlock.hpp rename to LiteLoader/include/llapi/mc/RedstoneBlock.hpp index 7da1fcd..44291ef 100644 --- a/LiteLoader/Header/MC/RedstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedstoneLampBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/RedstoneLampBlock.hpp rename to LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp index 33046f4..1a4ceb0 100644 --- a/LiteLoader/Header/MC/RedstoneLampBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedstoneTorchBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/RedstoneTorchBlock.hpp rename to LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp index 9953e01..b3422b4 100644 --- a/LiteLoader/Header/MC/RedstoneTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TorchBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RedstoneTorchCapacitor.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp similarity index 98% rename from LiteLoader/Header/MC/RedstoneTorchCapacitor.hpp rename to LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp index 5ac63b3..d63829e 100644 --- a/LiteLoader/Header/MC/RedstoneTorchCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ProducerComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ReedBlock.hpp b/LiteLoader/include/llapi/mc/ReedBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ReedBlock.hpp rename to LiteLoader/include/llapi/mc/ReedBlock.hpp index 5f246db..aea6439 100644 --- a/LiteLoader/Header/MC/ReedBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReedBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ReedsFeature.hpp b/LiteLoader/include/llapi/mc/ReedsFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/ReedsFeature.hpp rename to LiteLoader/include/llapi/mc/ReedsFeature.hpp index ff0f5fa..af9f807 100644 --- a/LiteLoader/Header/MC/ReedsFeature.hpp +++ b/LiteLoader/include/llapi/mc/ReedsFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RegionFile.hpp b/LiteLoader/include/llapi/mc/RegionFile.hpp similarity index 94% rename from LiteLoader/Header/MC/RegionFile.hpp rename to LiteLoader/include/llapi/mc/RegionFile.hpp index 2cdffcb..9e15986 100644 --- a/LiteLoader/Header/MC/RegionFile.hpp +++ b/LiteLoader/include/llapi/mc/RegionFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RegionHillsLayer.hpp b/LiteLoader/include/llapi/mc/RegionHillsLayer.hpp similarity index 97% rename from LiteLoader/Header/MC/RegionHillsLayer.hpp rename to LiteLoader/include/llapi/mc/RegionHillsLayer.hpp index 03aa1a9..d376a30 100644 --- a/LiteLoader/Header/MC/RegionHillsLayer.hpp +++ b/LiteLoader/include/llapi/mc/RegionHillsLayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RegistryKey.hpp b/LiteLoader/include/llapi/mc/RegistryKey.hpp similarity index 95% rename from LiteLoader/Header/MC/RegistryKey.hpp rename to LiteLoader/include/llapi/mc/RegistryKey.hpp index 63c8d02..f14f143 100644 --- a/LiteLoader/Header/MC/RegistryKey.hpp +++ b/LiteLoader/include/llapi/mc/RegistryKey.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RelativeFloat.hpp b/LiteLoader/include/llapi/mc/RelativeFloat.hpp similarity index 98% rename from LiteLoader/Header/MC/RelativeFloat.hpp rename to LiteLoader/include/llapi/mc/RelativeFloat.hpp index ec16aea..379fe6c 100644 --- a/LiteLoader/Header/MC/RelativeFloat.hpp +++ b/LiteLoader/include/llapi/mc/RelativeFloat.hpp @@ -5,7 +5,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/ReloadCommand.hpp b/LiteLoader/include/llapi/mc/ReloadCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ReloadCommand.hpp rename to LiteLoader/include/llapi/mc/ReloadCommand.hpp index 18e551a..1709a65 100644 --- a/LiteLoader/Header/MC/ReloadCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReloadCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RemoveActorPacket.hpp b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/RemoveActorPacket.hpp rename to LiteLoader/include/llapi/mc/RemoveActorPacket.hpp index 70b8ee7..0e7f91e 100644 --- a/LiteLoader/Header/MC/RemoveActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RemoveEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/RemoveEntityPacket.hpp rename to LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp index 9b59e6c..bc286f6 100644 --- a/LiteLoader/Header/MC/RemoveEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RemoveObjectivePacket.hpp b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/RemoveObjectivePacket.hpp rename to LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp index dc4cc3e..04f61ad 100644 --- a/LiteLoader/Header/MC/RemoveObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RemoveOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/RemoveOnHitSubcomponent.hpp rename to LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp index f04ee6f..00f0ac5 100644 --- a/LiteLoader/Header/MC/RemoveOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RenderParams.hpp b/LiteLoader/include/llapi/mc/RenderParams.hpp similarity index 96% rename from LiteLoader/Header/MC/RenderParams.hpp rename to LiteLoader/include/llapi/mc/RenderParams.hpp index d281fe2..d9aaa65 100644 --- a/LiteLoader/Header/MC/RenderParams.hpp +++ b/LiteLoader/include/llapi/mc/RenderParams.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RepairItemRecipe.hpp b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/RepairItemRecipe.hpp rename to LiteLoader/include/llapi/mc/RepairItemRecipe.hpp index e939946..f3f2121 100644 --- a/LiteLoader/Header/MC/RepairItemRecipe.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RepeatUntilFailureDefinition.hpp b/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RepeatUntilFailureDefinition.hpp rename to LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp index cdb25ff..60d1b1c 100644 --- a/LiteLoader/Header/MC/RepeatUntilFailureDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/RepeatUntilFailureNode.hpp b/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp similarity index 96% rename from LiteLoader/Header/MC/RepeatUntilFailureNode.hpp rename to LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp index c3f92d8..f6dfe7b 100644 --- a/LiteLoader/Header/MC/RepeatUntilFailureNode.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RepeatUntilSuccessDefinition.hpp b/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RepeatUntilSuccessDefinition.hpp rename to LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp index 0f76c9a..8c54a86 100644 --- a/LiteLoader/Header/MC/RepeatUntilSuccessDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/RepeatUntilSuccessNode.hpp b/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp similarity index 96% rename from LiteLoader/Header/MC/RepeatUntilSuccessNode.hpp rename to LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp index 9c6307c..6705f1f 100644 --- a/LiteLoader/Header/MC/RepeatUntilSuccessNode.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RepeaterBlock.hpp b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/RepeaterBlock.hpp rename to LiteLoader/include/llapi/mc/RepeaterBlock.hpp index 0c30c12..73f1701 100644 --- a/LiteLoader/Header/MC/RepeaterBlock.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "DiodeBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RepeaterCapacitor.hpp b/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp similarity index 98% rename from LiteLoader/Header/MC/RepeaterCapacitor.hpp rename to LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp index 3cba30b..07ad446 100644 --- a/LiteLoader/Header/MC/RepeaterCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ProducerComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ReplaceItemCommand.hpp b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ReplaceItemCommand.hpp rename to LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp index ad159c9..82142ed 100644 --- a/LiteLoader/Header/MC/ReplaceItemCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RequestChunkRadiusPacket.hpp b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/RequestChunkRadiusPacket.hpp rename to LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp index 0de51ce..625beba 100644 --- a/LiteLoader/Header/MC/RequestChunkRadiusPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResetEventObj.hpp b/LiteLoader/include/llapi/mc/ResetEventObj.hpp similarity index 95% rename from LiteLoader/Header/MC/ResetEventObj.hpp rename to LiteLoader/include/llapi/mc/ResetEventObj.hpp index 967c7a0..3efecb3 100644 --- a/LiteLoader/Header/MC/ResetEventObj.hpp +++ b/LiteLoader/include/llapi/mc/ResetEventObj.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceDefinition.hpp b/LiteLoader/include/llapi/mc/ResourceDefinition.hpp similarity index 90% rename from LiteLoader/Header/MC/ResourceDefinition.hpp rename to LiteLoader/include/llapi/mc/ResourceDefinition.hpp index cfca358..c1c45f4 100644 --- a/LiteLoader/Header/MC/ResourceDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ResourceDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceHelper.hpp b/LiteLoader/include/llapi/mc/ResourceHelper.hpp similarity index 92% rename from LiteLoader/Header/MC/ResourceHelper.hpp rename to LiteLoader/include/llapi/mc/ResourceHelper.hpp index ce4e94d..53c8784 100644 --- a/LiteLoader/Header/MC/ResourceHelper.hpp +++ b/LiteLoader/include/llapi/mc/ResourceHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceInformation.hpp b/LiteLoader/include/llapi/mc/ResourceInformation.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourceInformation.hpp rename to LiteLoader/include/llapi/mc/ResourceInformation.hpp index ad22b51..e760ab8 100644 --- a/LiteLoader/Header/MC/ResourceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceInformation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceLoadManager.hpp b/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp similarity index 95% rename from LiteLoader/Header/MC/ResourceLoadManager.hpp rename to LiteLoader/include/llapi/mc/ResourceLoadManager.hpp index cc49e07..d92742f 100644 --- a/LiteLoader/Header/MC/ResourceLoadManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceLoader.hpp b/LiteLoader/include/llapi/mc/ResourceLoader.hpp similarity index 98% rename from LiteLoader/Header/MC/ResourceLoader.hpp rename to LiteLoader/include/llapi/mc/ResourceLoader.hpp index 736839f..7ecbc3b 100644 --- a/LiteLoader/Header/MC/ResourceLoader.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoader.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceLoaders.hpp b/LiteLoader/include/llapi/mc/ResourceLoaders.hpp similarity index 95% rename from LiteLoader/Header/MC/ResourceLoaders.hpp rename to LiteLoader/include/llapi/mc/ResourceLoaders.hpp index f07201f..5658907 100644 --- a/LiteLoader/Header/MC/ResourceLoaders.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoaders.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourceLocation.hpp rename to LiteLoader/include/llapi/mc/ResourceLocation.hpp index 957a9d9..2c214c2 100644 --- a/LiteLoader/Header/MC/ResourceLocation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLocation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "Core.hpp" diff --git a/LiteLoader/Header/MC/ResourceMetadata.hpp b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp similarity index 95% rename from LiteLoader/Header/MC/ResourceMetadata.hpp rename to LiteLoader/include/llapi/mc/ResourceMetadata.hpp index 3d95485..b4705d6 100644 --- a/LiteLoader/Header/MC/ResourceMetadata.hpp +++ b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePack.hpp b/LiteLoader/include/llapi/mc/ResourcePack.hpp similarity index 98% rename from LiteLoader/Header/MC/ResourcePack.hpp rename to LiteLoader/include/llapi/mc/ResourcePack.hpp index a9d4a37..e8ced89 100644 --- a/LiteLoader/Header/MC/ResourcePack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePack.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackChunkDataPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackChunkDataPacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp index 5509e9a..e25e4ec 100644 --- a/LiteLoader/Header/MC/ResourcePackChunkDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackChunkRequestPacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp index fef274a..7409997 100644 --- a/LiteLoader/Header/MC/ResourcePackChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackClientResponsePacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackClientResponsePacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp index 1dd33e7..9b2f964 100644 --- a/LiteLoader/Header/MC/ResourcePackClientResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackDataInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackDataInfoPacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp index b72510d..5361955 100644 --- a/LiteLoader/Header/MC/ResourcePackDataInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackFileUploadManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackFileUploadManager.hpp rename to LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp index 37f64e4..5bc7374 100644 --- a/LiteLoader/Header/MC/ResourcePackFileUploadManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "Json.hpp" #include "FileUploadManager.hpp" diff --git a/LiteLoader/Header/MC/ResourcePackInfoData.hpp b/LiteLoader/include/llapi/mc/ResourcePackInfoData.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourcePackInfoData.hpp rename to LiteLoader/include/llapi/mc/ResourcePackInfoData.hpp index 1240d9f..05cb2d4 100644 --- a/LiteLoader/Header/MC/ResourcePackInfoData.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackInfoData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackListener.hpp b/LiteLoader/include/llapi/mc/ResourcePackListener.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourcePackListener.hpp rename to LiteLoader/include/llapi/mc/ResourcePackListener.hpp index 43be3ae..04bd23c 100644 --- a/LiteLoader/Header/MC/ResourcePackListener.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp similarity index 98% rename from LiteLoader/Header/MC/ResourcePackManager.hpp rename to LiteLoader/include/llapi/mc/ResourcePackManager.hpp index fbf0113..d859db0 100644 --- a/LiteLoader/Header/MC/ResourcePackManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackRepository.hpp b/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourcePackRepository.hpp rename to LiteLoader/include/llapi/mc/ResourcePackRepository.hpp index 8e46e49..8039412 100644 --- a/LiteLoader/Header/MC/ResourcePackRepository.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA @@ -19,9 +19,9 @@ public: }; LIAPI void setCustomResourcePackPath(PackType, const std::string& path); - inline class PackSourceFactory & getPackSourceFactory(){ + inline class PackSourceFactory* getPackSourceFactory(){ //ResourcePackRepository::_initializeWorldPackSource Line62 - return dAccess(this, 46 * 8); + return dAccess(this, 46 * 8); }; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RESOURCEPACKREPOSITORY diff --git a/LiteLoader/Header/MC/ResourcePackStack.hpp b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp similarity index 98% rename from LiteLoader/Header/MC/ResourcePackStack.hpp rename to LiteLoader/include/llapi/mc/ResourcePackStack.hpp index fccbd35..1d17fcb 100644 --- a/LiteLoader/Header/MC/ResourcePackStack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackStackPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourcePackStackPacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp index a1d5350..8dda7c6 100644 --- a/LiteLoader/Header/MC/ResourcePackStackPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePackTransmissionManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourcePackTransmissionManager.hpp rename to LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp index f39e665..4a38ad4 100644 --- a/LiteLoader/Header/MC/ResourcePackTransmissionManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePacksInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ResourcePacksInfoPacket.hpp rename to LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp index 13a5583..184c58d 100644 --- a/LiteLoader/Header/MC/ResourcePacksInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourcePath.hpp b/LiteLoader/include/llapi/mc/ResourcePath.hpp similarity index 94% rename from LiteLoader/Header/MC/ResourcePath.hpp rename to LiteLoader/include/llapi/mc/ResourcePath.hpp index c65dd36..41e8b44 100644 --- a/LiteLoader/Header/MC/ResourcePath.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePath.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ResourceSignature.hpp b/LiteLoader/include/llapi/mc/ResourceSignature.hpp similarity index 97% rename from LiteLoader/Header/MC/ResourceSignature.hpp rename to LiteLoader/include/llapi/mc/ResourceSignature.hpp index 142940a..c61646b 100644 --- a/LiteLoader/Header/MC/ResourceSignature.hpp +++ b/LiteLoader/include/llapi/mc/ResourceSignature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RespawnAnchorBlock.hpp b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/RespawnAnchorBlock.hpp rename to LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp index abe3791..48e3a6e 100644 --- a/LiteLoader/Header/MC/RespawnAnchorBlock.hpp +++ b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/RespawnPacket.hpp rename to LiteLoader/include/llapi/mc/RespawnPacket.hpp index 8822d39..f8c7180 100644 --- a/LiteLoader/Header/MC/RespawnPacket.hpp +++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RestrictOpenDoorGoal.hpp b/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RestrictOpenDoorGoal.hpp rename to LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp index 14e73d6..7b499f6 100644 --- a/LiteLoader/Header/MC/RestrictOpenDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RestrictSunGoal.hpp b/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RestrictSunGoal.hpp rename to LiteLoader/include/llapi/mc/RestrictSunGoal.hpp index bade7a1..b1f4bca 100644 --- a/LiteLoader/Header/MC/RestrictSunGoal.hpp +++ b/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RideableComponent.hpp b/LiteLoader/include/llapi/mc/RideableComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/RideableComponent.hpp rename to LiteLoader/include/llapi/mc/RideableComponent.hpp index 4af8a29..708a430 100644 --- a/LiteLoader/Header/MC/RideableComponent.hpp +++ b/LiteLoader/include/llapi/mc/RideableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RideableDefinition.hpp b/LiteLoader/include/llapi/mc/RideableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RideableDefinition.hpp rename to LiteLoader/include/llapi/mc/RideableDefinition.hpp index 7106551..a649505 100644 --- a/LiteLoader/Header/MC/RideableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RideableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RiderJumpPacket.hpp b/LiteLoader/include/llapi/mc/RiderJumpPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/RiderJumpPacket.hpp rename to LiteLoader/include/llapi/mc/RiderJumpPacket.hpp index c2b4b43..079c896 100644 --- a/LiteLoader/Header/MC/RiderJumpPacket.hpp +++ b/LiteLoader/include/llapi/mc/RiderJumpPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RiseToLiquidLevelGoal.hpp b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RiseToLiquidLevelGoal.hpp rename to LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp index 5d09b78..6760417 100644 --- a/LiteLoader/Header/MC/RiseToLiquidLevelGoal.hpp +++ b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RiverFollowingGoal.hpp b/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/RiverFollowingGoal.hpp rename to LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp index ef42787..f4391da 100644 --- a/LiteLoader/Header/MC/RiverFollowingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RoleChecker.hpp b/LiteLoader/include/llapi/mc/RoleChecker.hpp similarity index 95% rename from LiteLoader/Header/MC/RoleChecker.hpp rename to LiteLoader/include/llapi/mc/RoleChecker.hpp index cf23afa..a2e8279 100644 --- a/LiteLoader/Header/MC/RoleChecker.hpp +++ b/LiteLoader/include/llapi/mc/RoleChecker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RoleCheckerCallback.hpp b/LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp similarity index 95% rename from LiteLoader/Header/MC/RoleCheckerCallback.hpp rename to LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp index 0aa8397..48e61fa 100644 --- a/LiteLoader/Header/MC/RoleCheckerCallback.hpp +++ b/LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RollGoal.hpp b/LiteLoader/include/llapi/mc/RollGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RollGoal.hpp rename to LiteLoader/include/llapi/mc/RollGoal.hpp index daa7ef8..579de44 100644 --- a/LiteLoader/Header/MC/RollGoal.hpp +++ b/LiteLoader/include/llapi/mc/RollGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RoofedTreeCanopy.hpp b/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/RoofedTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp index 6d33ca4..9f20ba3 100644 --- a/LiteLoader/Header/MC/RoofedTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RoomDefinition.hpp b/LiteLoader/include/llapi/mc/RoomDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/RoomDefinition.hpp rename to LiteLoader/include/llapi/mc/RoomDefinition.hpp index e0a3981..fe2f9bf 100644 --- a/LiteLoader/Header/MC/RoomDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RoomDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RopeAABB.hpp b/LiteLoader/include/llapi/mc/RopeAABB.hpp similarity index 95% rename from LiteLoader/Header/MC/RopeAABB.hpp rename to LiteLoader/include/llapi/mc/RopeAABB.hpp index 555e43d..abaeabd 100644 --- a/LiteLoader/Header/MC/RopeAABB.hpp +++ b/LiteLoader/include/llapi/mc/RopeAABB.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RopePoints.hpp b/LiteLoader/include/llapi/mc/RopePoints.hpp similarity index 94% rename from LiteLoader/Header/MC/RopePoints.hpp rename to LiteLoader/include/llapi/mc/RopePoints.hpp index 21938a6..0372714 100644 --- a/LiteLoader/Header/MC/RopePoints.hpp +++ b/LiteLoader/include/llapi/mc/RopePoints.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RopeSystem.hpp b/LiteLoader/include/llapi/mc/RopeSystem.hpp similarity index 97% rename from LiteLoader/Header/MC/RopeSystem.hpp rename to LiteLoader/include/llapi/mc/RopeSystem.hpp index 4e7dcf0..04850e1 100644 --- a/LiteLoader/Header/MC/RopeSystem.hpp +++ b/LiteLoader/include/llapi/mc/RopeSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RotateState.hpp b/LiteLoader/include/llapi/mc/RotateState.hpp similarity index 96% rename from LiteLoader/Header/MC/RotateState.hpp rename to LiteLoader/include/llapi/mc/RotateState.hpp index 98ec1ab..bf41171 100644 --- a/LiteLoader/Header/MC/RotateState.hpp +++ b/LiteLoader/include/llapi/mc/RotateState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PetSleepWithOwnerState.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RotatedPillarBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/RotatedPillarBlock.hpp rename to LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp index 96ed90a..298965f 100644 --- a/LiteLoader/Header/MC/RotatedPillarBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RotationDescription.hpp b/LiteLoader/include/llapi/mc/RotationDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/RotationDescription.hpp rename to LiteLoader/include/llapi/mc/RotationDescription.hpp index efe5696..c52ee8d 100644 --- a/LiteLoader/Header/MC/RotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/RotationDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RotationUtil.hpp b/LiteLoader/include/llapi/mc/RotationUtil.hpp similarity index 93% rename from LiteLoader/Header/MC/RotationUtil.hpp rename to LiteLoader/include/llapi/mc/RotationUtil.hpp index 9c8e597..5166ac4 100644 --- a/LiteLoader/Header/MC/RotationUtil.hpp +++ b/LiteLoader/include/llapi/mc/RotationUtil.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RuinedPortalFeature.hpp b/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/RuinedPortalFeature.hpp rename to LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp index 3b6e434..840217e 100644 --- a/LiteLoader/Header/MC/RuinedPortalFeature.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RuinedPortalPiece.hpp b/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/RuinedPortalPiece.hpp rename to LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp index 6dd45b0..c124d47 100644 --- a/LiteLoader/Header/MC/RuinedPortalPiece.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RuinedPortalStart.hpp b/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp similarity index 96% rename from LiteLoader/Header/MC/RuinedPortalStart.hpp rename to LiteLoader/include/llapi/mc/RuinedPortalStart.hpp index ecdbbd7..8d80805 100644 --- a/LiteLoader/Header/MC/RuinedPortalStart.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RunAroundLikeCrazyGoal.hpp b/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/RunAroundLikeCrazyGoal.hpp rename to LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp index 982b888..96c7e7c 100644 --- a/LiteLoader/Header/MC/RunAroundLikeCrazyGoal.hpp +++ b/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RuntimeIdentifierDescription.hpp b/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/RuntimeIdentifierDescription.hpp rename to LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp index 03e84cd..3083228 100644 --- a/LiteLoader/Header/MC/RuntimeIdentifierDescription.hpp +++ b/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/RuntimeLightingManager.hpp b/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp similarity index 97% rename from LiteLoader/Header/MC/RuntimeLightingManager.hpp rename to LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp index 727fc2f..9cf8832 100644 --- a/LiteLoader/Header/MC/RuntimeLightingManager.hpp +++ b/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHChestCorridor.hpp b/LiteLoader/include/llapi/mc/SHChestCorridor.hpp similarity index 97% rename from LiteLoader/Header/MC/SHChestCorridor.hpp rename to LiteLoader/include/llapi/mc/SHChestCorridor.hpp index 1e98c97..28bc341 100644 --- a/LiteLoader/Header/MC/SHChestCorridor.hpp +++ b/LiteLoader/include/llapi/mc/SHChestCorridor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHFillerCorridor.hpp b/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp similarity index 97% rename from LiteLoader/Header/MC/SHFillerCorridor.hpp rename to LiteLoader/include/llapi/mc/SHFillerCorridor.hpp index f7d71e2..b54e4cd 100644 --- a/LiteLoader/Header/MC/SHFillerCorridor.hpp +++ b/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHFiveCrossing.hpp b/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp similarity index 97% rename from LiteLoader/Header/MC/SHFiveCrossing.hpp rename to LiteLoader/include/llapi/mc/SHFiveCrossing.hpp index 5cba3a9..4accd5e 100644 --- a/LiteLoader/Header/MC/SHFiveCrossing.hpp +++ b/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHLeftTurn.hpp b/LiteLoader/include/llapi/mc/SHLeftTurn.hpp similarity index 97% rename from LiteLoader/Header/MC/SHLeftTurn.hpp rename to LiteLoader/include/llapi/mc/SHLeftTurn.hpp index 68f914e..253a8ef 100644 --- a/LiteLoader/Header/MC/SHLeftTurn.hpp +++ b/LiteLoader/include/llapi/mc/SHLeftTurn.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHLibrary.hpp b/LiteLoader/include/llapi/mc/SHLibrary.hpp similarity index 97% rename from LiteLoader/Header/MC/SHLibrary.hpp rename to LiteLoader/include/llapi/mc/SHLibrary.hpp index 67d5549..34d1e05 100644 --- a/LiteLoader/Header/MC/SHLibrary.hpp +++ b/LiteLoader/include/llapi/mc/SHLibrary.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHPortalRoom.hpp b/LiteLoader/include/llapi/mc/SHPortalRoom.hpp similarity index 96% rename from LiteLoader/Header/MC/SHPortalRoom.hpp rename to LiteLoader/include/llapi/mc/SHPortalRoom.hpp index 97cf2b5..b3da513 100644 --- a/LiteLoader/Header/MC/SHPortalRoom.hpp +++ b/LiteLoader/include/llapi/mc/SHPortalRoom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHPrisonHall.hpp b/LiteLoader/include/llapi/mc/SHPrisonHall.hpp similarity index 97% rename from LiteLoader/Header/MC/SHPrisonHall.hpp rename to LiteLoader/include/llapi/mc/SHPrisonHall.hpp index eb28e74..6dd958a 100644 --- a/LiteLoader/Header/MC/SHPrisonHall.hpp +++ b/LiteLoader/include/llapi/mc/SHPrisonHall.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHRightTurn.hpp b/LiteLoader/include/llapi/mc/SHRightTurn.hpp similarity index 97% rename from LiteLoader/Header/MC/SHRightTurn.hpp rename to LiteLoader/include/llapi/mc/SHRightTurn.hpp index 38f40de..87b33a4 100644 --- a/LiteLoader/Header/MC/SHRightTurn.hpp +++ b/LiteLoader/include/llapi/mc/SHRightTurn.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHRoomCrossing.hpp b/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp similarity index 97% rename from LiteLoader/Header/MC/SHRoomCrossing.hpp rename to LiteLoader/include/llapi/mc/SHRoomCrossing.hpp index 5e45ad3..a97d167 100644 --- a/LiteLoader/Header/MC/SHRoomCrossing.hpp +++ b/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHStairsDown.hpp b/LiteLoader/include/llapi/mc/SHStairsDown.hpp similarity index 97% rename from LiteLoader/Header/MC/SHStairsDown.hpp rename to LiteLoader/include/llapi/mc/SHStairsDown.hpp index 7a77a71..45278f8 100644 --- a/LiteLoader/Header/MC/SHStairsDown.hpp +++ b/LiteLoader/include/llapi/mc/SHStairsDown.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHStartPiece.hpp b/LiteLoader/include/llapi/mc/SHStartPiece.hpp similarity index 95% rename from LiteLoader/Header/MC/SHStartPiece.hpp rename to LiteLoader/include/llapi/mc/SHStartPiece.hpp index 599f208..80bbc0b 100644 --- a/LiteLoader/Header/MC/SHStartPiece.hpp +++ b/LiteLoader/include/llapi/mc/SHStartPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SHStairsDown.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHStraight.hpp b/LiteLoader/include/llapi/mc/SHStraight.hpp similarity index 97% rename from LiteLoader/Header/MC/SHStraight.hpp rename to LiteLoader/include/llapi/mc/SHStraight.hpp index 8d15c2f..d7fa02e 100644 --- a/LiteLoader/Header/MC/SHStraight.hpp +++ b/LiteLoader/include/llapi/mc/SHStraight.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SHStraightStairsDown.hpp b/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp similarity index 97% rename from LiteLoader/Header/MC/SHStraightStairsDown.hpp rename to LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp index b62cba1..f592968 100644 --- a/LiteLoader/Header/MC/SHStraightStairsDown.hpp +++ b/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Salmon.hpp b/LiteLoader/include/llapi/mc/Salmon.hpp similarity index 98% rename from LiteLoader/Header/MC/Salmon.hpp rename to LiteLoader/include/llapi/mc/Salmon.hpp index 40305bd..b8792a4 100644 --- a/LiteLoader/Header/MC/Salmon.hpp +++ b/LiteLoader/include/llapi/mc/Salmon.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fish.hpp" diff --git a/LiteLoader/Header/MC/SandBlock.hpp b/LiteLoader/include/llapi/mc/SandBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SandBlock.hpp rename to LiteLoader/include/llapi/mc/SandBlock.hpp index 3c4d677..e5c833e 100644 --- a/LiteLoader/Header/MC/SandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SandFeature.hpp b/LiteLoader/include/llapi/mc/SandFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/SandFeature.hpp rename to LiteLoader/include/llapi/mc/SandFeature.hpp index 5730204..2049da4 100644 --- a/LiteLoader/Header/MC/SandFeature.hpp +++ b/LiteLoader/include/llapi/mc/SandFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SandStoneBlock.hpp b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SandStoneBlock.hpp rename to LiteLoader/include/llapi/mc/SandStoneBlock.hpp index 7b34e21..ccbaebd 100644 --- a/LiteLoader/Header/MC/SandStoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Sapling.hpp b/LiteLoader/include/llapi/mc/Sapling.hpp similarity index 99% rename from LiteLoader/Header/MC/Sapling.hpp rename to LiteLoader/include/llapi/mc/Sapling.hpp index 052aa96..19cec2b 100644 --- a/LiteLoader/Header/MC/Sapling.hpp +++ b/LiteLoader/include/llapi/mc/Sapling.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SaplingBlockItem.hpp b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SaplingBlockItem.hpp rename to LiteLoader/include/llapi/mc/SaplingBlockItem.hpp index 468169e..6f8d7e9 100644 --- a/LiteLoader/Header/MC/SaplingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SaveCommand.hpp b/LiteLoader/include/llapi/mc/SaveCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/SaveCommand.hpp rename to LiteLoader/include/llapi/mc/SaveCommand.hpp index 8693bbf..48e2d18 100644 --- a/LiteLoader/Header/MC/SaveCommand.hpp +++ b/LiteLoader/include/llapi/mc/SaveCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SaveTransactionManager.hpp b/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp similarity index 95% rename from LiteLoader/Header/MC/SaveTransactionManager.hpp rename to LiteLoader/include/llapi/mc/SaveTransactionManager.hpp index 084d21b..5553922 100644 --- a/LiteLoader/Header/MC/SaveTransactionManager.hpp +++ b/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SavedData.hpp b/LiteLoader/include/llapi/mc/SavedData.hpp similarity index 94% rename from LiteLoader/Header/MC/SavedData.hpp rename to LiteLoader/include/llapi/mc/SavedData.hpp index 9ad9a7f..516ba4c 100644 --- a/LiteLoader/Header/MC/SavedData.hpp +++ b/LiteLoader/include/llapi/mc/SavedData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SavedDataStorage.hpp b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp similarity index 95% rename from LiteLoader/Header/MC/SavedDataStorage.hpp rename to LiteLoader/include/llapi/mc/SavedDataStorage.hpp index 270ec0c..57dd3ca 100644 --- a/LiteLoader/Header/MC/SavedDataStorage.hpp +++ b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SayCommand.hpp b/LiteLoader/include/llapi/mc/SayCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SayCommand.hpp rename to LiteLoader/include/llapi/mc/SayCommand.hpp index 31c1fee..db340eb 100644 --- a/LiteLoader/Header/MC/SayCommand.hpp +++ b/LiteLoader/include/llapi/mc/SayCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaffoldingBlock.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ScaffoldingBlock.hpp rename to LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp index 4e57831..624ae56 100644 --- a/LiteLoader/Header/MC/ScaffoldingBlock.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaffoldingBlockItem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ScaffoldingBlockItem.hpp rename to LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp index 838373e..5be153c 100644 --- a/LiteLoader/Header/MC/ScaffoldingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaffoldingClimberComponent.hpp b/LiteLoader/include/llapi/mc/ScaffoldingClimberComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScaffoldingClimberComponent.hpp rename to LiteLoader/include/llapi/mc/ScaffoldingClimberComponent.hpp index a286d6e..4387511 100644 --- a/LiteLoader/Header/MC/ScaffoldingClimberComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingClimberComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaffoldingClimberSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingClimberSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/ScaffoldingClimberSystem.hpp rename to LiteLoader/include/llapi/mc/ScaffoldingClimberSystem.hpp index 21ae550..2dfd239 100644 --- a/LiteLoader/Header/MC/ScaffoldingClimberSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingClimberSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaleByAgeComponent.hpp b/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ScaleByAgeComponent.hpp rename to LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp index 33eecc1..15c9ece 100644 --- a/LiteLoader/Header/MC/ScaleByAgeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaleByAgeSystem.hpp b/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/ScaleByAgeSystem.hpp rename to LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp index 577b8ea..7bd90c0 100644 --- a/LiteLoader/Header/MC/ScaleByAgeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaleDescription.hpp b/LiteLoader/include/llapi/mc/ScaleDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/ScaleDescription.hpp rename to LiteLoader/include/llapi/mc/ScaleDescription.hpp index 2f5895a..3fc2f15 100644 --- a/LiteLoader/Header/MC/ScaleDescription.hpp +++ b/LiteLoader/include/llapi/mc/ScaleDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScaredGoal.hpp b/LiteLoader/include/llapi/mc/ScaredGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ScaredGoal.hpp rename to LiteLoader/include/llapi/mc/ScaredGoal.hpp index d14b3ae..38183c1 100644 --- a/LiteLoader/Header/MC/ScaredGoal.hpp +++ b/LiteLoader/include/llapi/mc/ScaredGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScatterFeature.hpp b/LiteLoader/include/llapi/mc/ScatterFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/ScatterFeature.hpp rename to LiteLoader/include/llapi/mc/ScatterFeature.hpp index 6b1f8b6..56cfc94 100644 --- a/LiteLoader/Header/MC/ScatterFeature.hpp +++ b/LiteLoader/include/llapi/mc/ScatterFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScatterParams.hpp b/LiteLoader/include/llapi/mc/ScatterParams.hpp similarity index 96% rename from LiteLoader/Header/MC/ScatterParams.hpp rename to LiteLoader/include/llapi/mc/ScatterParams.hpp index bfc6f9b..bc55305 100644 --- a/LiteLoader/Header/MC/ScatterParams.hpp +++ b/LiteLoader/include/llapi/mc/ScatterParams.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScatteredFeaturePiece.hpp b/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp similarity index 96% rename from LiteLoader/Header/MC/ScatteredFeaturePiece.hpp rename to LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp index 5795f0e..491b1d2 100644 --- a/LiteLoader/Header/MC/ScatteredFeaturePiece.hpp +++ b/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScatteredFeatureStart.hpp b/LiteLoader/include/llapi/mc/ScatteredFeatureStart.hpp similarity index 96% rename from LiteLoader/Header/MC/ScatteredFeatureStart.hpp rename to LiteLoader/include/llapi/mc/ScatteredFeatureStart.hpp index e9c6332..0e1d532 100644 --- a/LiteLoader/Header/MC/ScatteredFeatureStart.hpp +++ b/LiteLoader/include/llapi/mc/ScatteredFeatureStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Scheduler.hpp b/LiteLoader/include/llapi/mc/Scheduler.hpp similarity index 96% rename from LiteLoader/Header/MC/Scheduler.hpp rename to LiteLoader/include/llapi/mc/Scheduler.hpp index 476af65..3c60b7d 100644 --- a/LiteLoader/Header/MC/Scheduler.hpp +++ b/LiteLoader/include/llapi/mc/Scheduler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SchedulerDefinition.hpp b/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SchedulerDefinition.hpp rename to LiteLoader/include/llapi/mc/SchedulerDefinition.hpp index 12c372a..f67b1c2 100644 --- a/LiteLoader/Header/MC/SchedulerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SchedulerSystem.hpp b/LiteLoader/include/llapi/mc/SchedulerSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/SchedulerSystem.hpp rename to LiteLoader/include/llapi/mc/SchedulerSystem.hpp index d77e08c..c7ce4c3 100644 --- a/LiteLoader/Header/MC/SchedulerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SchedulerSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScorePacketInfo.hpp b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp similarity index 97% rename from LiteLoader/Header/MC/ScorePacketInfo.hpp rename to LiteLoader/include/llapi/mc/ScorePacketInfo.hpp index 16a1b41..d20eab9 100644 --- a/LiteLoader/Header/MC/ScorePacketInfo.hpp +++ b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "ScoreboardId.hpp" diff --git a/LiteLoader/Header/MC/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp similarity index 99% rename from LiteLoader/Header/MC/Scoreboard.hpp rename to LiteLoader/include/llapi/mc/Scoreboard.hpp index 964465b..a81952b 100644 --- a/LiteLoader/Header/MC/Scoreboard.hpp +++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Add include headers & pre-declares diff --git a/LiteLoader/Header/MC/ScoreboardCommand.hpp b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp similarity index 99% rename from LiteLoader/Header/MC/ScoreboardCommand.hpp rename to LiteLoader/include/llapi/mc/ScoreboardCommand.hpp index bfbd0d5..55c56b6 100644 --- a/LiteLoader/Header/MC/ScoreboardCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScoreboardId.hpp b/LiteLoader/include/llapi/mc/ScoreboardId.hpp similarity index 97% rename from LiteLoader/Header/MC/ScoreboardId.hpp rename to LiteLoader/include/llapi/mc/ScoreboardId.hpp index f2c6d83..0ecb3d7 100644 --- a/LiteLoader/Header/MC/ScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardId.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScoreboardIdentityRef.hpp b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp similarity index 97% rename from LiteLoader/Header/MC/ScoreboardIdentityRef.hpp rename to LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp index 89dc87d..16155b9 100644 --- a/LiteLoader/Header/MC/ScoreboardIdentityRef.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScreenCapabilitiesRepo.hpp b/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp similarity index 95% rename from LiteLoader/Header/MC/ScreenCapabilitiesRepo.hpp rename to LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp index 4d3c04a..b3a5095 100644 --- a/LiteLoader/Header/MC/ScreenCapabilitiesRepo.hpp +++ b/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScreenHandlerBase.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp similarity index 96% rename from LiteLoader/Header/MC/ScreenHandlerBase.hpp rename to LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp index 1e346b2..9f989d6 100644 --- a/LiteLoader/Header/MC/ScreenHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScreenHandlerBeacon.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp similarity index 96% rename from LiteLoader/Header/MC/ScreenHandlerBeacon.hpp rename to LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp index ef385d8..81e4958 100644 --- a/LiteLoader/Header/MC/ScreenHandlerBeacon.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScreenHandlerLabTable.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp similarity index 96% rename from LiteLoader/Header/MC/ScreenHandlerLabTable.hpp rename to LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp index f2b13fc..b8f5a53 100644 --- a/LiteLoader/Header/MC/ScreenHandlerLabTable.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptActorAreaBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptActorAreaBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptActorAreaBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptActorAreaBinderComponent.hpp index 57037e8..7016139 100644 --- a/LiteLoader/Header/MC/ScriptActorAreaBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptActorAreaBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptActorUniqueIdBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptActorUniqueIdBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptActorUniqueIdBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptActorUniqueIdBinderComponent.hpp index 3a2bdcc..1359662 100644 --- a/LiteLoader/Header/MC/ScriptActorUniqueIdBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptActorUniqueIdBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptApi.hpp b/LiteLoader/include/llapi/mc/ScriptApi.hpp similarity index 99% rename from LiteLoader/Header/MC/ScriptApi.hpp rename to LiteLoader/include/llapi/mc/ScriptApi.hpp index bdd0d07..bc37593 100644 --- a/LiteLoader/Header/MC/ScriptApi.hpp +++ b/LiteLoader/include/llapi/mc/ScriptApi.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptArmorContainerComponent.hpp b/LiteLoader/include/llapi/mc/ScriptArmorContainerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptArmorContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptArmorContainerComponent.hpp index c52ac18..645da35 100644 --- a/LiteLoader/Header/MC/ScriptArmorContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptArmorContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptAttackComponent.hpp b/LiteLoader/include/llapi/mc/ScriptAttackComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptAttackComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptAttackComponent.hpp index 33b3194..e2e4dbc 100644 --- a/LiteLoader/Header/MC/ScriptAttackComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptAttackComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderActorTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderActorTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderActorTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderActorTemplate.hpp index 182abf4..e51751e 100644 --- a/LiteLoader/Header/MC/ScriptBinderActorTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderActorTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderActorTickingAreaTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderActorTickingAreaTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderActorTickingAreaTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderActorTickingAreaTemplate.hpp index aa0c758..f188d6b 100644 --- a/LiteLoader/Header/MC/ScriptBinderActorTickingAreaTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderActorTickingAreaTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderBlockTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderBlockTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderBlockTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderBlockTemplate.hpp index d340559..4d989f9 100644 --- a/LiteLoader/Header/MC/ScriptBinderBlockTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderBlockTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptBinderComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderComponent.hpp index 29f7f31..304bb73 100644 --- a/LiteLoader/Header/MC/ScriptBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderComponentTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderComponentTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderComponentTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderComponentTemplate.hpp index bd7b77c..eb633bb 100644 --- a/LiteLoader/Header/MC/ScriptBinderComponentTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderComponentTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderEventDataTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderEventDataTemplate.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptBinderEventDataTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderEventDataTemplate.hpp index 9e7b0a2..076ba65 100644 --- a/LiteLoader/Header/MC/ScriptBinderEventDataTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderEventDataTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderItemActorTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderItemActorTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderItemActorTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderItemActorTemplate.hpp index 3ea2dd7..50da22c 100644 --- a/LiteLoader/Header/MC/ScriptBinderItemActorTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderItemActorTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderItemStackTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderItemStackTemplate.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptBinderItemStackTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderItemStackTemplate.hpp index 88670a3..3ce325f 100644 --- a/LiteLoader/Header/MC/ScriptBinderItemStackTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderItemStackTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderLevelTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderLevelTemplate.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptBinderLevelTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderLevelTemplate.hpp index c485553..cc796ab 100644 --- a/LiteLoader/Header/MC/ScriptBinderLevelTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderLevelTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderLevelTickingAreaTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderLevelTickingAreaTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderLevelTickingAreaTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderLevelTickingAreaTemplate.hpp index c5dcab3..26d90d1 100644 --- a/LiteLoader/Header/MC/ScriptBinderLevelTickingAreaTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderLevelTickingAreaTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderPureEcsTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderPureEcsTemplate.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBinderPureEcsTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderPureEcsTemplate.hpp index 728749b..80213f0 100644 --- a/LiteLoader/Header/MC/ScriptBinderPureEcsTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderPureEcsTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderQueryTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderQueryTemplate.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptBinderQueryTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderQueryTemplate.hpp index 32712c3..9bdc47f 100644 --- a/LiteLoader/Header/MC/ScriptBinderQueryTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderQueryTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderTemplate.hpp b/LiteLoader/include/llapi/mc/ScriptBinderTemplate.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptBinderTemplate.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderTemplate.hpp index 3f6dd64..636c45f 100644 --- a/LiteLoader/Header/MC/ScriptBinderTemplate.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBinderTemplateController.hpp b/LiteLoader/include/llapi/mc/ScriptBinderTemplateController.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptBinderTemplateController.hpp rename to LiteLoader/include/llapi/mc/ScriptBinderTemplateController.hpp index 1aab3ff..c8f5a17 100644 --- a/LiteLoader/Header/MC/ScriptBinderTemplateController.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBinderTemplateController.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBlockContainerComponent.hpp b/LiteLoader/include/llapi/mc/ScriptBlockContainerComponent.hpp similarity index 99% rename from LiteLoader/Header/MC/ScriptBlockContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptBlockContainerComponent.hpp index 6f84810..540ca88 100644 --- a/LiteLoader/Header/MC/ScriptBlockContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBlockPositionBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptBlockPositionBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptBlockPositionBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptBlockPositionBinderComponent.hpp index 57857e0..2c69ed6 100644 --- a/LiteLoader/Header/MC/ScriptBlockPositionBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockPositionBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptBlockStateComponent.hpp b/LiteLoader/include/llapi/mc/ScriptBlockStateComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptBlockStateComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptBlockStateComponent.hpp index 12229d0..8bc885b 100644 --- a/LiteLoader/Header/MC/ScriptBlockStateComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockStateComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCollisionBoxComponent.hpp b/LiteLoader/include/llapi/mc/ScriptCollisionBoxComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptCollisionBoxComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptCollisionBoxComponent.hpp index b3bce05..13933b8 100644 --- a/LiteLoader/Header/MC/ScriptCollisionBoxComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCollisionBoxComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCommand.hpp b/LiteLoader/include/llapi/mc/ScriptCommand.hpp similarity index 94% rename from LiteLoader/Header/MC/ScriptCommand.hpp rename to LiteLoader/include/llapi/mc/ScriptCommand.hpp index 8fdbaa9..23fd785 100644 --- a/LiteLoader/Header/MC/ScriptCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCommandCallbackData.hpp b/LiteLoader/include/llapi/mc/ScriptCommandCallbackData.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptCommandCallbackData.hpp rename to LiteLoader/include/llapi/mc/ScriptCommandCallbackData.hpp index 28bc578..89037e7 100644 --- a/LiteLoader/Header/MC/ScriptCommandCallbackData.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandCallbackData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCommandFactory.hpp b/LiteLoader/include/llapi/mc/ScriptCommandFactory.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptCommandFactory.hpp rename to LiteLoader/include/llapi/mc/ScriptCommandFactory.hpp index 2655b2a..cd1304f 100644 --- a/LiteLoader/Header/MC/ScriptCommandFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp index a385ef0..6227d15 100644 --- a/LiteLoader/Header/MC/ScriptCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/ScriptComponentBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptComponentBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptComponentBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptComponentBinderComponent.hpp index c34a571..507fec7 100644 --- a/LiteLoader/Header/MC/ScriptComponentBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptComponentBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptCustomEventPacket.hpp b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptCustomEventPacket.hpp rename to LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp index 488b8e3..d07a207 100644 --- a/LiteLoader/Header/MC/ScriptCustomEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptDamageSensorComponent.hpp b/LiteLoader/include/llapi/mc/ScriptDamageSensorComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptDamageSensorComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptDamageSensorComponent.hpp index 94ef5de..c71e389 100644 --- a/LiteLoader/Header/MC/ScriptDamageSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDamageSensorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptDimensionBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptDimensionBinderComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptDimensionBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptDimensionBinderComponent.hpp index 994e79c..f0f75b8 100644 --- a/LiteLoader/Header/MC/ScriptDimensionBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDimensionBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEcsBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptEcsBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptEcsBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptEcsBinderComponent.hpp index 483f3dc..8ca3124 100644 --- a/LiteLoader/Header/MC/ScriptEcsBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEcsBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEngine.hpp b/LiteLoader/include/llapi/mc/ScriptEngine.hpp similarity index 99% rename from LiteLoader/Header/MC/ScriptEngine.hpp rename to LiteLoader/include/llapi/mc/ScriptEngine.hpp index 18379a6..b27bca8 100644 --- a/LiteLoader/Header/MC/ScriptEngine.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEngine.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/ScriptEquipmentComponent.hpp b/LiteLoader/include/llapi/mc/ScriptEquipmentComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptEquipmentComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptEquipmentComponent.hpp index 5743438..faf5c94 100644 --- a/LiteLoader/Header/MC/ScriptEquipmentComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEquipmentComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEquippableComponent.hpp b/LiteLoader/include/llapi/mc/ScriptEquippableComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptEquippableComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptEquippableComponent.hpp index 04f2e6b..de4839f 100644 --- a/LiteLoader/Header/MC/ScriptEquippableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEquippableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScriptEventCoordinator.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/ScriptEventCoordinator.hpp index 98dde30..9239467 100644 --- a/LiteLoader/Header/MC/ScriptEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEventData.hpp b/LiteLoader/include/llapi/mc/ScriptEventData.hpp similarity index 94% rename from LiteLoader/Header/MC/ScriptEventData.hpp rename to LiteLoader/include/llapi/mc/ScriptEventData.hpp index 10f35dd..ddd68a3 100644 --- a/LiteLoader/Header/MC/ScriptEventData.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEventDataBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptEventDataBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptEventDataBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptEventDataBinderComponent.hpp index f4e4a54..b3f9fc6 100644 --- a/LiteLoader/Header/MC/ScriptEventDataBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventDataBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptEventListener.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptEventListener.hpp index c9e23c4..47c677c 100644 --- a/LiteLoader/Header/MC/ScriptEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptExplodeComponent.hpp b/LiteLoader/include/llapi/mc/ScriptExplodeComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptExplodeComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptExplodeComponent.hpp index 07b09de..488160f 100644 --- a/LiteLoader/Header/MC/ScriptExplodeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptExplodeComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptHandContainerComponent.hpp b/LiteLoader/include/llapi/mc/ScriptHandContainerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptHandContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptHandContainerComponent.hpp index aa8bf61..55597a9 100644 --- a/LiteLoader/Header/MC/ScriptHandContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptHandContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptHealableComponent.hpp b/LiteLoader/include/llapi/mc/ScriptHealableComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptHealableComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptHealableComponent.hpp index bb820ac..90cd136 100644 --- a/LiteLoader/Header/MC/ScriptHealableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptHealableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptHealthComponent.hpp b/LiteLoader/include/llapi/mc/ScriptHealthComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptHealthComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptHealthComponent.hpp index c590180..e6ef163 100644 --- a/LiteLoader/Header/MC/ScriptHealthComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptHealthComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptHotbarContainerComponent.hpp b/LiteLoader/include/llapi/mc/ScriptHotbarContainerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptHotbarContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptHotbarContainerComponent.hpp index d4c3298..b81c52e 100644 --- a/LiteLoader/Header/MC/ScriptHotbarContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptHotbarContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptIdentifierBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptIdentifierBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptIdentifierBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptIdentifierBinderComponent.hpp index 9802870..7470cd1 100644 --- a/LiteLoader/Header/MC/ScriptIdentifierBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptIdentifierBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptInteractComponent.hpp b/LiteLoader/include/llapi/mc/ScriptInteractComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptInteractComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptInteractComponent.hpp index 3007f11..395e7dd 100644 --- a/LiteLoader/Header/MC/ScriptInteractComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptInteractComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptInventoryComponent.hpp b/LiteLoader/include/llapi/mc/ScriptInventoryComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptInventoryComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptInventoryComponent.hpp index 36bf21f..fc11c90 100644 --- a/LiteLoader/Header/MC/ScriptInventoryComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptInventoryComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptInventoryContainerComponent.hpp b/LiteLoader/include/llapi/mc/ScriptInventoryContainerComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptInventoryContainerComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptInventoryContainerComponent.hpp index b2b2467..178c766 100644 --- a/LiteLoader/Header/MC/ScriptInventoryContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptInventoryContainerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptItemStackBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptItemStackBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptItemStackBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptItemStackBinderComponent.hpp index f872eae..2376987 100644 --- a/LiteLoader/Header/MC/ScriptItemStackBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptItemStackBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptLevelAreaBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptLevelAreaBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptLevelAreaBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptLevelAreaBinderComponent.hpp index b7433bb..81af838 100644 --- a/LiteLoader/Header/MC/ScriptLevelAreaBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLevelAreaBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptLevelBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptLevelBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptLevelBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptLevelBinderComponent.hpp index 7da5e8d..fa21315 100644 --- a/LiteLoader/Header/MC/ScriptLevelBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLevelBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptLevelTickingAreasComponent.hpp b/LiteLoader/include/llapi/mc/ScriptLevelTickingAreasComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptLevelTickingAreasComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptLevelTickingAreasComponent.hpp index 2f5b7f0..3f71dd4 100644 --- a/LiteLoader/Header/MC/ScriptLevelTickingAreasComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLevelTickingAreasComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #include "ScriptBlockContainerComponent.hpp" diff --git a/LiteLoader/Header/MC/ScriptLevelWeatherComponent.hpp b/LiteLoader/include/llapi/mc/ScriptLevelWeatherComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptLevelWeatherComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptLevelWeatherComponent.hpp index 7ca2dbe..3cc2266 100644 --- a/LiteLoader/Header/MC/ScriptLevelWeatherComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLevelWeatherComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #include "ScriptBlockContainerComponent.hpp" diff --git a/LiteLoader/Header/MC/ScriptLevelWeatherEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptLevelWeatherEventListener.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptLevelWeatherEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptLevelWeatherEventListener.hpp index 264f95e..ff5105a 100644 --- a/LiteLoader/Header/MC/ScriptLevelWeatherEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLevelWeatherEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptLookAtComponent.hpp b/LiteLoader/include/llapi/mc/ScriptLookAtComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptLookAtComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptLookAtComponent.hpp index b2cf503..42e5a05 100644 --- a/LiteLoader/Header/MC/ScriptLookAtComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptLookAtComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptNameableComponent.hpp b/LiteLoader/include/llapi/mc/ScriptNameableComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptNameableComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptNameableComponent.hpp index bad9058..ef9d1f2 100644 --- a/LiteLoader/Header/MC/ScriptNameableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptNameableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptObjectBinder.hpp b/LiteLoader/include/llapi/mc/ScriptObjectBinder.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptObjectBinder.hpp rename to LiteLoader/include/llapi/mc/ScriptObjectBinder.hpp index 475dc7c..7b3b395 100644 --- a/LiteLoader/Header/MC/ScriptObjectBinder.hpp +++ b/LiteLoader/include/llapi/mc/ScriptObjectBinder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptPositionComponent.hpp b/LiteLoader/include/llapi/mc/ScriptPositionComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptPositionComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptPositionComponent.hpp index 4e63d96..d59947e 100644 --- a/LiteLoader/Header/MC/ScriptPositionComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPositionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptQueries.hpp b/LiteLoader/include/llapi/mc/ScriptQueries.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptQueries.hpp rename to LiteLoader/include/llapi/mc/ScriptQueries.hpp index b9e61db..9b9a7b3 100644 --- a/LiteLoader/Header/MC/ScriptQueries.hpp +++ b/LiteLoader/include/llapi/mc/ScriptQueries.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptQueryBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptQueryBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptQueryBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptQueryBinderComponent.hpp index a5aa998..961aa70 100644 --- a/LiteLoader/Header/MC/ScriptQueryBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptQueryBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptQueryComponent.hpp b/LiteLoader/include/llapi/mc/ScriptQueryComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptQueryComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptQueryComponent.hpp index 6d3bd38..f2931ef 100644 --- a/LiteLoader/Header/MC/ScriptQueryComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptQueryComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptRotationComponent.hpp b/LiteLoader/include/llapi/mc/ScriptRotationComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptRotationComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptRotationComponent.hpp index 0955825..d1f1992 100644 --- a/LiteLoader/Header/MC/ScriptRotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptRotationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorAcquiredItemEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorAcquiredItemEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorAcquiredItemEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorAcquiredItemEvent.hpp index d66d179..bd4b94d 100644 --- a/LiteLoader/Header/MC/ScriptServerActorAcquiredItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorAcquiredItemEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorAttackEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorAttackEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorAttackEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorAttackEvent.hpp index 2e563b9..255cdbb 100644 --- a/LiteLoader/Header/MC/ScriptServerActorAttackEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorAttackEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorCarriedItemChangedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorCarriedItemChangedEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerActorCarriedItemChangedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorCarriedItemChangedEvent.hpp index c96e878..659632a 100644 --- a/LiteLoader/Header/MC/ScriptServerActorCarriedItemChangedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorCarriedItemChangedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorCreatedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorCreatedEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorCreatedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorCreatedEvent.hpp index db4f98e..e565f85 100644 --- a/LiteLoader/Header/MC/ScriptServerActorCreatedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorCreatedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorDeathEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorDeathEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorDeathEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorDeathEvent.hpp index b82b7f8..42da50b 100644 --- a/LiteLoader/Header/MC/ScriptServerActorDeathEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorDeathEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorDefinitionEventTriggeredEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorDefinitionEventTriggeredEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerActorDefinitionEventTriggeredEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorDefinitionEventTriggeredEvent.hpp index e2a119f..364e95e 100644 --- a/LiteLoader/Header/MC/ScriptServerActorDefinitionEventTriggeredEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorDefinitionEventTriggeredEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorDroppedItemEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorDroppedItemEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorDroppedItemEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorDroppedItemEvent.hpp index d6b726a..1f087ff 100644 --- a/LiteLoader/Header/MC/ScriptServerActorDroppedItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorDroppedItemEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorEquippedArmorEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorEquippedArmorEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorEquippedArmorEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorEquippedArmorEvent.hpp index 5a71e31..d2b52bf 100644 --- a/LiteLoader/Header/MC/ScriptServerActorEquippedArmorEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorEquippedArmorEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptServerActorEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorEventListener.hpp index 587a091..e534745 100644 --- a/LiteLoader/Header/MC/ScriptServerActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorHurtEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorHurtEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorHurtEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorHurtEvent.hpp index 4e14df3..ed19683 100644 --- a/LiteLoader/Header/MC/ScriptServerActorHurtEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorHurtEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorMoveEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorMoveEvent.hpp similarity index 95% rename from LiteLoader/Header/MC/ScriptServerActorMoveEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorMoveEvent.hpp index 847c7fe..c1a532d 100644 --- a/LiteLoader/Header/MC/ScriptServerActorMoveEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorMoveEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorRemovedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorRemovedEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorRemovedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorRemovedEvent.hpp index 8b63cc1..0564619 100644 --- a/LiteLoader/Header/MC/ScriptServerActorRemovedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorRemovedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorSneakChangedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorSneakChangedEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorSneakChangedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorSneakChangedEvent.hpp index c417bf4..f880eaa 100644 --- a/LiteLoader/Header/MC/ScriptServerActorSneakChangedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorSneakChangedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorStartRidingEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorStartRidingEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorStartRidingEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorStartRidingEvent.hpp index 8dff94d..2b6e249 100644 --- a/LiteLoader/Header/MC/ScriptServerActorStartRidingEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorStartRidingEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorStopRidingEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorStopRidingEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorStopRidingEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorStopRidingEvent.hpp index aba0cf0..d0f8201 100644 --- a/LiteLoader/Header/MC/ScriptServerActorStopRidingEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorStopRidingEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorTickEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorTickEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorTickEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorTickEvent.hpp index 01b79b4..98ca1d1 100644 --- a/LiteLoader/Header/MC/ScriptServerActorTickEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorTickEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerActorUseItemEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerActorUseItemEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerActorUseItemEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerActorUseItemEvent.hpp index c44390c..d118ff2 100644 --- a/LiteLoader/Header/MC/ScriptServerActorUseItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerActorUseItemEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockDestructionStartedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStartedEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerBlockDestructionStartedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStartedEvent.hpp index 3e36820..aafdc28 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockDestructionStartedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStartedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockDestructionStoppedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStoppedEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerBlockDestructionStoppedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStoppedEvent.hpp index f400c45..a4d6a32 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockDestructionStoppedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockDestructionStoppedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptServerBlockEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockEventListener.hpp index e87deb9..d87df81 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PistonBlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockExplodedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockExplodedEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerBlockExplodedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockExplodedEvent.hpp index f0453a0..b91a388 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockExplodedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockExplodedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockInteractedWithEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockInteractedWithEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerBlockInteractedWithEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockInteractedWithEvent.hpp index 798f9b1..1dca965 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockInteractedWithEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockInteractedWithEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBlockMovedByPistonEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBlockMovedByPistonEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerBlockMovedByPistonEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBlockMovedByPistonEvent.hpp index f86f9f8..40ed1f4 100644 --- a/LiteLoader/Header/MC/ScriptServerBlockMovedByPistonEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBlockMovedByPistonEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBroadcastActorDefinitionEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerBroadcastActorDefinitionEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerBroadcastActorDefinitionEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBroadcastActorDefinitionEvent.hpp index ff20cc6..ed939e4 100644 --- a/LiteLoader/Header/MC/ScriptServerBroadcastActorDefinitionEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBroadcastActorDefinitionEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerBroadcastReceived.hpp b/LiteLoader/include/llapi/mc/ScriptServerBroadcastReceived.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerBroadcastReceived.hpp rename to LiteLoader/include/llapi/mc/ScriptServerBroadcastReceived.hpp index e7132c3..937d744 100644 --- a/LiteLoader/Header/MC/ScriptServerBroadcastReceived.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerBroadcastReceived.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerChatReceived.hpp b/LiteLoader/include/llapi/mc/ScriptServerChatReceived.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerChatReceived.hpp rename to LiteLoader/include/llapi/mc/ScriptServerChatReceived.hpp index ff2f2e3..29d576f 100644 --- a/LiteLoader/Header/MC/ScriptServerChatReceived.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerChatReceived.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerCommandReceived.hpp b/LiteLoader/include/llapi/mc/ScriptServerCommandReceived.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerCommandReceived.hpp rename to LiteLoader/include/llapi/mc/ScriptServerCommandReceived.hpp index 50ae974..35629e0 100644 --- a/LiteLoader/Header/MC/ScriptServerCommandReceived.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerCommandReceived.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerLevelEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptServerLevelEventListener.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerLevelEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptServerLevelEventListener.hpp index a799abb..3616490 100644 --- a/LiteLoader/Header/MC/ScriptServerLevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerLevelEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerLoggerConfigReceivedEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerLoggerConfigReceivedEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerLoggerConfigReceivedEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerLoggerConfigReceivedEvent.hpp index b9bfb6f..ef94f3b 100644 --- a/LiteLoader/Header/MC/ScriptServerLoggerConfigReceivedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerLoggerConfigReceivedEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerPacketEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptServerPacketEventListener.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerPacketEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptServerPacketEventListener.hpp index 611e755..ca75f0b 100644 --- a/LiteLoader/Header/MC/ScriptServerPacketEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerPacketEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerPlaySoundEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerPlaySoundEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerPlaySoundEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerPlaySoundEvent.hpp index 21a8a31..90bd509 100644 --- a/LiteLoader/Header/MC/ScriptServerPlaySoundEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerPlaySoundEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerPlayerAttackedActorEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerPlayerAttackedActorEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerPlayerAttackedActorEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerPlayerAttackedActorEvent.hpp index bdcd731..afde787 100644 --- a/LiteLoader/Header/MC/ScriptServerPlayerAttackedActorEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerPlayerAttackedActorEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerPlayerDestroyedBlockEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerPlayerDestroyedBlockEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerPlayerDestroyedBlockEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerPlayerDestroyedBlockEvent.hpp index cb27da7..a3ad29c 100644 --- a/LiteLoader/Header/MC/ScriptServerPlayerDestroyedBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerPlayerDestroyedBlockEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerPlayerPlacedBlockEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerPlayerPlacedBlockEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerPlayerPlacedBlockEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerPlayerPlacedBlockEvent.hpp index 87d5bc9..2755eb8 100644 --- a/LiteLoader/Header/MC/ScriptServerPlayerPlacedBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerPlayerPlacedBlockEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerProjectileHitEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerProjectileHitEvent.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerProjectileHitEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerProjectileHitEvent.hpp index cd405ed..a54ae1f 100644 --- a/LiteLoader/Header/MC/ScriptServerProjectileHitEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerProjectileHitEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerSpawnParticleAttachedToActor.hpp b/LiteLoader/include/llapi/mc/ScriptServerSpawnParticleAttachedToActor.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerSpawnParticleAttachedToActor.hpp rename to LiteLoader/include/llapi/mc/ScriptServerSpawnParticleAttachedToActor.hpp index 21f5192..1e02a5f 100644 --- a/LiteLoader/Header/MC/ScriptServerSpawnParticleAttachedToActor.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerSpawnParticleAttachedToActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerSpawnParticleInWorldEvent.hpp b/LiteLoader/include/llapi/mc/ScriptServerSpawnParticleInWorldEvent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptServerSpawnParticleInWorldEvent.hpp rename to LiteLoader/include/llapi/mc/ScriptServerSpawnParticleInWorldEvent.hpp index 94c113b..0404a23 100644 --- a/LiteLoader/Header/MC/ScriptServerSpawnParticleInWorldEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerSpawnParticleInWorldEvent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptServerWeatherEventData.hpp b/LiteLoader/include/llapi/mc/ScriptServerWeatherEventData.hpp similarity index 96% rename from LiteLoader/Header/MC/ScriptServerWeatherEventData.hpp rename to LiteLoader/include/llapi/mc/ScriptServerWeatherEventData.hpp index ae1ebdc..fd7f4df 100644 --- a/LiteLoader/Header/MC/ScriptServerWeatherEventData.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerWeatherEventData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptShooterComponent.hpp b/LiteLoader/include/llapi/mc/ScriptShooterComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptShooterComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptShooterComponent.hpp index 12c6996..de1e7cf 100644 --- a/LiteLoader/Header/MC/ScriptShooterComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptShooterComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptSpawnActorComponent.hpp b/LiteLoader/include/llapi/mc/ScriptSpawnActorComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptSpawnActorComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptSpawnActorComponent.hpp index cb0cc4e..e7d63f6 100644 --- a/LiteLoader/Header/MC/ScriptSpawnActorComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptSpawnActorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTagComponent.hpp b/LiteLoader/include/llapi/mc/ScriptTagComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptTagComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptTagComponent.hpp index c22e9d7..c9084c6 100644 --- a/LiteLoader/Header/MC/ScriptTagComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTagComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTelemetryEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptTelemetryEventListener.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptTelemetryEventListener.hpp rename to LiteLoader/include/llapi/mc/ScriptTelemetryEventListener.hpp index abadcd0..c5d3679 100644 --- a/LiteLoader/Header/MC/ScriptTelemetryEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTelemetryEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTeleportComponent.hpp b/LiteLoader/include/llapi/mc/ScriptTeleportComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptTeleportComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptTeleportComponent.hpp index d80df11..1d2fba1 100644 --- a/LiteLoader/Header/MC/ScriptTeleportComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTeleportComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTickWorldComponent.hpp b/LiteLoader/include/llapi/mc/ScriptTickWorldComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptTickWorldComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptTickWorldComponent.hpp index 0f6f0a0..79d7514 100644 --- a/LiteLoader/Header/MC/ScriptTickWorldComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickWorldComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTickingAreaBinderComponent.hpp b/LiteLoader/include/llapi/mc/ScriptTickingAreaBinderComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ScriptTickingAreaBinderComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptTickingAreaBinderComponent.hpp index 6264561..a99f6d9 100644 --- a/LiteLoader/Header/MC/ScriptTickingAreaBinderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickingAreaBinderComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ScriptTickingAreaDescriptionComponent.hpp b/LiteLoader/include/llapi/mc/ScriptTickingAreaDescriptionComponent.hpp similarity index 98% rename from LiteLoader/Header/MC/ScriptTickingAreaDescriptionComponent.hpp rename to LiteLoader/include/llapi/mc/ScriptTickingAreaDescriptionComponent.hpp index a516901..217c54d 100644 --- a/LiteLoader/Header/MC/ScriptTickingAreaDescriptionComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickingAreaDescriptionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ScriptApi.hpp" #include "ScriptBlockContainerComponent.hpp" diff --git a/LiteLoader/Header/MC/SeaAnemoneFeature.hpp b/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/SeaAnemoneFeature.hpp rename to LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp index c681ea0..8ebb5c0 100644 --- a/LiteLoader/Header/MC/SeaAnemoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeaGrass.hpp b/LiteLoader/include/llapi/mc/SeaGrass.hpp similarity index 99% rename from LiteLoader/Header/MC/SeaGrass.hpp rename to LiteLoader/include/llapi/mc/SeaGrass.hpp index 7391428..263c91d 100644 --- a/LiteLoader/Header/MC/SeaGrass.hpp +++ b/LiteLoader/include/llapi/mc/SeaGrass.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeaLanternBlock.hpp b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SeaLanternBlock.hpp rename to LiteLoader/include/llapi/mc/SeaLanternBlock.hpp index bafbdc8..28af5a5 100644 --- a/LiteLoader/Header/MC/SeaLanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeaPickle.hpp b/LiteLoader/include/llapi/mc/SeaPickle.hpp similarity index 99% rename from LiteLoader/Header/MC/SeaPickle.hpp rename to LiteLoader/include/llapi/mc/SeaPickle.hpp index 2ec2afb..bcef494 100644 --- a/LiteLoader/Header/MC/SeaPickle.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickle.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeaPickleBlockItem.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SeaPickleBlockItem.hpp rename to LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp index 1e8b4e8..459cebc 100644 --- a/LiteLoader/Header/MC/SeaPickleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeaPickleFeature.hpp b/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/SeaPickleFeature.hpp rename to LiteLoader/include/llapi/mc/SeaPickleFeature.hpp index 25b2bde..fc67376 100644 --- a/LiteLoader/Header/MC/SeaPickleFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeagrassFeature.hpp b/LiteLoader/include/llapi/mc/SeagrassFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/SeagrassFeature.hpp rename to LiteLoader/include/llapi/mc/SeagrassFeature.hpp index 63a4d5a..1ac7798 100644 --- a/LiteLoader/Header/MC/SeagrassFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeagrassFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SearchFeature.hpp b/LiteLoader/include/llapi/mc/SearchFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/SearchFeature.hpp rename to LiteLoader/include/llapi/mc/SearchFeature.hpp index f692749..b574dfe 100644 --- a/LiteLoader/Header/MC/SearchFeature.hpp +++ b/LiteLoader/include/llapi/mc/SearchFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Seasons.hpp b/LiteLoader/include/llapi/mc/Seasons.hpp similarity index 95% rename from LiteLoader/Header/MC/Seasons.hpp rename to LiteLoader/include/llapi/mc/Seasons.hpp index 0a78021..f667257 100644 --- a/LiteLoader/Header/MC/Seasons.hpp +++ b/LiteLoader/include/llapi/mc/Seasons.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeatDescription.hpp b/LiteLoader/include/llapi/mc/SeatDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/SeatDescription.hpp rename to LiteLoader/include/llapi/mc/SeatDescription.hpp index c8b06b9..1461dad 100644 --- a/LiteLoader/Header/MC/SeatDescription.hpp +++ b/LiteLoader/include/llapi/mc/SeatDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SecureStorage.hpp b/LiteLoader/include/llapi/mc/SecureStorage.hpp similarity index 94% rename from LiteLoader/Header/MC/SecureStorage.hpp rename to LiteLoader/include/llapi/mc/SecureStorage.hpp index 7b9214a..d5121a6 100644 --- a/LiteLoader/Header/MC/SecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/SecureStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SeedItemComponent.hpp b/LiteLoader/include/llapi/mc/SeedItemComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/SeedItemComponent.hpp rename to LiteLoader/include/llapi/mc/SeedItemComponent.hpp index fa33254..b6dc04c 100644 --- a/LiteLoader/Header/MC/SeedItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/SeedItemComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SelectorBehaviorNode.hpp b/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp similarity index 96% rename from LiteLoader/Header/MC/SelectorBehaviorNode.hpp rename to LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp index 5f16064..855513d 100644 --- a/LiteLoader/Header/MC/SelectorBehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SelectorDefinition.hpp b/LiteLoader/include/llapi/mc/SelectorDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SelectorDefinition.hpp rename to LiteLoader/include/llapi/mc/SelectorDefinition.hpp index 055f589..819b55e 100644 --- a/LiteLoader/Header/MC/SelectorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SelectorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/SemVersion.hpp b/LiteLoader/include/llapi/mc/SemVersion.hpp similarity index 67% rename from LiteLoader/Header/MC/SemVersion.hpp rename to LiteLoader/include/llapi/mc/SemVersion.hpp index 2ec2d68..d18421d 100644 --- a/LiteLoader/Header/MC/SemVersion.hpp +++ b/LiteLoader/include/llapi/mc/SemVersion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA @@ -10,10 +10,33 @@ class SemVersion { + struct any_version_constructor { + char gap0; + }; + enum MatchType : char + { + Full = 0x0, + Partial = 0x1, + None_4 = 0x2, + }; + enum ParseOption : int + { + AllowAnyVersion = 0x0, + NoAnyVersion = 0x1, + }; + #define AFTER_EXTRA #undef AFTER_EXTRA public: + unsigned short mMajor; + unsigned short mMinor; + unsigned short mPatch; + std::string mPreRelease; + std::string mBuildMeta; + std::string mFullVersionString; + bool mValidVersion; + bool mAnyVersion; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEMVERSION #endif MCAPI SemVersion(class SemVersion const &); diff --git a/LiteLoader/Header/MC/SendEventData.hpp b/LiteLoader/include/llapi/mc/SendEventData.hpp similarity index 94% rename from LiteLoader/Header/MC/SendEventData.hpp rename to LiteLoader/include/llapi/mc/SendEventData.hpp index 255cb80..29dc256 100644 --- a/LiteLoader/Header/MC/SendEventData.hpp +++ b/LiteLoader/include/llapi/mc/SendEventData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SendEventGoal.hpp b/LiteLoader/include/llapi/mc/SendEventGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SendEventGoal.hpp rename to LiteLoader/include/llapi/mc/SendEventGoal.hpp index 1c7e844..89609f8 100644 --- a/LiteLoader/Header/MC/SendEventGoal.hpp +++ b/LiteLoader/include/llapi/mc/SendEventGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SendEventStage.hpp b/LiteLoader/include/llapi/mc/SendEventStage.hpp similarity index 94% rename from LiteLoader/Header/MC/SendEventStage.hpp rename to LiteLoader/include/llapi/mc/SendEventStage.hpp index a04af16..d6916e1 100644 --- a/LiteLoader/Header/MC/SendEventStage.hpp +++ b/LiteLoader/include/llapi/mc/SendEventStage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SensingComponent.hpp b/LiteLoader/include/llapi/mc/SensingComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/SensingComponent.hpp rename to LiteLoader/include/llapi/mc/SensingComponent.hpp index d1ab258..ba8a2a4 100644 --- a/LiteLoader/Header/MC/SensingComponent.hpp +++ b/LiteLoader/include/llapi/mc/SensingComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SensingSystem.hpp b/LiteLoader/include/llapi/mc/SensingSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/SensingSystem.hpp rename to LiteLoader/include/llapi/mc/SensingSystem.hpp index 421e8f9..dd8cfb5 100644 --- a/LiteLoader/Header/MC/SensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/SensingSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SequenceBehaviorNode.hpp b/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp similarity index 96% rename from LiteLoader/Header/MC/SequenceBehaviorNode.hpp rename to LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp index aadd098..7c1cb45 100644 --- a/LiteLoader/Header/MC/SequenceBehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SequenceDefinition.hpp b/LiteLoader/include/llapi/mc/SequenceDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SequenceDefinition.hpp rename to LiteLoader/include/llapi/mc/SequenceDefinition.hpp index b597b8c..0c80aea 100644 --- a/LiteLoader/Header/MC/SequenceDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SequenceDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/SerializedSkin.hpp b/LiteLoader/include/llapi/mc/SerializedSkin.hpp similarity index 96% rename from LiteLoader/Header/MC/SerializedSkin.hpp rename to LiteLoader/include/llapi/mc/SerializedSkin.hpp index 8fb6a5e..3a893be 100644 --- a/LiteLoader/Header/MC/SerializedSkin.hpp +++ b/LiteLoader/include/llapi/mc/SerializedSkin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerCommand.hpp b/LiteLoader/include/llapi/mc/ServerCommand.hpp similarity index 95% rename from LiteLoader/Header/MC/ServerCommand.hpp rename to LiteLoader/include/llapi/mc/ServerCommand.hpp index 64b797e..7729c07 100644 --- a/LiteLoader/Header/MC/ServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp index 2d8d9f4..77aff82 100644 --- a/LiteLoader/Header/MC/ServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/ServerCommands.hpp b/LiteLoader/include/llapi/mc/ServerCommands.hpp similarity index 92% rename from LiteLoader/Header/MC/ServerCommands.hpp rename to LiteLoader/include/llapi/mc/ServerCommands.hpp index 47e6055..5c99740 100644 --- a/LiteLoader/Header/MC/ServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommands.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerCommunicationInterface.hpp b/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerCommunicationInterface.hpp rename to LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp index 50b2d06..768e5bd 100644 --- a/LiteLoader/Header/MC/ServerCommunicationInterface.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerContentKeyProvider.hpp b/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerContentKeyProvider.hpp rename to LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp index 5d4771f..2e82fa8 100644 --- a/LiteLoader/Header/MC/ServerContentKeyProvider.hpp +++ b/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerFileChunkUploader.hpp b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerFileChunkUploader.hpp rename to LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp index 35a77be..5b723e7 100644 --- a/LiteLoader/Header/MC/ServerFileChunkUploader.hpp +++ b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "IFileChunkUploader.hpp" diff --git a/LiteLoader/Header/MC/ServerInstance.hpp b/LiteLoader/include/llapi/mc/ServerInstance.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerInstance.hpp rename to LiteLoader/include/llapi/mc/ServerInstance.hpp index c28f2fe..10b487a 100644 --- a/LiteLoader/Header/MC/ServerInstance.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstance.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #include "Core.hpp" diff --git a/LiteLoader/Header/MC/ServerInstanceEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp similarity index 96% rename from LiteLoader/Header/MC/ServerInstanceEventCoordinator.hpp rename to LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp index e65253f..f8e6175 100644 --- a/LiteLoader/Header/MC/ServerInstanceEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerInstanceEventListener.hpp b/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerInstanceEventListener.hpp rename to LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp index c9d4fd7..4fbcf89 100644 --- a/LiteLoader/Header/MC/ServerInstanceEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerLevel.hpp b/LiteLoader/include/llapi/mc/ServerLevel.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerLevel.hpp rename to LiteLoader/include/llapi/mc/ServerLevel.hpp index 5e1d101..278f167 100644 --- a/LiteLoader/Header/MC/ServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerLocator.hpp b/LiteLoader/include/llapi/mc/ServerLocator.hpp similarity index 94% rename from LiteLoader/Header/MC/ServerLocator.hpp rename to LiteLoader/include/llapi/mc/ServerLocator.hpp index c1553c5..1ec4df7 100644 --- a/LiteLoader/Header/MC/ServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/ServerLocator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerMetrics.hpp b/LiteLoader/include/llapi/mc/ServerMetrics.hpp similarity index 94% rename from LiteLoader/Header/MC/ServerMetrics.hpp rename to LiteLoader/include/llapi/mc/ServerMetrics.hpp index 03ee668..a5731b0 100644 --- a/LiteLoader/Header/MC/ServerMetrics.hpp +++ b/LiteLoader/include/llapi/mc/ServerMetrics.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerMetricsImpl.hpp b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerMetricsImpl.hpp rename to LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp index b0a49c5..424a1b1 100644 --- a/LiteLoader/Header/MC/ServerMetricsImpl.hpp +++ b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerMoveInputHandler.hpp b/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerMoveInputHandler.hpp rename to LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp index b883692..851ef87 100644 --- a/LiteLoader/Header/MC/ServerMoveInputHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveInput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp similarity index 99% rename from LiteLoader/Header/MC/ServerNetworkHandler.hpp rename to LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp index 6163498..dd2219d 100644 --- a/LiteLoader/Header/MC/ServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Automation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerPlayer.hpp b/LiteLoader/include/llapi/mc/ServerPlayer.hpp similarity index 99% rename from LiteLoader/Header/MC/ServerPlayer.hpp rename to LiteLoader/include/llapi/mc/ServerPlayer.hpp index 8bc510b..b4b52ff 100644 --- a/LiteLoader/Header/MC/ServerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Player.hpp" diff --git a/LiteLoader/Header/MC/ServerScoreboard.hpp b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp similarity index 98% rename from LiteLoader/Header/MC/ServerScoreboard.hpp rename to LiteLoader/include/llapi/mc/ServerScoreboard.hpp index 609fed4..252f525 100644 --- a/LiteLoader/Header/MC/ServerScoreboard.hpp +++ b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerSettingsRequestPacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerSettingsRequestPacket.hpp rename to LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp index f1fb78e..968e17b 100644 --- a/LiteLoader/Header/MC/ServerSettingsRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerSettingsResponsePacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerSettingsResponsePacket.hpp rename to LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp index b150253..ea42c38 100644 --- a/LiteLoader/Header/MC/ServerSettingsResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/ServerToClientHandshakePacket.hpp rename to LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp index b7ac17c..e01e866 100644 --- a/LiteLoader/Header/MC/ServerToClientHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetActorDataPacket.hpp b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetActorDataPacket.hpp rename to LiteLoader/include/llapi/mc/SetActorDataPacket.hpp index 8471ef0..cf0d038 100644 --- a/LiteLoader/Header/MC/SetActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetActorLinkPacket.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetActorLinkPacket.hpp rename to LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp index f3b4bf2..4091a36 100644 --- a/LiteLoader/Header/MC/SetActorLinkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetActorMotionPacket.hpp b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetActorMotionPacket.hpp rename to LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp index 0a9af6e..39eda11 100644 --- a/LiteLoader/Header/MC/SetActorMotionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetBannerDetailsFunction.hpp b/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/SetBannerDetailsFunction.hpp rename to LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp index 39b4f27..6847aab 100644 --- a/LiteLoader/Header/MC/SetBannerDetailsFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetBlockCommand.hpp b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SetBlockCommand.hpp rename to LiteLoader/include/llapi/mc/SetBlockCommand.hpp index 4140c6c..988e3cb 100644 --- a/LiteLoader/Header/MC/SetBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetBlockReactionComponent.hpp b/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/SetBlockReactionComponent.hpp rename to LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp index 5a453f0..f4eec38 100644 --- a/LiteLoader/Header/MC/SetBlockReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetBookContentsFunction.hpp b/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SetBookContentsFunction.hpp rename to LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp index 8436eb4..3783202 100644 --- a/LiteLoader/Header/MC/SetBookContentsFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/SetCommandsEnabledPacket.hpp b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetCommandsEnabledPacket.hpp rename to LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp index 6fbd919..c7b2b69 100644 --- a/LiteLoader/Header/MC/SetCommandsEnabledPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetDataFromColorIndexFunction.hpp b/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SetDataFromColorIndexFunction.hpp rename to LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp index 684411d..9ad8ae4 100644 --- a/LiteLoader/Header/MC/SetDataFromColorIndexFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetDefaultGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetDefaultGameTypePacket.hpp rename to LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp index d012e54..402ee08 100644 --- a/LiteLoader/Header/MC/SetDefaultGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetDifficultyPacket.hpp b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetDifficultyPacket.hpp rename to LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp index e28d2e6..0f2c4e4 100644 --- a/LiteLoader/Header/MC/SetDifficultyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetDisplayObjectivePacket.hpp b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetDisplayObjectivePacket.hpp rename to LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp index 0244020..e167551 100644 --- a/LiteLoader/Header/MC/SetDisplayObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetHealthPacket.hpp b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetHealthPacket.hpp rename to LiteLoader/include/llapi/mc/SetHealthPacket.hpp index 7386aa7..1d5962a 100644 --- a/LiteLoader/Header/MC/SetHealthPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetItemCountFunction.hpp b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/SetItemCountFunction.hpp rename to LiteLoader/include/llapi/mc/SetItemCountFunction.hpp index 757d363..13f2c9a 100644 --- a/LiteLoader/Header/MC/SetItemCountFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetItemDamageFunction.hpp b/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/SetItemDamageFunction.hpp rename to LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp index 8e27102..883947c 100644 --- a/LiteLoader/Header/MC/SetItemDamageFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetItemDataFunction.hpp b/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/SetItemDataFunction.hpp rename to LiteLoader/include/llapi/mc/SetItemDataFunction.hpp index e2efe7a..f610e1d 100644 --- a/LiteLoader/Header/MC/SetItemDataFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetItemLoreFunction.hpp b/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SetItemLoreFunction.hpp rename to LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp index 94df2cd..5312bff 100644 --- a/LiteLoader/Header/MC/SetItemLoreFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/SetItemNameFunction.hpp b/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SetItemNameFunction.hpp rename to LiteLoader/include/llapi/mc/SetItemNameFunction.hpp index e045cc4..a1c8223 100644 --- a/LiteLoader/Header/MC/SetItemNameFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/SetLastHurtByPacket.hpp b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetLastHurtByPacket.hpp rename to LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp index 6a22d2a..f81685d 100644 --- a/LiteLoader/Header/MC/SetLastHurtByPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetLocalPlayerAsInitializedPacket.hpp b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetLocalPlayerAsInitializedPacket.hpp rename to LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp index ff57692..d82aad0 100644 --- a/LiteLoader/Header/MC/SetLocalPlayerAsInitializedPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetMaxPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SetMaxPlayersCommand.hpp rename to LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp index cfe6fe1..fee3a2e 100644 --- a/LiteLoader/Header/MC/SetMaxPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetPlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetPlayerGameTypePacket.hpp rename to LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp index 2cc9548..86f24b7 100644 --- a/LiteLoader/Header/MC/SetPlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetScorePacket.hpp rename to LiteLoader/include/llapi/mc/SetScorePacket.hpp index d50fca8..eee6a0e 100644 --- a/LiteLoader/Header/MC/SetScorePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetScoreboardIdentityPacket.hpp b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetScoreboardIdentityPacket.hpp rename to LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp index c8d16a9..8c4b68a 100644 --- a/LiteLoader/Header/MC/SetScoreboardIdentityPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetSpawnEggFunction.hpp b/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SetSpawnEggFunction.hpp rename to LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp index 90251f7..e1caa8b 100644 --- a/LiteLoader/Header/MC/SetSpawnEggFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/SetSpawnPositionPacket.hpp b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetSpawnPositionPacket.hpp rename to LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp index 4f40dce..a1d2cfb 100644 --- a/LiteLoader/Header/MC/SetSpawnPositionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetTimePacket.hpp b/LiteLoader/include/llapi/mc/SetTimePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SetTimePacket.hpp rename to LiteLoader/include/llapi/mc/SetTimePacket.hpp index 597c7e0..ae55814 100644 --- a/LiteLoader/Header/MC/SetTimePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTimePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetTitlePacket.hpp b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SetTitlePacket.hpp rename to LiteLoader/include/llapi/mc/SetTitlePacket.hpp index 1e82fc8..3b82808 100644 --- a/LiteLoader/Header/MC/SetTitlePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SetWorldSpawnCommand.hpp b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SetWorldSpawnCommand.hpp rename to LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp index 55e90d3..d092f11 100644 --- a/LiteLoader/Header/MC/SetWorldSpawnCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SettingsCommandPacket.hpp b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SettingsCommandPacket.hpp rename to LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp index 3dd530c..7813533 100644 --- a/LiteLoader/Header/MC/SettingsCommandPacket.hpp +++ b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SettingsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/SettingsScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp index 612fba4..4107b2e 100644 --- a/LiteLoader/Header/MC/SettingsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShapedChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/ShapedChemistryRecipe.hpp rename to LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp index 0a71be7..0e39734 100644 --- a/LiteLoader/Header/MC/ShapedChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ShapedRecipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShapedRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp similarity index 98% rename from LiteLoader/Header/MC/ShapedRecipe.hpp rename to LiteLoader/include/llapi/mc/ShapedRecipe.hpp index 8de310e..6de048a 100644 --- a/LiteLoader/Header/MC/ShapedRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShapelessChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/ShapelessChemistryRecipe.hpp rename to LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp index f9d0a87..8555481 100644 --- a/LiteLoader/Header/MC/ShapelessChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ShapelessRecipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShapelessRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/ShapelessRecipe.hpp rename to LiteLoader/include/llapi/mc/ShapelessRecipe.hpp index 8333fc4..e85f8ff 100644 --- a/LiteLoader/Header/MC/ShapelessRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Recipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShareItemsGoal.hpp b/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/ShareItemsGoal.hpp rename to LiteLoader/include/llapi/mc/ShareItemsGoal.hpp index 7511cb7..cebf7c7 100644 --- a/LiteLoader/Header/MC/ShareItemsGoal.hpp +++ b/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Shareable.hpp b/LiteLoader/include/llapi/mc/Shareable.hpp similarity index 95% rename from LiteLoader/Header/MC/Shareable.hpp rename to LiteLoader/include/llapi/mc/Shareable.hpp index bb0a08f..d3651e3 100644 --- a/LiteLoader/Header/MC/Shareable.hpp +++ b/LiteLoader/include/llapi/mc/Shareable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShareableComponent.hpp b/LiteLoader/include/llapi/mc/ShareableComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ShareableComponent.hpp rename to LiteLoader/include/llapi/mc/ShareableComponent.hpp index e8bc2dd..13b57cb 100644 --- a/LiteLoader/Header/MC/ShareableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShareableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShareableDefinition.hpp b/LiteLoader/include/llapi/mc/ShareableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ShareableDefinition.hpp rename to LiteLoader/include/llapi/mc/ShareableDefinition.hpp index df9c97a..cc5c2b7 100644 --- a/LiteLoader/Header/MC/ShareableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShareableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SharedAmplifiers.hpp b/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp similarity index 97% rename from LiteLoader/Header/MC/SharedAmplifiers.hpp rename to LiteLoader/include/llapi/mc/SharedAmplifiers.hpp index b802be4..2fee3d1 100644 --- a/LiteLoader/Header/MC/SharedAmplifiers.hpp +++ b/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SharedAttributes.hpp b/LiteLoader/include/llapi/mc/SharedAttributes.hpp similarity index 98% rename from LiteLoader/Header/MC/SharedAttributes.hpp rename to LiteLoader/include/llapi/mc/SharedAttributes.hpp index 90d3deb..806c6dd 100644 --- a/LiteLoader/Header/MC/SharedAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SharedAttributes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SharedBuffs.hpp b/LiteLoader/include/llapi/mc/SharedBuffs.hpp similarity index 97% rename from LiteLoader/Header/MC/SharedBuffs.hpp rename to LiteLoader/include/llapi/mc/SharedBuffs.hpp index d1345aa..a52d954 100644 --- a/LiteLoader/Header/MC/SharedBuffs.hpp +++ b/LiteLoader/include/llapi/mc/SharedBuffs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SharedConstants.hpp b/LiteLoader/include/llapi/mc/SharedConstants.hpp similarity index 97% rename from LiteLoader/Header/MC/SharedConstants.hpp rename to LiteLoader/include/llapi/mc/SharedConstants.hpp index 0002269..62b55f8 100644 --- a/LiteLoader/Header/MC/SharedConstants.hpp +++ b/LiteLoader/include/llapi/mc/SharedConstants.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SharedModifiers.hpp b/LiteLoader/include/llapi/mc/SharedModifiers.hpp similarity index 97% rename from LiteLoader/Header/MC/SharedModifiers.hpp rename to LiteLoader/include/llapi/mc/SharedModifiers.hpp index 666402a..d6b4ff3 100644 --- a/LiteLoader/Header/MC/SharedModifiers.hpp +++ b/LiteLoader/include/llapi/mc/SharedModifiers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShearsItem.hpp b/LiteLoader/include/llapi/mc/ShearsItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ShearsItem.hpp rename to LiteLoader/include/llapi/mc/ShearsItem.hpp index 725615a..da0b3e0 100644 --- a/LiteLoader/Header/MC/ShearsItem.hpp +++ b/LiteLoader/include/llapi/mc/ShearsItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Sheep.hpp b/LiteLoader/include/llapi/mc/Sheep.hpp similarity index 98% rename from LiteLoader/Header/MC/Sheep.hpp rename to LiteLoader/include/llapi/mc/Sheep.hpp index 36815ca..49ed409 100644 --- a/LiteLoader/Header/MC/Sheep.hpp +++ b/LiteLoader/include/llapi/mc/Sheep.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/ShieldItem.hpp b/LiteLoader/include/llapi/mc/ShieldItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ShieldItem.hpp rename to LiteLoader/include/llapi/mc/ShieldItem.hpp index ca7e8fb..3c814ae 100644 --- a/LiteLoader/Header/MC/ShieldItem.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShieldItemUtils.hpp b/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp similarity index 95% rename from LiteLoader/Header/MC/ShieldItemUtils.hpp rename to LiteLoader/include/llapi/mc/ShieldItemUtils.hpp index d8079ad..6e23385 100644 --- a/LiteLoader/Header/MC/ShieldItemUtils.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShiftedDurationAmplifier.hpp b/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp similarity index 96% rename from LiteLoader/Header/MC/ShiftedDurationAmplifier.hpp rename to LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp index 6d10bd5..8ea3149 100644 --- a/LiteLoader/Header/MC/ShiftedDurationAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShiftedValueAmplifier.hpp b/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp similarity index 95% rename from LiteLoader/Header/MC/ShiftedValueAmplifier.hpp rename to LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp index a223c8f..d20b412 100644 --- a/LiteLoader/Header/MC/ShiftedValueAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShipwreckFeature.hpp b/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/ShipwreckFeature.hpp rename to LiteLoader/include/llapi/mc/ShipwreckFeature.hpp index ea276a6..1fbe034 100644 --- a/LiteLoader/Header/MC/ShipwreckFeature.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShipwreckPiece.hpp b/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp similarity index 96% rename from LiteLoader/Header/MC/ShipwreckPiece.hpp rename to LiteLoader/include/llapi/mc/ShipwreckPiece.hpp index 84194b5..0e4af79 100644 --- a/LiteLoader/Header/MC/ShipwreckPiece.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShipwreckStart.hpp b/LiteLoader/include/llapi/mc/ShipwreckStart.hpp similarity index 96% rename from LiteLoader/Header/MC/ShipwreckStart.hpp rename to LiteLoader/include/llapi/mc/ShipwreckStart.hpp index 3c72fce..ea3858a 100644 --- a/LiteLoader/Header/MC/ShipwreckStart.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShootBowDefinition.hpp b/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ShootBowDefinition.hpp rename to LiteLoader/include/llapi/mc/ShootBowDefinition.hpp index e5eec54..e1de352 100644 --- a/LiteLoader/Header/MC/ShootBowDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/ShootBowNode.hpp b/LiteLoader/include/llapi/mc/ShootBowNode.hpp similarity index 95% rename from LiteLoader/Header/MC/ShootBowNode.hpp rename to LiteLoader/include/llapi/mc/ShootBowNode.hpp index 537a490..5455815 100644 --- a/LiteLoader/Header/MC/ShootBowNode.hpp +++ b/LiteLoader/include/llapi/mc/ShootBowNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShooterComponent.hpp b/LiteLoader/include/llapi/mc/ShooterComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/ShooterComponent.hpp rename to LiteLoader/include/llapi/mc/ShooterComponent.hpp index 5db1688..b2e02d0 100644 --- a/LiteLoader/Header/MC/ShooterComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShooterComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShooterDefinition.hpp b/LiteLoader/include/llapi/mc/ShooterDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/ShooterDefinition.hpp rename to LiteLoader/include/llapi/mc/ShooterDefinition.hpp index 27aec65..5b6b87c 100644 --- a/LiteLoader/Header/MC/ShooterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShooterDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp similarity index 97% rename from LiteLoader/Header/MC/ShortTag.hpp rename to LiteLoader/include/llapi/mc/ShortTag.hpp index 8f46f23..601615b 100644 --- a/LiteLoader/Header/MC/ShortTag.hpp +++ b/LiteLoader/include/llapi/mc/ShortTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShovelItem.hpp b/LiteLoader/include/llapi/mc/ShovelItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ShovelItem.hpp rename to LiteLoader/include/llapi/mc/ShovelItem.hpp index c5838a9..d6b7811 100644 --- a/LiteLoader/Header/MC/ShovelItem.hpp +++ b/LiteLoader/include/llapi/mc/ShovelItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #include "DiggerItem.hpp" diff --git a/LiteLoader/Header/MC/ShowCreditsPacket.hpp b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ShowCreditsPacket.hpp rename to LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp index 0ae4468..461111c 100644 --- a/LiteLoader/Header/MC/ShowCreditsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShowProfilePacket.hpp b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ShowProfilePacket.hpp rename to LiteLoader/include/llapi/mc/ShowProfilePacket.hpp index 7a40097..883af1c 100644 --- a/LiteLoader/Header/MC/ShowProfilePacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShowStoreOfferPacket.hpp b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/ShowStoreOfferPacket.hpp rename to LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp index 7bce79c..4202e8a 100644 --- a/LiteLoader/Header/MC/ShowStoreOfferPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Shulker.hpp b/LiteLoader/include/llapi/mc/Shulker.hpp similarity index 99% rename from LiteLoader/Header/MC/Shulker.hpp rename to LiteLoader/include/llapi/mc/Shulker.hpp index 45bd2ff..bae81d3 100644 --- a/LiteLoader/Header/MC/Shulker.hpp +++ b/LiteLoader/include/llapi/mc/Shulker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/ShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ShulkerBoxBlock.hpp rename to LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp index 10ba76f..a7b89df 100644 --- a/LiteLoader/Header/MC/ShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChestBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShulkerBoxBlockActor.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/ShulkerBoxBlockActor.hpp rename to LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp index f4e376a..b95456b 100644 --- a/LiteLoader/Header/MC/ShulkerBoxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShulkerBoxBlockItem.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/ShulkerBoxBlockItem.hpp rename to LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp index 31e36bb..ced2a87 100644 --- a/LiteLoader/Header/MC/ShulkerBoxBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShulkerBoxRecipe.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp similarity index 97% rename from LiteLoader/Header/MC/ShulkerBoxRecipe.hpp rename to LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp index 36901b7..3b56eeb 100644 --- a/LiteLoader/Header/MC/ShulkerBoxRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ShapelessRecipe.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShulkerBullet.hpp b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp similarity index 98% rename from LiteLoader/Header/MC/ShulkerBullet.hpp rename to LiteLoader/include/llapi/mc/ShulkerBullet.hpp index ebcbc2e..72fc7f1 100644 --- a/LiteLoader/Header/MC/ShulkerBullet.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ShulkerPeekGoal.hpp b/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/ShulkerPeekGoal.hpp rename to LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp index 5c32ff3..95d9b7e 100644 --- a/LiteLoader/Header/MC/ShulkerPeekGoal.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SignBlock.hpp b/LiteLoader/include/llapi/mc/SignBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SignBlock.hpp rename to LiteLoader/include/llapi/mc/SignBlock.hpp index 0a50500..755e2dd 100644 --- a/LiteLoader/Header/MC/SignBlock.hpp +++ b/LiteLoader/include/llapi/mc/SignBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SignBlockActor.hpp" #include "ActorBlock.hpp" diff --git a/LiteLoader/Header/MC/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/SignBlockActor.hpp rename to LiteLoader/include/llapi/mc/SignBlockActor.hpp index 18d71e9..158e396 100644 --- a/LiteLoader/Header/MC/SignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SignItem.hpp b/LiteLoader/include/llapi/mc/SignItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SignItem.hpp rename to LiteLoader/include/llapi/mc/SignItem.hpp index c5920ca..9752501 100644 --- a/LiteLoader/Header/MC/SignItem.hpp +++ b/LiteLoader/include/llapi/mc/SignItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Silverfish.hpp b/LiteLoader/include/llapi/mc/Silverfish.hpp similarity index 98% rename from LiteLoader/Header/MC/Silverfish.hpp rename to LiteLoader/include/llapi/mc/Silverfish.hpp index d94a678..dbabf23 100644 --- a/LiteLoader/Header/MC/Silverfish.hpp +++ b/LiteLoader/include/llapi/mc/Silverfish.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/SilverfishMergeWithStoneGoal.hpp b/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SilverfishMergeWithStoneGoal.hpp rename to LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp index f3e1d95..df4451f 100644 --- a/LiteLoader/Header/MC/SilverfishMergeWithStoneGoal.hpp +++ b/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomStrollGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SilverfishWakeUpFriendsGoal.hpp b/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SilverfishWakeUpFriendsGoal.hpp rename to LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp index 4c6e025..3a71eff 100644 --- a/LiteLoader/Header/MC/SilverfishWakeUpFriendsGoal.hpp +++ b/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleBoolFilterTest.hpp b/LiteLoader/include/llapi/mc/SimpleBoolFilterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleBoolFilterTest.hpp rename to LiteLoader/include/llapi/mc/SimpleBoolFilterTest.hpp index c4f4cb4..495194f 100644 --- a/LiteLoader/Header/MC/SimpleBoolFilterTest.hpp +++ b/LiteLoader/include/llapi/mc/SimpleBoolFilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleContainer.hpp b/LiteLoader/include/llapi/mc/SimpleContainer.hpp similarity index 97% rename from LiteLoader/Header/MC/SimpleContainer.hpp rename to LiteLoader/include/llapi/mc/SimpleContainer.hpp index 35a1ccc..fd0825c 100644 --- a/LiteLoader/Header/MC/SimpleContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimpleContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Container.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleEventPacket.hpp b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleEventPacket.hpp rename to LiteLoader/include/llapi/mc/SimpleEventPacket.hpp index d1a485d..0580480 100644 --- a/LiteLoader/Header/MC/SimpleEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleFloatFilterTest.hpp b/LiteLoader/include/llapi/mc/SimpleFloatFilterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleFloatFilterTest.hpp rename to LiteLoader/include/llapi/mc/SimpleFloatFilterTest.hpp index e1b4528..cad0a2d 100644 --- a/LiteLoader/Header/MC/SimpleFloatFilterTest.hpp +++ b/LiteLoader/include/llapi/mc/SimpleFloatFilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleHashStringFilterTest.hpp b/LiteLoader/include/llapi/mc/SimpleHashStringFilterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleHashStringFilterTest.hpp rename to LiteLoader/include/llapi/mc/SimpleHashStringFilterTest.hpp index 6253b9b..d61aa2a 100644 --- a/LiteLoader/Header/MC/SimpleHashStringFilterTest.hpp +++ b/LiteLoader/include/llapi/mc/SimpleHashStringFilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleIntFilterTest.hpp b/LiteLoader/include/llapi/mc/SimpleIntFilterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleIntFilterTest.hpp rename to LiteLoader/include/llapi/mc/SimpleIntFilterTest.hpp index b279757..c2393fb 100644 --- a/LiteLoader/Header/MC/SimpleIntFilterTest.hpp +++ b/LiteLoader/include/llapi/mc/SimpleIntFilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimplePlayerContainer.hpp b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp similarity index 96% rename from LiteLoader/Header/MC/SimplePlayerContainer.hpp rename to LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp index 569fa05..3a7f65d 100644 --- a/LiteLoader/Header/MC/SimplePlayerContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SimpleContainer.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleTagIDFilterTest.hpp b/LiteLoader/include/llapi/mc/SimpleTagIDFilterTest.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleTagIDFilterTest.hpp rename to LiteLoader/include/llapi/mc/SimpleTagIDFilterTest.hpp index f8aad3d..ea6500a 100644 --- a/LiteLoader/Header/MC/SimpleTagIDFilterTest.hpp +++ b/LiteLoader/include/llapi/mc/SimpleTagIDFilterTest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleTreeCanopy.hpp b/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp index 8d4dd2e..9b5d0b0 100644 --- a/LiteLoader/Header/MC/SimpleTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimpleTreeTrunk.hpp b/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp similarity index 96% rename from LiteLoader/Header/MC/SimpleTreeTrunk.hpp rename to LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp index a285d5e..e6145f3 100644 --- a/LiteLoader/Header/MC/SimpleTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SimplexNoise.hpp b/LiteLoader/include/llapi/mc/SimplexNoise.hpp similarity index 95% rename from LiteLoader/Header/MC/SimplexNoise.hpp rename to LiteLoader/include/llapi/mc/SimplexNoise.hpp index 0e75fde..bb2dcbc 100644 --- a/LiteLoader/Header/MC/SimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/SimplexNoise.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SingleBlockFeature.hpp b/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/SingleBlockFeature.hpp rename to LiteLoader/include/llapi/mc/SingleBlockFeature.hpp index 76bbbe8..b2358de 100644 --- a/LiteLoader/Header/MC/SingleBlockFeature.hpp +++ b/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SitComponent.hpp b/LiteLoader/include/llapi/mc/SitComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/SitComponent.hpp rename to LiteLoader/include/llapi/mc/SitComponent.hpp index 4e216d9..096c433 100644 --- a/LiteLoader/Header/MC/SitComponent.hpp +++ b/LiteLoader/include/llapi/mc/SitComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SitGoal.hpp b/LiteLoader/include/llapi/mc/SitGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SitGoal.hpp rename to LiteLoader/include/llapi/mc/SitGoal.hpp index 1b225c4..75a4864 100644 --- a/LiteLoader/Header/MC/SitGoal.hpp +++ b/LiteLoader/include/llapi/mc/SitGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SittableDefinition.hpp b/LiteLoader/include/llapi/mc/SittableDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SittableDefinition.hpp rename to LiteLoader/include/llapi/mc/SittableDefinition.hpp index 0decf01..ca4a4d2 100644 --- a/LiteLoader/Header/MC/SittableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SittableDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Skeleton.hpp b/LiteLoader/include/llapi/mc/Skeleton.hpp similarity index 98% rename from LiteLoader/Header/MC/Skeleton.hpp rename to LiteLoader/include/llapi/mc/Skeleton.hpp index c2d76b2..ec0b329 100644 --- a/LiteLoader/Header/MC/Skeleton.hpp +++ b/LiteLoader/include/llapi/mc/Skeleton.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/SkeletonHorseTrapGoal.hpp b/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SkeletonHorseTrapGoal.hpp rename to LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp index a82b81f..c3c2ecd 100644 --- a/LiteLoader/Header/MC/SkeletonHorseTrapGoal.hpp +++ b/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SkinIDDescription.hpp b/LiteLoader/include/llapi/mc/SkinIDDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/SkinIDDescription.hpp rename to LiteLoader/include/llapi/mc/SkinIDDescription.hpp index 2b4c6f6..753c094 100644 --- a/LiteLoader/Header/MC/SkinIDDescription.hpp +++ b/LiteLoader/include/llapi/mc/SkinIDDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SkinInfoData.hpp b/LiteLoader/include/llapi/mc/SkinInfoData.hpp similarity index 95% rename from LiteLoader/Header/MC/SkinInfoData.hpp rename to LiteLoader/include/llapi/mc/SkinInfoData.hpp index df64f4e..7f6a97d 100644 --- a/LiteLoader/Header/MC/SkinInfoData.hpp +++ b/LiteLoader/include/llapi/mc/SkinInfoData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SkullBlock.hpp b/LiteLoader/include/llapi/mc/SkullBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SkullBlock.hpp rename to LiteLoader/include/llapi/mc/SkullBlock.hpp index 735782c..3c6ea08 100644 --- a/LiteLoader/Header/MC/SkullBlock.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SkullBlockActor.hpp b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp similarity index 97% rename from LiteLoader/Header/MC/SkullBlockActor.hpp rename to LiteLoader/include/llapi/mc/SkullBlockActor.hpp index f85c9eb..a97d23b 100644 --- a/LiteLoader/Header/MC/SkullBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SkullItem.hpp b/LiteLoader/include/llapi/mc/SkullItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SkullItem.hpp rename to LiteLoader/include/llapi/mc/SkullItem.hpp index 2cd5376..5aace98 100644 --- a/LiteLoader/Header/MC/SkullItem.hpp +++ b/LiteLoader/include/llapi/mc/SkullItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlabBlock.hpp b/LiteLoader/include/llapi/mc/SlabBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SlabBlock.hpp rename to LiteLoader/include/llapi/mc/SlabBlock.hpp index 2bb7f45..31f5851 100644 --- a/LiteLoader/Header/MC/SlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlabBlockItem.hpp b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SlabBlockItem.hpp rename to LiteLoader/include/llapi/mc/SlabBlockItem.hpp index d331bed..f02cd7d 100644 --- a/LiteLoader/Header/MC/SlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SleepGoal.hpp b/LiteLoader/include/llapi/mc/SleepGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SleepGoal.hpp rename to LiteLoader/include/llapi/mc/SleepGoal.hpp index b5ea90a..a540503 100644 --- a/LiteLoader/Header/MC/SleepGoal.hpp +++ b/LiteLoader/include/llapi/mc/SleepGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveToPOIGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SleepState.hpp b/LiteLoader/include/llapi/mc/SleepState.hpp similarity index 95% rename from LiteLoader/Header/MC/SleepState.hpp rename to LiteLoader/include/llapi/mc/SleepState.hpp index 591e442..f759aed 100644 --- a/LiteLoader/Header/MC/SleepState.hpp +++ b/LiteLoader/include/llapi/mc/SleepState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Slime.hpp b/LiteLoader/include/llapi/mc/Slime.hpp similarity index 99% rename from LiteLoader/Header/MC/Slime.hpp rename to LiteLoader/include/llapi/mc/Slime.hpp index 5144227..86955a8 100644 --- a/LiteLoader/Header/MC/Slime.hpp +++ b/LiteLoader/include/llapi/mc/Slime.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/SlimeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp index b4ea860..5ac633f 100644 --- a/LiteLoader/Header/MC/SlimeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeAttackGoal.hpp b/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeAttackGoal.hpp rename to LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp index 6d1c25a..dab7a97 100644 --- a/LiteLoader/Header/MC/SlimeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeBlock.hpp b/LiteLoader/include/llapi/mc/SlimeBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SlimeBlock.hpp rename to LiteLoader/include/llapi/mc/SlimeBlock.hpp index 3a4326a..ab1ecf4 100644 --- a/LiteLoader/Header/MC/SlimeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlimeBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeFloatDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeFloatDefinition.hpp rename to LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp index 803ba34..39eb688 100644 --- a/LiteLoader/Header/MC/SlimeFloatDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeFloatGoal.hpp b/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeFloatGoal.hpp rename to LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp index 226e9c8..e7b003e 100644 --- a/LiteLoader/Header/MC/SlimeFloatGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeKeepOnJumpingDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeKeepOnJumpingDefinition.hpp rename to LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp index b2a7e79..811ce75 100644 --- a/LiteLoader/Header/MC/SlimeKeepOnJumpingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeKeepOnJumpingGoal.hpp b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeKeepOnJumpingGoal.hpp rename to LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp index a8b5a54..8e1cda5 100644 --- a/LiteLoader/Header/MC/SlimeKeepOnJumpingGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeMoveControl.hpp b/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeMoveControl.hpp rename to LiteLoader/include/llapi/mc/SlimeMoveControl.hpp index 29554cd..d277948 100644 --- a/LiteLoader/Header/MC/SlimeMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeMoveControlDescription.hpp rename to LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp index c7b5487..33cb586 100644 --- a/LiteLoader/Header/MC/SlimeMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeRandomDirectionDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SlimeRandomDirectionDefinition.hpp rename to LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp index 2725c28..a2dfb67 100644 --- a/LiteLoader/Header/MC/SlimeRandomDirectionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlimeRandomDirectionGoal.hpp b/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SlimeRandomDirectionGoal.hpp rename to LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp index 0bb52ed..3653049 100644 --- a/LiteLoader/Header/MC/SlimeRandomDirectionGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlotData.hpp b/LiteLoader/include/llapi/mc/SlotData.hpp similarity index 95% rename from LiteLoader/Header/MC/SlotData.hpp rename to LiteLoader/include/llapi/mc/SlotData.hpp index b8516c6..89c292b 100644 --- a/LiteLoader/Header/MC/SlotData.hpp +++ b/LiteLoader/include/llapi/mc/SlotData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SlotDescriptor.hpp b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp similarity index 95% rename from LiteLoader/Header/MC/SlotDescriptor.hpp rename to LiteLoader/include/llapi/mc/SlotDescriptor.hpp index 890a05a..ade4c3b 100644 --- a/LiteLoader/Header/MC/SlotDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmallFireball.hpp b/LiteLoader/include/llapi/mc/SmallFireball.hpp similarity index 98% rename from LiteLoader/Header/MC/SmallFireball.hpp rename to LiteLoader/include/llapi/mc/SmallFireball.hpp index 553f728..e0b7ae8 100644 --- a/LiteLoader/Header/MC/SmallFireball.hpp +++ b/LiteLoader/include/llapi/mc/SmallFireball.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fireball.hpp" diff --git a/LiteLoader/Header/MC/SmeltItemFunction.hpp b/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp similarity index 96% rename from LiteLoader/Header/MC/SmeltItemFunction.hpp rename to LiteLoader/include/llapi/mc/SmeltItemFunction.hpp index ecf4512..1d3df2a 100644 --- a/LiteLoader/Header/MC/SmeltItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmithingTableBlock.hpp b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SmithingTableBlock.hpp rename to LiteLoader/include/llapi/mc/SmithingTableBlock.hpp index 2ed2cd2..cf70d28 100644 --- a/LiteLoader/Header/MC/SmithingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmithingTableContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/SmithingTableContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp index 61865f9..f93fed4 100644 --- a/LiteLoader/Header/MC/SmithingTableContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmokerBlock.hpp b/LiteLoader/include/llapi/mc/SmokerBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SmokerBlock.hpp rename to LiteLoader/include/llapi/mc/SmokerBlock.hpp index 1cd8d94..8c405b4 100644 --- a/LiteLoader/Header/MC/SmokerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FurnaceBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmokerBlockActor.hpp b/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp similarity index 95% rename from LiteLoader/Header/MC/SmokerBlockActor.hpp rename to LiteLoader/include/llapi/mc/SmokerBlockActor.hpp index f24d45b..929ccf4 100644 --- a/LiteLoader/Header/MC/SmokerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmokerContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp similarity index 96% rename from LiteLoader/Header/MC/SmokerContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp index c5ec10a..87b6adb 100644 --- a/LiteLoader/Header/MC/SmokerContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FurnaceContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SmoothStoneSelector.hpp b/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp similarity index 96% rename from LiteLoader/Header/MC/SmoothStoneSelector.hpp rename to LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp index 7de42ea..e0a7002 100644 --- a/LiteLoader/Header/MC/SmoothStoneSelector.hpp +++ b/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SnackGoal.hpp b/LiteLoader/include/llapi/mc/SnackGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SnackGoal.hpp rename to LiteLoader/include/llapi/mc/SnackGoal.hpp index c0dfd4a..1eb628c 100644 --- a/LiteLoader/Header/MC/SnackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SnackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SnapshotEnv.hpp b/LiteLoader/include/llapi/mc/SnapshotEnv.hpp similarity index 98% rename from LiteLoader/Header/MC/SnapshotEnv.hpp rename to LiteLoader/include/llapi/mc/SnapshotEnv.hpp index 147fe49..6b572ff 100644 --- a/LiteLoader/Header/MC/SnapshotEnv.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotEnv.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "TransactionalWorldBlockTarget.hpp" diff --git a/LiteLoader/Header/MC/SnapshotFilenameAndLength.hpp b/LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp similarity index 95% rename from LiteLoader/Header/MC/SnapshotFilenameAndLength.hpp rename to LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp index 1f265b4..32994ef 100644 --- a/LiteLoader/Header/MC/SnapshotFilenameAndLength.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SnapshotWritableFile.hpp b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp similarity index 96% rename from LiteLoader/Header/MC/SnapshotWritableFile.hpp rename to LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp index f019125..2b31c49 100644 --- a/LiteLoader/Header/MC/SnapshotWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SneezeGoal.hpp b/LiteLoader/include/llapi/mc/SneezeGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SneezeGoal.hpp rename to LiteLoader/include/llapi/mc/SneezeGoal.hpp index c3cbc36..8f766d8 100644 --- a/LiteLoader/Header/MC/SneezeGoal.hpp +++ b/LiteLoader/include/llapi/mc/SneezeGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SnowBlock.hpp b/LiteLoader/include/llapi/mc/SnowBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SnowBlock.hpp rename to LiteLoader/include/llapi/mc/SnowBlock.hpp index 169e429..f9d09a5 100644 --- a/LiteLoader/Header/MC/SnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnowBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Snowball.hpp b/LiteLoader/include/llapi/mc/Snowball.hpp similarity index 98% rename from LiteLoader/Header/MC/Snowball.hpp rename to LiteLoader/include/llapi/mc/Snowball.hpp index d5f9a36..ee0d04f 100644 --- a/LiteLoader/Header/MC/Snowball.hpp +++ b/LiteLoader/include/llapi/mc/Snowball.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/SnowballItem.hpp b/LiteLoader/include/llapi/mc/SnowballItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SnowballItem.hpp rename to LiteLoader/include/llapi/mc/SnowballItem.hpp index 16a581a..5e78310 100644 --- a/LiteLoader/Header/MC/SnowballItem.hpp +++ b/LiteLoader/include/llapi/mc/SnowballItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Social.hpp b/LiteLoader/include/llapi/mc/Social.hpp similarity index 98% rename from LiteLoader/Header/MC/Social.hpp rename to LiteLoader/include/llapi/mc/Social.hpp index d8e8270..cee7124 100644 --- a/LiteLoader/Header/MC/Social.hpp +++ b/LiteLoader/include/llapi/mc/Social.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SortItemInstanceIdAux.hpp b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp similarity index 95% rename from LiteLoader/Header/MC/SortItemInstanceIdAux.hpp rename to LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp index a245cfc..f10167d 100644 --- a/LiteLoader/Header/MC/SortItemInstanceIdAux.hpp +++ b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SoulSandBlock.hpp b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SoulSandBlock.hpp rename to LiteLoader/include/llapi/mc/SoulSandBlock.hpp index 62eb81d..3568618 100644 --- a/LiteLoader/Header/MC/SoulSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SoulSpeedEnchant.hpp b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/SoulSpeedEnchant.hpp rename to LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp index f3667cc..6581a1f 100644 --- a/LiteLoader/Header/MC/SoulSpeedEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SoulTorchBlock.hpp b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/SoulTorchBlock.hpp rename to LiteLoader/include/llapi/mc/SoulTorchBlock.hpp index c0d7ae0..e3b4c25 100644 --- a/LiteLoader/Header/MC/SoulTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TorchBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SoundPlayerInterface.hpp b/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp similarity index 95% rename from LiteLoader/Header/MC/SoundPlayerInterface.hpp rename to LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp index 4f0e9cd..b5c9524 100644 --- a/LiteLoader/Header/MC/SoundPlayerInterface.hpp +++ b/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SoundVolumeDescription.hpp b/LiteLoader/include/llapi/mc/SoundVolumeDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/SoundVolumeDescription.hpp rename to LiteLoader/include/llapi/mc/SoundVolumeDescription.hpp index f78e58c..e426bf9 100644 --- a/LiteLoader/Header/MC/SoundVolumeDescription.hpp +++ b/LiteLoader/include/llapi/mc/SoundVolumeDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SparklerItem.hpp b/LiteLoader/include/llapi/mc/SparklerItem.hpp similarity index 99% rename from LiteLoader/Header/MC/SparklerItem.hpp rename to LiteLoader/include/llapi/mc/SparklerItem.hpp index 59a43ba..963024f 100644 --- a/LiteLoader/Header/MC/SparklerItem.hpp +++ b/LiteLoader/include/llapi/mc/SparklerItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChemistryStickItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SparseContainer.hpp b/LiteLoader/include/llapi/mc/SparseContainer.hpp similarity index 98% rename from LiteLoader/Header/MC/SparseContainer.hpp rename to LiteLoader/include/llapi/mc/SparseContainer.hpp index eb692d5..582e60c 100644 --- a/LiteLoader/Header/MC/SparseContainer.hpp +++ b/LiteLoader/include/llapi/mc/SparseContainer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpatialActorNetworkData.hpp b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp similarity index 96% rename from LiteLoader/Header/MC/SpatialActorNetworkData.hpp rename to LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp index a4f9118..2753b46 100644 --- a/LiteLoader/Header/MC/SpatialActorNetworkData.hpp +++ b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnActorComponent.hpp b/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/SpawnActorComponent.hpp rename to LiteLoader/include/llapi/mc/SpawnActorComponent.hpp index 9343305..72d0794 100644 --- a/LiteLoader/Header/MC/SpawnActorComponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnActorDefinition.hpp b/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp similarity index 97% rename from LiteLoader/Header/MC/SpawnActorDefinition.hpp rename to LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp index b0c98da..79d70c0 100644 --- a/LiteLoader/Header/MC/SpawnActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "JsonUtil.hpp" diff --git a/LiteLoader/Header/MC/SpawnActorEntry.hpp b/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp similarity index 95% rename from LiteLoader/Header/MC/SpawnActorEntry.hpp rename to LiteLoader/include/llapi/mc/SpawnActorEntry.hpp index a81b9a2..950eb2b 100644 --- a/LiteLoader/Header/MC/SpawnActorEntry.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnActorParameters.hpp b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp similarity index 97% rename from LiteLoader/Header/MC/SpawnActorParameters.hpp rename to LiteLoader/include/llapi/mc/SpawnActorParameters.hpp index a3ea603..c7ffd60 100644 --- a/LiteLoader/Header/MC/SpawnActorParameters.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnActorSystem.hpp b/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/SpawnActorSystem.hpp rename to LiteLoader/include/llapi/mc/SpawnActorSystem.hpp index cb320c1..a858ee2 100644 --- a/LiteLoader/Header/MC/SpawnActorSystem.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnAoECloudSubcomponent.hpp b/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/SpawnAoECloudSubcomponent.hpp rename to LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp index 653027c..7874473 100644 --- a/LiteLoader/Header/MC/SpawnAoECloudSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnChanceSubcomponent.hpp b/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/SpawnChanceSubcomponent.hpp rename to LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp index 32c43f1..ec13f7f 100644 --- a/LiteLoader/Header/MC/SpawnChanceSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnData.hpp b/LiteLoader/include/llapi/mc/SpawnData.hpp similarity index 95% rename from LiteLoader/Header/MC/SpawnData.hpp rename to LiteLoader/include/llapi/mc/SpawnData.hpp index dad8dc5..589ab1a 100644 --- a/LiteLoader/Header/MC/SpawnData.hpp +++ b/LiteLoader/include/llapi/mc/SpawnData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnExperienceOrbPacket.hpp b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SpawnExperienceOrbPacket.hpp rename to LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp index 9432bae..125eea2 100644 --- a/LiteLoader/Header/MC/SpawnExperienceOrbPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnFinder.hpp b/LiteLoader/include/llapi/mc/SpawnFinder.hpp similarity index 96% rename from LiteLoader/Header/MC/SpawnFinder.hpp rename to LiteLoader/include/llapi/mc/SpawnFinder.hpp index 460f695..974c107 100644 --- a/LiteLoader/Header/MC/SpawnFinder.hpp +++ b/LiteLoader/include/llapi/mc/SpawnFinder.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnGroupRegistry.hpp b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp similarity index 97% rename from LiteLoader/Header/MC/SpawnGroupRegistry.hpp rename to LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp index 2cc9b76..17ade21 100644 --- a/LiteLoader/Header/MC/SpawnGroupRegistry.hpp +++ b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnParticleEffectPacket.hpp b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SpawnParticleEffectPacket.hpp rename to LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp index 7cb9795..327d02d 100644 --- a/LiteLoader/Header/MC/SpawnParticleEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SpawnPointCommand.hpp rename to LiteLoader/include/llapi/mc/SpawnPointCommand.hpp index 4fbe48c..b62a90e 100644 --- a/LiteLoader/Header/MC/SpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpawnSettings.hpp b/LiteLoader/include/llapi/mc/SpawnSettings.hpp similarity index 95% rename from LiteLoader/Header/MC/SpawnSettings.hpp rename to LiteLoader/include/llapi/mc/SpawnSettings.hpp index 97e431d..2d51336 100644 --- a/LiteLoader/Header/MC/SpawnSettings.hpp +++ b/LiteLoader/include/llapi/mc/SpawnSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Spawner.hpp b/LiteLoader/include/llapi/mc/Spawner.hpp similarity index 99% rename from LiteLoader/Header/MC/Spawner.hpp rename to LiteLoader/include/llapi/mc/Spawner.hpp index 450ba4c..2caba14 100644 --- a/LiteLoader/Header/MC/Spawner.hpp +++ b/LiteLoader/include/llapi/mc/Spawner.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LevelChunk.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpecificEnchantFunction.hpp b/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/SpecificEnchantFunction.hpp rename to LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp index 29123be..9b4de8a 100644 --- a/LiteLoader/Header/MC/SpecificEnchantFunction.hpp +++ b/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "LootItemFunction.hpp" diff --git a/LiteLoader/Header/MC/Spider.hpp b/LiteLoader/include/llapi/mc/Spider.hpp similarity index 98% rename from LiteLoader/Header/MC/Spider.hpp rename to LiteLoader/include/llapi/mc/Spider.hpp index a938d09..795daf2 100644 --- a/LiteLoader/Header/MC/Spider.hpp +++ b/LiteLoader/include/llapi/mc/Spider.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/SpikeFeature.hpp b/LiteLoader/include/llapi/mc/SpikeFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/SpikeFeature.hpp rename to LiteLoader/include/llapi/mc/SpikeFeature.hpp index 6a42267..4d7a11e 100644 --- a/LiteLoader/Header/MC/SpikeFeature.hpp +++ b/LiteLoader/include/llapi/mc/SpikeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpinLock.hpp b/LiteLoader/include/llapi/mc/SpinLock.hpp similarity index 95% rename from LiteLoader/Header/MC/SpinLock.hpp rename to LiteLoader/include/llapi/mc/SpinLock.hpp index bf8e67f..13d795d 100644 --- a/LiteLoader/Header/MC/SpinLock.hpp +++ b/LiteLoader/include/llapi/mc/SpinLock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SplashPotionEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp similarity index 97% rename from LiteLoader/Header/MC/SplashPotionEffectSubcomponent.hpp rename to LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp index 227b4e1..1091ddf 100644 --- a/LiteLoader/Header/MC/SplashPotionEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SplashPotionItem.hpp b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SplashPotionItem.hpp rename to LiteLoader/include/llapi/mc/SplashPotionItem.hpp index eb8f90b..5bbf508 100644 --- a/LiteLoader/Header/MC/SplashPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Potion.hpp" #include "PotionItem.hpp" diff --git a/LiteLoader/Header/MC/SpongeBlock.hpp b/LiteLoader/include/llapi/mc/SpongeBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SpongeBlock.hpp rename to LiteLoader/include/llapi/mc/SpongeBlock.hpp index bc01de4..0f11cdd 100644 --- a/LiteLoader/Header/MC/SpongeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SpongeBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpreadPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp similarity index 98% rename from LiteLoader/Header/MC/SpreadPlayersCommand.hpp rename to LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp index f90eac1..beccb5d 100644 --- a/LiteLoader/Header/MC/SpreadPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpringFeature.hpp b/LiteLoader/include/llapi/mc/SpringFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/SpringFeature.hpp rename to LiteLoader/include/llapi/mc/SpringFeature.hpp index fda8e58..f0cc1a9 100644 --- a/LiteLoader/Header/MC/SpringFeature.hpp +++ b/LiteLoader/include/llapi/mc/SpringFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SpruceTreeCanopy.hpp b/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp similarity index 96% rename from LiteLoader/Header/MC/SpruceTreeCanopy.hpp rename to LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp index 2d5ccb1..4fe12e8 100644 --- a/LiteLoader/Header/MC/SpruceTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TreeHelper.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Squid.hpp b/LiteLoader/include/llapi/mc/Squid.hpp similarity index 98% rename from LiteLoader/Header/MC/Squid.hpp rename to LiteLoader/include/llapi/mc/Squid.hpp index 9a25302..255c8dd 100644 --- a/LiteLoader/Header/MC/Squid.hpp +++ b/LiteLoader/include/llapi/mc/Squid.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/SquidDiveGoal.hpp b/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SquidDiveGoal.hpp rename to LiteLoader/include/llapi/mc/SquidDiveGoal.hpp index 8605106..900af19 100644 --- a/LiteLoader/Header/MC/SquidDiveGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SquidFleeGoal.hpp b/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SquidFleeGoal.hpp rename to LiteLoader/include/llapi/mc/SquidFleeGoal.hpp index 733eb58..6091682 100644 --- a/LiteLoader/Header/MC/SquidFleeGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SquidIdleGoal.hpp b/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SquidIdleGoal.hpp rename to LiteLoader/include/llapi/mc/SquidIdleGoal.hpp index 3f15220..1467ed1 100644 --- a/LiteLoader/Header/MC/SquidIdleGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SquidMoveAwayFromGroundGoal.hpp b/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SquidMoveAwayFromGroundGoal.hpp rename to LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp index 3b60772..184f212 100644 --- a/LiteLoader/Header/MC/SquidMoveAwayFromGroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SquidOutOfWaterGoal.hpp b/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SquidOutOfWaterGoal.hpp rename to LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp index 25a6274..b4f454f 100644 --- a/LiteLoader/Header/MC/SquidOutOfWaterGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StackResultStorageFeature.hpp b/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/StackResultStorageFeature.hpp rename to LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp index 2097b3f..968622a 100644 --- a/LiteLoader/Header/MC/StackResultStorageFeature.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StainedGlassBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StainedGlassBlock.hpp rename to LiteLoader/include/llapi/mc/StainedGlassBlock.hpp index 730346f..bb5e8e1 100644 --- a/LiteLoader/Header/MC/StainedGlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StainedGlassPaneBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StainedGlassPaneBlock.hpp rename to LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp index 6bb2f33..8e153cf 100644 --- a/LiteLoader/Header/MC/StainedGlassPaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ThinFenceBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StairBlock.hpp b/LiteLoader/include/llapi/mc/StairBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/StairBlock.hpp rename to LiteLoader/include/llapi/mc/StairBlock.hpp index 3de95c1..761d5be 100644 --- a/LiteLoader/Header/MC/StairBlock.hpp +++ b/LiteLoader/include/llapi/mc/StairBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StalkAndPounceOnTargetGoal.hpp b/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/StalkAndPounceOnTargetGoal.hpp rename to LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp index aabbdb7..1e57ee3 100644 --- a/LiteLoader/Header/MC/StalkAndPounceOnTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StartGamePacket.hpp b/LiteLoader/include/llapi/mc/StartGamePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/StartGamePacket.hpp rename to LiteLoader/include/llapi/mc/StartGamePacket.hpp index 0981301..1d1991d 100644 --- a/LiteLoader/Header/MC/StartGamePacket.hpp +++ b/LiteLoader/include/llapi/mc/StartGamePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StartScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp similarity index 96% rename from LiteLoader/Header/MC/StartScreenCapabilities.hpp rename to LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp index b4560b7..a90393c 100644 --- a/LiteLoader/Header/MC/StartScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StateSerializationUtils.hpp b/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp similarity index 91% rename from LiteLoader/Header/MC/StateSerializationUtils.hpp rename to LiteLoader/include/llapi/mc/StateSerializationUtils.hpp index b8348f2..487096d 100644 --- a/LiteLoader/Header/MC/StateSerializationUtils.hpp +++ b/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StemBlock.hpp b/LiteLoader/include/llapi/mc/StemBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/StemBlock.hpp rename to LiteLoader/include/llapi/mc/StemBlock.hpp index c39d470..e0b7287 100644 --- a/LiteLoader/Header/MC/StemBlock.hpp +++ b/LiteLoader/include/llapi/mc/StemBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StickInGroundSubcomponent.hpp b/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/StickInGroundSubcomponent.hpp rename to LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp index 44b3e09..ea139c0 100644 --- a/LiteLoader/Header/MC/StickInGroundSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StompAttackDefinition.hpp b/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/StompAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/StompAttackDefinition.hpp index 53f8562..8fb6633 100644 --- a/LiteLoader/Header/MC/StompAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StompAttackGoal.hpp b/LiteLoader/include/llapi/mc/StompAttackGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/StompAttackGoal.hpp rename to LiteLoader/include/llapi/mc/StompAttackGoal.hpp index 509dc49..86cdefd 100644 --- a/LiteLoader/Header/MC/StompAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MeleeAttackGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StompBlockGoal.hpp b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/StompBlockGoal.hpp rename to LiteLoader/include/llapi/mc/StompBlockGoal.hpp index c99e12e..cf6a928 100644 --- a/LiteLoader/Header/MC/StompBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StompEggGoal.hpp b/LiteLoader/include/llapi/mc/StompEggGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/StompEggGoal.hpp rename to LiteLoader/include/llapi/mc/StompEggGoal.hpp index ae61cca..7347307 100644 --- a/LiteLoader/Header/MC/StompEggGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompEggGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseMoveToGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneBlock.hpp b/LiteLoader/include/llapi/mc/StoneBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneBlock.hpp rename to LiteLoader/include/llapi/mc/StoneBlock.hpp index bc96b41..4c7bee0 100644 --- a/LiteLoader/Header/MC/StoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneBrickBlock.hpp b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneBrickBlock.hpp rename to LiteLoader/include/llapi/mc/StoneBrickBlock.hpp index e171a16..536c3ba 100644 --- a/LiteLoader/Header/MC/StoneBrickBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneButtonBlock.hpp b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneButtonBlock.hpp rename to LiteLoader/include/llapi/mc/StoneButtonBlock.hpp index d954c70..873fdaa 100644 --- a/LiteLoader/Header/MC/StoneButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ButtonBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneSlabBlock.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneSlabBlock.hpp rename to LiteLoader/include/llapi/mc/StoneSlabBlock.hpp index 6ecfe3c..919a361 100644 --- a/LiteLoader/Header/MC/StoneSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SlabBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneSlabBlock2.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneSlabBlock2.hpp rename to LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp index 277eebe..34c27e1 100644 --- a/LiteLoader/Header/MC/StoneSlabBlock2.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SlabBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneSlabBlock3.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneSlabBlock3.hpp rename to LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp index 1c32c03..66f9a93 100644 --- a/LiteLoader/Header/MC/StoneSlabBlock3.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SlabBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneSlabBlock4.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp similarity index 98% rename from LiteLoader/Header/MC/StoneSlabBlock4.hpp rename to LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp index f1790be..b69b6d5 100644 --- a/LiteLoader/Header/MC/StoneSlabBlock4.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SlabBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StoneSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/StoneSlabBlockItem.hpp rename to LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp index 5d42a59..7752f21 100644 --- a/LiteLoader/Header/MC/StoneSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StonecutterBlock.hpp b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StonecutterBlock.hpp rename to LiteLoader/include/llapi/mc/StonecutterBlock.hpp index f025ee5..f7817bd 100644 --- a/LiteLoader/Header/MC/StonecutterBlock.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StonecutterContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/StonecutterContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp index 4d3cc1f..d904c66 100644 --- a/LiteLoader/Header/MC/StonecutterContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StopCommand.hpp b/LiteLoader/include/llapi/mc/StopCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/StopCommand.hpp rename to LiteLoader/include/llapi/mc/StopCommand.hpp index 006a8f0..aa682ec 100644 --- a/LiteLoader/Header/MC/StopCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StopSoundCommand.hpp b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/StopSoundCommand.hpp rename to LiteLoader/include/llapi/mc/StopSoundCommand.hpp index 49d659a..c57e212 100644 --- a/LiteLoader/Header/MC/StopSoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/StopSoundPacket.hpp rename to LiteLoader/include/llapi/mc/StopSoundPacket.hpp index a57652e..ec8a78d 100644 --- a/LiteLoader/Header/MC/StopSoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Stopwatch.hpp b/LiteLoader/include/llapi/mc/Stopwatch.hpp similarity index 95% rename from LiteLoader/Header/MC/Stopwatch.hpp rename to LiteLoader/include/llapi/mc/Stopwatch.hpp index f250da7..3f8dd8e 100644 --- a/LiteLoader/Header/MC/Stopwatch.hpp +++ b/LiteLoader/include/llapi/mc/Stopwatch.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrengthDescription.hpp b/LiteLoader/include/llapi/mc/StrengthDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/StrengthDescription.hpp rename to LiteLoader/include/llapi/mc/StrengthDescription.hpp index 6903413..72c2d34 100644 --- a/LiteLoader/Header/MC/StrengthDescription.hpp +++ b/LiteLoader/include/llapi/mc/StrengthDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Strider.hpp b/LiteLoader/include/llapi/mc/Strider.hpp similarity index 98% rename from LiteLoader/Header/MC/Strider.hpp rename to LiteLoader/include/llapi/mc/Strider.hpp index 4aef982..c3e3efe 100644 --- a/LiteLoader/Header/MC/Strider.hpp +++ b/LiteLoader/include/llapi/mc/Strider.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/StringByteInput.hpp b/LiteLoader/include/llapi/mc/StringByteInput.hpp similarity index 97% rename from LiteLoader/Header/MC/StringByteInput.hpp rename to LiteLoader/include/llapi/mc/StringByteInput.hpp index 833bb04..c331413 100644 --- a/LiteLoader/Header/MC/StringByteInput.hpp +++ b/LiteLoader/include/llapi/mc/StringByteInput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BytesDataInput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StringByteOutput.hpp b/LiteLoader/include/llapi/mc/StringByteOutput.hpp similarity index 97% rename from LiteLoader/Header/MC/StringByteOutput.hpp rename to LiteLoader/include/llapi/mc/StringByteOutput.hpp index fcc873b..597a013 100644 --- a/LiteLoader/Header/MC/StringByteOutput.hpp +++ b/LiteLoader/include/llapi/mc/StringByteOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BytesDataOutput.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StringKey.hpp b/LiteLoader/include/llapi/mc/StringKey.hpp similarity index 94% rename from LiteLoader/Header/MC/StringKey.hpp rename to LiteLoader/include/llapi/mc/StringKey.hpp index 5a53d89..f3578a2 100644 --- a/LiteLoader/Header/MC/StringKey.hpp +++ b/LiteLoader/include/llapi/mc/StringKey.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StringTag.hpp b/LiteLoader/include/llapi/mc/StringTag.hpp similarity index 97% rename from LiteLoader/Header/MC/StringTag.hpp rename to LiteLoader/include/llapi/mc/StringTag.hpp index 78c83fa..576e1b6 100644 --- a/LiteLoader/Header/MC/StringTag.hpp +++ b/LiteLoader/include/llapi/mc/StringTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Tag.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrippedLogBlock.hpp b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/StrippedLogBlock.hpp rename to LiteLoader/include/llapi/mc/StrippedLogBlock.hpp index 679a6fe..88bcc79 100644 --- a/LiteLoader/Header/MC/StrippedLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrollTowardsVillageGoal.hpp b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/StrollTowardsVillageGoal.hpp rename to LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp index 742b60f..8603278 100644 --- a/LiteLoader/Header/MC/StrollTowardsVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveToVillageGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrongholdFeature.hpp b/LiteLoader/include/llapi/mc/StrongholdFeature.hpp similarity index 98% rename from LiteLoader/Header/MC/StrongholdFeature.hpp rename to LiteLoader/include/llapi/mc/StrongholdFeature.hpp index e6e3984..494970d 100644 --- a/LiteLoader/Header/MC/StrongholdFeature.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrongholdPiece.hpp b/LiteLoader/include/llapi/mc/StrongholdPiece.hpp similarity index 98% rename from LiteLoader/Header/MC/StrongholdPiece.hpp rename to LiteLoader/include/llapi/mc/StrongholdPiece.hpp index d6a0cdd..0fa6ab6 100644 --- a/LiteLoader/Header/MC/StrongholdPiece.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdPiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StrongholdStart.hpp b/LiteLoader/include/llapi/mc/StrongholdStart.hpp similarity index 96% rename from LiteLoader/Header/MC/StrongholdStart.hpp rename to LiteLoader/include/llapi/mc/StrongholdStart.hpp index 7c8f914..87629b7 100644 --- a/LiteLoader/Header/MC/StrongholdStart.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureStart.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureBlock.hpp b/LiteLoader/include/llapi/mc/StructureBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/StructureBlock.hpp rename to LiteLoader/include/llapi/mc/StructureBlock.hpp index d747e29..cf80cb2 100644 --- a/LiteLoader/Header/MC/StructureBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ActorBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureBlockActor.hpp b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureBlockActor.hpp rename to LiteLoader/include/llapi/mc/StructureBlockActor.hpp index f944ceb..fffb8a7 100644 --- a/LiteLoader/Header/MC/StructureBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockActor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureBlockPalette.hpp b/LiteLoader/include/llapi/mc/StructureBlockPalette.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureBlockPalette.hpp rename to LiteLoader/include/llapi/mc/StructureBlockPalette.hpp index dd86914..3d582a7 100644 --- a/LiteLoader/Header/MC/StructureBlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockPalette.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureBlockUpdatePacket.hpp rename to LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp index 1a60019..39defa1 100644 --- a/LiteLoader/Header/MC/StructureBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureDataLoadHelper.hpp rename to LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp index 6b47e0d..35bc455 100644 --- a/LiteLoader/Header/MC/StructureDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Direction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureEditorData.hpp b/LiteLoader/include/llapi/mc/StructureEditorData.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureEditorData.hpp rename to LiteLoader/include/llapi/mc/StructureEditorData.hpp index 30d6075..b4e9e29 100644 --- a/LiteLoader/Header/MC/StructureEditorData.hpp +++ b/LiteLoader/include/llapi/mc/StructureEditorData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureFeature.hpp b/LiteLoader/include/llapi/mc/StructureFeature.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureFeature.hpp rename to LiteLoader/include/llapi/mc/StructureFeature.hpp index 1049981..06ad580 100644 --- a/LiteLoader/Header/MC/StructureFeature.hpp +++ b/LiteLoader/include/llapi/mc/StructureFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureHelpers.hpp b/LiteLoader/include/llapi/mc/StructureHelpers.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureHelpers.hpp rename to LiteLoader/include/llapi/mc/StructureHelpers.hpp index 3ed0ee2..b146df9 100644 --- a/LiteLoader/Header/MC/StructureHelpers.hpp +++ b/LiteLoader/include/llapi/mc/StructureHelpers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureIntegrityProcessor.hpp b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp similarity index 96% rename from LiteLoader/Header/MC/StructureIntegrityProcessor.hpp rename to LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp index 2eb8c19..f7a6998 100644 --- a/LiteLoader/Header/MC/StructureIntegrityProcessor.hpp +++ b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureManager.hpp b/LiteLoader/include/llapi/mc/StructureManager.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureManager.hpp rename to LiteLoader/include/llapi/mc/StructureManager.hpp index a4a2947..0cc598a 100644 --- a/LiteLoader/Header/MC/StructureManager.hpp +++ b/LiteLoader/include/llapi/mc/StructureManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePiece.hpp b/LiteLoader/include/llapi/mc/StructurePiece.hpp similarity index 99% rename from LiteLoader/Header/MC/StructurePiece.hpp rename to LiteLoader/include/llapi/mc/StructurePiece.hpp index adb1ff9..5ce4e29 100644 --- a/LiteLoader/Header/MC/StructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/StructurePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolActorPredicateActorMatch.hpp b/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp similarity index 96% rename from LiteLoader/Header/MC/StructurePoolActorPredicateActorMatch.hpp rename to LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp index 39c1be5..6327340 100644 --- a/LiteLoader/Header/MC/StructurePoolActorPredicateActorMatch.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockPredicateAlwaysTrue.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp similarity index 96% rename from LiteLoader/Header/MC/StructurePoolBlockPredicateAlwaysTrue.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp index e189021..4d7b66a 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockPredicateAlwaysTrue.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockPredicateAxisAlignedPosition.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp similarity index 97% rename from LiteLoader/Header/MC/StructurePoolBlockPredicateAxisAlignedPosition.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp index 6210b5f..dc85735 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockPredicateAxisAlignedPosition.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatch.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp similarity index 97% rename from LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatch.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp index 7bb51b9..d59a462 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatch.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatchRandom.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp similarity index 97% rename from LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatchRandom.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp index 498557e..e207785 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockPredicateBlockMatchRandom.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp similarity index 97% rename from LiteLoader/Header/MC/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp index 0be0847..684dce3 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolBlockTagRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp similarity index 96% rename from LiteLoader/Header/MC/StructurePoolBlockTagRule.hpp rename to LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp index 86654f6..57d1b95 100644 --- a/LiteLoader/Header/MC/StructurePoolBlockTagRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructurePoolElement.hpp b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp similarity index 99% rename from LiteLoader/Header/MC/StructurePoolElement.hpp rename to LiteLoader/include/llapi/mc/StructurePoolElement.hpp index 72dd199..76b3fe7 100644 --- a/LiteLoader/Header/MC/StructurePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureSettings.hpp b/LiteLoader/include/llapi/mc/StructureSettings.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureSettings.hpp rename to LiteLoader/include/llapi/mc/StructureSettings.hpp index 5ef9ec9..af3ef65 100644 --- a/LiteLoader/Header/MC/StructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/StructureSettings.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/StructureStart.hpp b/LiteLoader/include/llapi/mc/StructureStart.hpp similarity index 96% rename from LiteLoader/Header/MC/StructureStart.hpp rename to LiteLoader/include/llapi/mc/StructureStart.hpp index 44af888..9764f8a 100644 --- a/LiteLoader/Header/MC/StructureStart.hpp +++ b/LiteLoader/include/llapi/mc/StructureStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureTag.hpp b/LiteLoader/include/llapi/mc/StructureTag.hpp similarity index 96% rename from LiteLoader/Header/MC/StructureTag.hpp rename to LiteLoader/include/llapi/mc/StructureTag.hpp index b0097a1..cef0595 100644 --- a/LiteLoader/Header/MC/StructureTag.hpp +++ b/LiteLoader/include/llapi/mc/StructureTag.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureTemplate.hpp b/LiteLoader/include/llapi/mc/StructureTemplate.hpp similarity index 99% rename from LiteLoader/Header/MC/StructureTemplate.hpp rename to LiteLoader/include/llapi/mc/StructureTemplate.hpp index 050234c..4c42e00 100644 --- a/LiteLoader/Header/MC/StructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/StructureTemplateData.hpp b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureTemplateData.hpp rename to LiteLoader/include/llapi/mc/StructureTemplateData.hpp index f41045f..8f38d98 100644 --- a/LiteLoader/Header/MC/StructureTemplateData.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/StructureTemplateDataRequestPacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureTemplateDataRequestPacket.hpp rename to LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp index fb5af67..3ea00fe 100644 --- a/LiteLoader/Header/MC/StructureTemplateDataRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureTemplateDataResponsePacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/StructureTemplateDataResponsePacket.hpp rename to LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp index ac9a85a..53e4b96 100644 --- a/LiteLoader/Header/MC/StructureTemplateDataResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureTemplateFeature.hpp b/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/StructureTemplateFeature.hpp rename to LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp index f2e6a11..82c3b44 100644 --- a/LiteLoader/Header/MC/StructureTemplateFeature.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureTemplatePool.hpp b/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp similarity index 96% rename from LiteLoader/Header/MC/StructureTemplatePool.hpp rename to LiteLoader/include/llapi/mc/StructureTemplatePool.hpp index b7c99c1..2e0796b 100644 --- a/LiteLoader/Header/MC/StructureTemplatePool.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/StructureVoid.hpp b/LiteLoader/include/llapi/mc/StructureVoid.hpp similarity index 98% rename from LiteLoader/Header/MC/StructureVoid.hpp rename to LiteLoader/include/llapi/mc/StructureVoid.hpp index 697423a..f903212 100644 --- a/LiteLoader/Header/MC/StructureVoid.hpp +++ b/LiteLoader/include/llapi/mc/StructureVoid.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp similarity index 97% rename from LiteLoader/Header/MC/SubChunk.hpp rename to LiteLoader/include/llapi/mc/SubChunk.hpp index 05ab405..36d2494 100644 --- a/LiteLoader/Header/MC/SubChunk.hpp +++ b/LiteLoader/include/llapi/mc/SubChunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubChunkBlockStorage.hpp b/LiteLoader/include/llapi/mc/SubChunkBlockStorage.hpp similarity index 97% rename from LiteLoader/Header/MC/SubChunkBlockStorage.hpp rename to LiteLoader/include/llapi/mc/SubChunkBlockStorage.hpp index deb022b..c75e23e 100644 --- a/LiteLoader/Header/MC/SubChunkBlockStorage.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkBlockStorage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubChunkPos.hpp b/LiteLoader/include/llapi/mc/SubChunkPos.hpp similarity index 95% rename from LiteLoader/Header/MC/SubChunkPos.hpp rename to LiteLoader/include/llapi/mc/SubChunkPos.hpp index 1e2441c..63702a2 100644 --- a/LiteLoader/Header/MC/SubChunkPos.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkPos.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp similarity index 99% rename from LiteLoader/Header/MC/SubChunkRelighter.hpp rename to LiteLoader/include/llapi/mc/SubChunkRelighter.hpp index 786f63d..b2c20f4 100644 --- a/LiteLoader/Header/MC/SubChunkRelighter.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubClientConnectionRequest.hpp b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp similarity index 98% rename from LiteLoader/Header/MC/SubClientConnectionRequest.hpp rename to LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp index ec4a2d3..e99fa86 100644 --- a/LiteLoader/Header/MC/SubClientConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "persona.hpp" #include "Json.hpp" diff --git a/LiteLoader/Header/MC/SubClientLoginPacket.hpp b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/SubClientLoginPacket.hpp rename to LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp index b897742..9e3c570 100644 --- a/LiteLoader/Header/MC/SubClientLoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubpackInfo.hpp b/LiteLoader/include/llapi/mc/SubpackInfo.hpp similarity index 94% rename from LiteLoader/Header/MC/SubpackInfo.hpp rename to LiteLoader/include/llapi/mc/SubpackInfo.hpp index 90268cd..7687712 100644 --- a/LiteLoader/Header/MC/SubpackInfo.hpp +++ b/LiteLoader/include/llapi/mc/SubpackInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubpackInfoCollection.hpp b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp similarity index 95% rename from LiteLoader/Header/MC/SubpackInfoCollection.hpp rename to LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp index 7c999c4..1022a48 100644 --- a/LiteLoader/Header/MC/SubpackInfoCollection.hpp +++ b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SubtreeDefinition.hpp b/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SubtreeDefinition.hpp rename to LiteLoader/include/llapi/mc/SubtreeDefinition.hpp index 0912822..3820374 100644 --- a/LiteLoader/Header/MC/SubtreeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/SubtreeNode.hpp b/LiteLoader/include/llapi/mc/SubtreeNode.hpp similarity index 95% rename from LiteLoader/Header/MC/SubtreeNode.hpp rename to LiteLoader/include/llapi/mc/SubtreeNode.hpp index 49fdb52..bcc24f5 100644 --- a/LiteLoader/Header/MC/SubtreeNode.hpp +++ b/LiteLoader/include/llapi/mc/SubtreeNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SummonActorGoal.hpp b/LiteLoader/include/llapi/mc/SummonActorGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/SummonActorGoal.hpp rename to LiteLoader/include/llapi/mc/SummonActorGoal.hpp index 4f9d386..ef426d3 100644 --- a/LiteLoader/Header/MC/SummonActorGoal.hpp +++ b/LiteLoader/include/llapi/mc/SummonActorGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SummonCommand.hpp b/LiteLoader/include/llapi/mc/SummonCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/SummonCommand.hpp rename to LiteLoader/include/llapi/mc/SummonCommand.hpp index 787bc07..287c207 100644 --- a/LiteLoader/Header/MC/SummonCommand.hpp +++ b/LiteLoader/include/llapi/mc/SummonCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SummonSpellData.hpp b/LiteLoader/include/llapi/mc/SummonSpellData.hpp similarity index 95% rename from LiteLoader/Header/MC/SummonSpellData.hpp rename to LiteLoader/include/llapi/mc/SummonSpellData.hpp index 1696b6e..4340f48 100644 --- a/LiteLoader/Header/MC/SummonSpellData.hpp +++ b/LiteLoader/include/llapi/mc/SummonSpellData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SummonSpellStage.hpp b/LiteLoader/include/llapi/mc/SummonSpellStage.hpp similarity index 95% rename from LiteLoader/Header/MC/SummonSpellStage.hpp rename to LiteLoader/include/llapi/mc/SummonSpellStage.hpp index 667d302..66cee38 100644 --- a/LiteLoader/Header/MC/SummonSpellStage.hpp +++ b/LiteLoader/include/llapi/mc/SummonSpellStage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SurfaceBuilderRegistry.hpp b/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp similarity index 95% rename from LiteLoader/Header/MC/SurfaceBuilderRegistry.hpp rename to LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp index 2987275..706200a 100644 --- a/LiteLoader/Header/MC/SurfaceBuilderRegistry.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SurfaceMaterialAdjustmentAttributes.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp similarity index 96% rename from LiteLoader/Header/MC/SurfaceMaterialAdjustmentAttributes.hpp rename to LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp index 043bf64..499b4fb 100644 --- a/LiteLoader/Header/MC/SurfaceMaterialAdjustmentAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SurfaceMaterialAdjustmentEvaluated.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp similarity index 96% rename from LiteLoader/Header/MC/SurfaceMaterialAdjustmentEvaluated.hpp rename to LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp index c9977b8..ef706da 100644 --- a/LiteLoader/Header/MC/SurfaceMaterialAdjustmentEvaluated.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SurvivalMode.hpp b/LiteLoader/include/llapi/mc/SurvivalMode.hpp similarity index 98% rename from LiteLoader/Header/MC/SurvivalMode.hpp rename to LiteLoader/include/llapi/mc/SurvivalMode.hpp index 33244d3..094791b 100644 --- a/LiteLoader/Header/MC/SurvivalMode.hpp +++ b/LiteLoader/include/llapi/mc/SurvivalMode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "GameMode.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SuspiciousStewItem.hpp b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp similarity index 98% rename from LiteLoader/Header/MC/SuspiciousStewItem.hpp rename to LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp index 6b57a9e..386ef13 100644 --- a/LiteLoader/Header/MC/SuspiciousStewItem.hpp +++ b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwamplandHut.hpp b/LiteLoader/include/llapi/mc/SwamplandHut.hpp similarity index 97% rename from LiteLoader/Header/MC/SwamplandHut.hpp rename to LiteLoader/include/llapi/mc/SwamplandHut.hpp index b36df2a..805b448 100644 --- a/LiteLoader/Header/MC/SwamplandHut.hpp +++ b/LiteLoader/include/llapi/mc/SwamplandHut.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SweetBerryBushBlock.hpp b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/SweetBerryBushBlock.hpp rename to LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp index 685dc0d..d1cd7c0 100644 --- a/LiteLoader/Header/MC/SweetBerryBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwellGoal.hpp b/LiteLoader/include/llapi/mc/SwellGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SwellGoal.hpp rename to LiteLoader/include/llapi/mc/SwellGoal.hpp index 1c98b66..bc49bad 100644 --- a/LiteLoader/Header/MC/SwellGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwellGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimEnchant.hpp b/LiteLoader/include/llapi/mc/SwimEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimEnchant.hpp rename to LiteLoader/include/llapi/mc/SwimEnchant.hpp index ad7556c..48cb7ab 100644 --- a/LiteLoader/Header/MC/SwimEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SwimEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimIdleDefinition.hpp b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimIdleDefinition.hpp rename to LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp index f9b4c43..4d0302a 100644 --- a/LiteLoader/Header/MC/SwimIdleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimIdleGoal.hpp b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimIdleGoal.hpp rename to LiteLoader/include/llapi/mc/SwimIdleGoal.hpp index ba98593..ee607f3 100644 --- a/LiteLoader/Header/MC/SwimIdleGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimMoveControl.hpp b/LiteLoader/include/llapi/mc/SwimMoveControl.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimMoveControl.hpp rename to LiteLoader/include/llapi/mc/SwimMoveControl.hpp index 425ea0d..6223325 100644 --- a/LiteLoader/Header/MC/SwimMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/SwimMoveControl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveControl.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimWanderDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimWanderDefinition.hpp rename to LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp index f42c63f..fb3335f 100644 --- a/LiteLoader/Header/MC/SwimWanderDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimWanderGoal.hpp b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimWanderGoal.hpp rename to LiteLoader/include/llapi/mc/SwimWanderGoal.hpp index 32d757f..3f42404 100644 --- a/LiteLoader/Header/MC/SwimWanderGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimWithEntityDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimWithEntityDefinition.hpp rename to LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp index e5ea1c1..6ec2c93 100644 --- a/LiteLoader/Header/MC/SwimWithEntityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwimWithEntityGoal.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SwimWithEntityGoal.hpp rename to LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp index 0498afa..17e004b 100644 --- a/LiteLoader/Header/MC/SwimWithEntityGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwoopAttackDefinition.hpp b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/SwoopAttackDefinition.hpp rename to LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp index 461d6a3..e389dc4 100644 --- a/LiteLoader/Header/MC/SwoopAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SwoopAttackGoal.hpp b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/SwoopAttackGoal.hpp rename to LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp index 06def39..497d033 100644 --- a/LiteLoader/Header/MC/SwoopAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SyncedAttribute.hpp b/LiteLoader/include/llapi/mc/SyncedAttribute.hpp similarity index 95% rename from LiteLoader/Header/MC/SyncedAttribute.hpp rename to LiteLoader/include/llapi/mc/SyncedAttribute.hpp index 34dd2e7..c74584e 100644 --- a/LiteLoader/Header/MC/SyncedAttribute.hpp +++ b/LiteLoader/include/llapi/mc/SyncedAttribute.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/SynchedActorData.hpp b/LiteLoader/include/llapi/mc/SynchedActorData.hpp similarity index 99% rename from LiteLoader/Header/MC/SynchedActorData.hpp rename to LiteLoader/include/llapi/mc/SynchedActorData.hpp index 52b35f9..8e5ee92 100644 --- a/LiteLoader/Header/MC/SynchedActorData.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "DataItem.hpp" diff --git a/LiteLoader/Header/MC/SystemFilePicker.hpp b/LiteLoader/include/llapi/mc/SystemFilePicker.hpp similarity index 97% rename from LiteLoader/Header/MC/SystemFilePicker.hpp rename to LiteLoader/include/llapi/mc/SystemFilePicker.hpp index 830577d..be9ad62 100644 --- a/LiteLoader/Header/MC/SystemFilePicker.hpp +++ b/LiteLoader/include/llapi/mc/SystemFilePicker.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Tag.hpp b/LiteLoader/include/llapi/mc/Tag.hpp similarity index 97% rename from LiteLoader/Header/MC/Tag.hpp rename to LiteLoader/include/llapi/mc/Tag.hpp index ea3e83e..cf498c3 100644 --- a/LiteLoader/Header/MC/Tag.hpp +++ b/LiteLoader/include/llapi/mc/Tag.hpp @@ -1,11 +1,11 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here -#include "../third-party/Nlohmann/fifo_json.hpp" +#include #include #include #include diff --git a/LiteLoader/Header/MC/TagCommand.hpp b/LiteLoader/include/llapi/mc/TagCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/TagCommand.hpp rename to LiteLoader/include/llapi/mc/TagCommand.hpp index 7145641..571f1ec 100644 --- a/LiteLoader/Header/MC/TagCommand.hpp +++ b/LiteLoader/include/llapi/mc/TagCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TagMemoryChunk.hpp b/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp similarity index 97% rename from LiteLoader/Header/MC/TagMemoryChunk.hpp rename to LiteLoader/include/llapi/mc/TagMemoryChunk.hpp index fab051e..05ee59a 100644 --- a/LiteLoader/Header/MC/TagMemoryChunk.hpp +++ b/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/Header/MC/TakeFlowerGoal.hpp b/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/TakeFlowerGoal.hpp rename to LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp index 0c64727..5a363dd 100644 --- a/LiteLoader/Header/MC/TakeFlowerGoal.hpp +++ b/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/TakeItemActorPacket.hpp rename to LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp index 48027b2..c9bd641 100644 --- a/LiteLoader/Header/MC/TakeItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TakePictureCommand.hpp b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TakePictureCommand.hpp rename to LiteLoader/include/llapi/mc/TakePictureCommand.hpp index 42f3d20..d96dd9f 100644 --- a/LiteLoader/Header/MC/TakePictureCommand.hpp +++ b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TallGrass.hpp b/LiteLoader/include/llapi/mc/TallGrass.hpp similarity index 99% rename from LiteLoader/Header/MC/TallGrass.hpp rename to LiteLoader/include/llapi/mc/TallGrass.hpp index eea25f4..0eede21 100644 --- a/LiteLoader/Header/MC/TallGrass.hpp +++ b/LiteLoader/include/llapi/mc/TallGrass.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TallGrassFeature.hpp b/LiteLoader/include/llapi/mc/TallGrassFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/TallGrassFeature.hpp rename to LiteLoader/include/llapi/mc/TallGrassFeature.hpp index 5bdb3a9..62389e9 100644 --- a/LiteLoader/Header/MC/TallGrassFeature.hpp +++ b/LiteLoader/include/llapi/mc/TallGrassFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TameableComponent.hpp b/LiteLoader/include/llapi/mc/TameableComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TameableComponent.hpp rename to LiteLoader/include/llapi/mc/TameableComponent.hpp index d1c5695..f93809a 100644 --- a/LiteLoader/Header/MC/TameableComponent.hpp +++ b/LiteLoader/include/llapi/mc/TameableComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TameableDescription.hpp b/LiteLoader/include/llapi/mc/TameableDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TameableDescription.hpp rename to LiteLoader/include/llapi/mc/TameableDescription.hpp index 07e4030..b051d64 100644 --- a/LiteLoader/Header/MC/TameableDescription.hpp +++ b/LiteLoader/include/llapi/mc/TameableDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetBlock.hpp b/LiteLoader/include/llapi/mc/TargetBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/TargetBlock.hpp rename to LiteLoader/include/llapi/mc/TargetBlock.hpp index cb82378..6a40f41 100644 --- a/LiteLoader/Header/MC/TargetBlock.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/TargetGoal.hpp rename to LiteLoader/include/llapi/mc/TargetGoal.hpp index cad80d4..c28bc6a 100644 --- a/LiteLoader/Header/MC/TargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetGoalDefinition.hpp b/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/TargetGoalDefinition.hpp rename to LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp index c8c84a2..bfbea98 100644 --- a/LiteLoader/Header/MC/TargetGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetNearbyDescription.hpp b/LiteLoader/include/llapi/mc/TargetNearbyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TargetNearbyDescription.hpp rename to LiteLoader/include/llapi/mc/TargetNearbyDescription.hpp index a2387eb..1eabb1c 100644 --- a/LiteLoader/Header/MC/TargetNearbyDescription.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetNearbySystem.hpp b/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp similarity index 95% rename from LiteLoader/Header/MC/TargetNearbySystem.hpp rename to LiteLoader/include/llapi/mc/TargetNearbySystem.hpp index 343a2f0..84c2761 100644 --- a/LiteLoader/Header/MC/TargetNearbySystem.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TargetWhenPushedGoal.hpp b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/TargetWhenPushedGoal.hpp rename to LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp index 4c0b944..1bde517 100644 --- a/LiteLoader/Header/MC/TargetWhenPushedGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TaskGroup.hpp b/LiteLoader/include/llapi/mc/TaskGroup.hpp similarity index 98% rename from LiteLoader/Header/MC/TaskGroup.hpp rename to LiteLoader/include/llapi/mc/TaskGroup.hpp index ec8103b..9146692 100644 --- a/LiteLoader/Header/MC/TaskGroup.hpp +++ b/LiteLoader/include/llapi/mc/TaskGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TaskResult.hpp b/LiteLoader/include/llapi/mc/TaskResult.hpp similarity index 96% rename from LiteLoader/Header/MC/TaskResult.hpp rename to LiteLoader/include/llapi/mc/TaskResult.hpp index e964bb3..3246820 100644 --- a/LiteLoader/Header/MC/TaskResult.hpp +++ b/LiteLoader/include/llapi/mc/TaskResult.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TaskStartInfo.hpp b/LiteLoader/include/llapi/mc/TaskStartInfo.hpp similarity index 96% rename from LiteLoader/Header/MC/TaskStartInfo.hpp rename to LiteLoader/include/llapi/mc/TaskStartInfo.hpp index 8c3240e..7dc52c4 100644 --- a/LiteLoader/Header/MC/TaskStartInfo.hpp +++ b/LiteLoader/include/llapi/mc/TaskStartInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TcpProxy.hpp b/LiteLoader/include/llapi/mc/TcpProxy.hpp similarity index 94% rename from LiteLoader/Header/MC/TcpProxy.hpp rename to LiteLoader/include/llapi/mc/TcpProxy.hpp index b6cc4d3..807654f 100644 --- a/LiteLoader/Header/MC/TcpProxy.hpp +++ b/LiteLoader/include/llapi/mc/TcpProxy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportCommand.hpp b/LiteLoader/include/llapi/mc/TeleportCommand.hpp similarity index 98% rename from LiteLoader/Header/MC/TeleportCommand.hpp rename to LiteLoader/include/llapi/mc/TeleportCommand.hpp index ba7a787..304532a 100644 --- a/LiteLoader/Header/MC/TeleportCommand.hpp +++ b/LiteLoader/include/llapi/mc/TeleportCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportComponent.hpp b/LiteLoader/include/llapi/mc/TeleportComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TeleportComponent.hpp rename to LiteLoader/include/llapi/mc/TeleportComponent.hpp index df968a2..b79deef 100644 --- a/LiteLoader/Header/MC/TeleportComponent.hpp +++ b/LiteLoader/include/llapi/mc/TeleportComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportDescription.hpp b/LiteLoader/include/llapi/mc/TeleportDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TeleportDescription.hpp rename to LiteLoader/include/llapi/mc/TeleportDescription.hpp index e397b30..09b4a6d 100644 --- a/LiteLoader/Header/MC/TeleportDescription.hpp +++ b/LiteLoader/include/llapi/mc/TeleportDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportRotationData.hpp b/LiteLoader/include/llapi/mc/TeleportRotationData.hpp similarity index 97% rename from LiteLoader/Header/MC/TeleportRotationData.hpp rename to LiteLoader/include/llapi/mc/TeleportRotationData.hpp index cb83535..1ae051f 100644 --- a/LiteLoader/Header/MC/TeleportRotationData.hpp +++ b/LiteLoader/include/llapi/mc/TeleportRotationData.hpp @@ -5,7 +5,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportSystem.hpp b/LiteLoader/include/llapi/mc/TeleportSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/TeleportSystem.hpp rename to LiteLoader/include/llapi/mc/TeleportSystem.hpp index f4a7e5a..1b0dab2 100644 --- a/LiteLoader/Header/MC/TeleportSystem.hpp +++ b/LiteLoader/include/llapi/mc/TeleportSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TeleportTarget.hpp b/LiteLoader/include/llapi/mc/TeleportTarget.hpp similarity index 94% rename from LiteLoader/Header/MC/TeleportTarget.hpp rename to LiteLoader/include/llapi/mc/TeleportTarget.hpp index 46d2b83..327534b 100644 --- a/LiteLoader/Header/MC/TeleportTarget.hpp +++ b/LiteLoader/include/llapi/mc/TeleportTarget.hpp @@ -1,6 +1,6 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA //DO NOT EDIT THIS LINE diff --git a/LiteLoader/Header/MC/TeleportToSubcomponent.hpp b/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TeleportToSubcomponent.hpp rename to LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp index 9fedb24..842bcdf 100644 --- a/LiteLoader/Header/MC/TeleportToSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TellCommand.hpp b/LiteLoader/include/llapi/mc/TellCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TellCommand.hpp rename to LiteLoader/include/llapi/mc/TellCommand.hpp index 7a687a4..ea02efd 100644 --- a/LiteLoader/Header/MC/TellCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TellRawCommand.hpp b/LiteLoader/include/llapi/mc/TellRawCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TellRawCommand.hpp rename to LiteLoader/include/llapi/mc/TellRawCommand.hpp index 7205849..207a047 100644 --- a/LiteLoader/Header/MC/TellRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellRawCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TemplateStructurePiece.hpp b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp similarity index 97% rename from LiteLoader/Header/MC/TemplateStructurePiece.hpp rename to LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp index 2e1c16d..e22720e 100644 --- a/LiteLoader/Header/MC/TemplateStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TemporalAttributeBuff.hpp b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp similarity index 97% rename from LiteLoader/Header/MC/TemporalAttributeBuff.hpp rename to LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp index a79ada9..f65ebc1 100644 --- a/LiteLoader/Header/MC/TemporalAttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TemptGoal.hpp b/LiteLoader/include/llapi/mc/TemptGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/TemptGoal.hpp rename to LiteLoader/include/llapi/mc/TemptGoal.hpp index 8e8ce8a..842a512 100644 --- a/LiteLoader/Header/MC/TemptGoal.hpp +++ b/LiteLoader/include/llapi/mc/TemptGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TerrainBurstReactionComponent.hpp b/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TerrainBurstReactionComponent.hpp rename to LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp index b7132a8..9da2979 100644 --- a/LiteLoader/Header/MC/TerrainBurstReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TestForBlockCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TestForBlockCommand.hpp rename to LiteLoader/include/llapi/mc/TestForBlockCommand.hpp index 3203607..663cec1 100644 --- a/LiteLoader/Header/MC/TestForBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TestForBlocksCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TestForBlocksCommand.hpp rename to LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp index 772ab91..a5bcc8e 100644 --- a/LiteLoader/Header/MC/TestForBlocksCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TestForCommand.hpp b/LiteLoader/include/llapi/mc/TestForCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TestForCommand.hpp rename to LiteLoader/include/llapi/mc/TestForCommand.hpp index c24e8c5..f7d105d 100644 --- a/LiteLoader/Header/MC/TestForCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextObjectLocalizedText.hpp b/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp similarity index 96% rename from LiteLoader/Header/MC/TextObjectLocalizedText.hpp rename to LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp index dff9df8..70ffa07 100644 --- a/LiteLoader/Header/MC/TextObjectLocalizedText.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextObjectLocalizedTextWithParams.hpp b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp similarity index 97% rename from LiteLoader/Header/MC/TextObjectLocalizedTextWithParams.hpp rename to LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp index 9a07812..f349c9d 100644 --- a/LiteLoader/Header/MC/TextObjectLocalizedTextWithParams.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextObjectParser.hpp b/LiteLoader/include/llapi/mc/TextObjectParser.hpp similarity index 97% rename from LiteLoader/Header/MC/TextObjectParser.hpp rename to LiteLoader/include/llapi/mc/TextObjectParser.hpp index d11c21e..6d3c03d 100644 --- a/LiteLoader/Header/MC/TextObjectParser.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectParser.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextObjectRoot.hpp b/LiteLoader/include/llapi/mc/TextObjectRoot.hpp similarity index 96% rename from LiteLoader/Header/MC/TextObjectRoot.hpp rename to LiteLoader/include/llapi/mc/TextObjectRoot.hpp index 8ec8a3b..1187dd1 100644 --- a/LiteLoader/Header/MC/TextObjectRoot.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectRoot.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextObjectText.hpp b/LiteLoader/include/llapi/mc/TextObjectText.hpp similarity index 95% rename from LiteLoader/Header/MC/TextObjectText.hpp rename to LiteLoader/include/llapi/mc/TextObjectText.hpp index 9f4b76b..989ca5b 100644 --- a/LiteLoader/Header/MC/TextObjectText.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectText.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp similarity index 98% rename from LiteLoader/Header/MC/TextPacket.hpp rename to LiteLoader/include/llapi/mc/TextPacket.hpp index 17c3826..656ce46 100644 --- a/LiteLoader/Header/MC/TextPacket.hpp +++ b/LiteLoader/include/llapi/mc/TextPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TextureUVCoordinateSet.hpp b/LiteLoader/include/llapi/mc/TextureUVCoordinateSet.hpp similarity index 95% rename from LiteLoader/Header/MC/TextureUVCoordinateSet.hpp rename to LiteLoader/include/llapi/mc/TextureUVCoordinateSet.hpp index 8db1f17..16ebb4d 100644 --- a/LiteLoader/Header/MC/TextureUVCoordinateSet.hpp +++ b/LiteLoader/include/llapi/mc/TextureUVCoordinateSet.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TheEndDimension.hpp b/LiteLoader/include/llapi/mc/TheEndDimension.hpp similarity index 98% rename from LiteLoader/Header/MC/TheEndDimension.hpp rename to LiteLoader/include/llapi/mc/TheEndDimension.hpp index 2a0d341..b4f32cb 100644 --- a/LiteLoader/Header/MC/TheEndDimension.hpp +++ b/LiteLoader/include/llapi/mc/TheEndDimension.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TheEndGenerator.hpp b/LiteLoader/include/llapi/mc/TheEndGenerator.hpp similarity index 98% rename from LiteLoader/Header/MC/TheEndGenerator.hpp rename to LiteLoader/include/llapi/mc/TheEndGenerator.hpp index 580bfe4..b615ef6 100644 --- a/LiteLoader/Header/MC/TheEndGenerator.hpp +++ b/LiteLoader/include/llapi/mc/TheEndGenerator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TheEndSpikeHelper.hpp b/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp similarity index 92% rename from LiteLoader/Header/MC/TheEndSpikeHelper.hpp rename to LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp index b2fb2c0..da6ea3e 100644 --- a/LiteLoader/Header/MC/TheEndSpikeHelper.hpp +++ b/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SpikeFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ThinFenceBlock.hpp b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/ThinFenceBlock.hpp rename to LiteLoader/include/llapi/mc/ThinFenceBlock.hpp index 6567294..07a33e7 100644 --- a/LiteLoader/Header/MC/ThinFenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ThirdPartyInfo.hpp b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp similarity index 94% rename from LiteLoader/Header/MC/ThirdPartyInfo.hpp rename to LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp index 66d9f80..c48307c 100644 --- a/LiteLoader/Header/MC/ThirdPartyInfo.hpp +++ b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Throwable.hpp b/LiteLoader/include/llapi/mc/Throwable.hpp similarity index 98% rename from LiteLoader/Header/MC/Throwable.hpp rename to LiteLoader/include/llapi/mc/Throwable.hpp index 1af48a1..5c8f902 100644 --- a/LiteLoader/Header/MC/Throwable.hpp +++ b/LiteLoader/include/llapi/mc/Throwable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ThrownEgg.hpp b/LiteLoader/include/llapi/mc/ThrownEgg.hpp similarity index 98% rename from LiteLoader/Header/MC/ThrownEgg.hpp rename to LiteLoader/include/llapi/mc/ThrownEgg.hpp index 488a09f..876cb54 100644 --- a/LiteLoader/Header/MC/ThrownEgg.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEgg.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/ThrownEnderpearl.hpp b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp similarity index 98% rename from LiteLoader/Header/MC/ThrownEnderpearl.hpp rename to LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp index ce1f91f..7be5c5b 100644 --- a/LiteLoader/Header/MC/ThrownEnderpearl.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/ThrownIceBomb.hpp b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp similarity index 98% rename from LiteLoader/Header/MC/ThrownIceBomb.hpp rename to LiteLoader/include/llapi/mc/ThrownIceBomb.hpp index 49cd122..ff0baad 100644 --- a/LiteLoader/Header/MC/ThrownIceBomb.hpp +++ b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/ThrownPotion.hpp b/LiteLoader/include/llapi/mc/ThrownPotion.hpp similarity index 98% rename from LiteLoader/Header/MC/ThrownPotion.hpp rename to LiteLoader/include/llapi/mc/ThrownPotion.hpp index 12e1b47..3bbe11e 100644 --- a/LiteLoader/Header/MC/ThrownPotion.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Throwable.hpp" diff --git a/LiteLoader/Header/MC/ThrownPotionEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp similarity index 97% rename from LiteLoader/Header/MC/ThrownPotionEffectSubcomponent.hpp rename to LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp index 08f25ab..ba539fb 100644 --- a/LiteLoader/Header/MC/ThrownPotionEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "SplashPotionEffectSubcomponent.hpp" diff --git a/LiteLoader/Header/MC/ThrownTrident.hpp b/LiteLoader/include/llapi/mc/ThrownTrident.hpp similarity index 98% rename from LiteLoader/Header/MC/ThrownTrident.hpp rename to LiteLoader/include/llapi/mc/ThrownTrident.hpp index 0c502ea..8d551bb 100644 --- a/LiteLoader/Header/MC/ThrownTrident.hpp +++ b/LiteLoader/include/llapi/mc/ThrownTrident.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "AbstractArrow.hpp" diff --git a/LiteLoader/Header/MC/Tick.hpp b/LiteLoader/include/llapi/mc/Tick.hpp similarity index 100% rename from LiteLoader/Header/MC/Tick.hpp rename to LiteLoader/include/llapi/mc/Tick.hpp diff --git a/LiteLoader/Header/MC/TickSyncPacket.hpp b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/TickSyncPacket.hpp rename to LiteLoader/include/llapi/mc/TickSyncPacket.hpp index 33b6783..957235c 100644 --- a/LiteLoader/Header/MC/TickSyncPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickWorldComponent.hpp b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TickWorldComponent.hpp rename to LiteLoader/include/llapi/mc/TickWorldComponent.hpp index 7f3770e..9496429 100644 --- a/LiteLoader/Header/MC/TickWorldComponent.hpp +++ b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickWorldDescription.hpp b/LiteLoader/include/llapi/mc/TickWorldDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TickWorldDescription.hpp rename to LiteLoader/include/llapi/mc/TickWorldDescription.hpp index d0034c2..0e8c13a 100644 --- a/LiteLoader/Header/MC/TickWorldDescription.hpp +++ b/LiteLoader/include/llapi/mc/TickWorldDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingArea.hpp b/LiteLoader/include/llapi/mc/TickingArea.hpp similarity index 98% rename from LiteLoader/Header/MC/TickingArea.hpp rename to LiteLoader/include/llapi/mc/TickingArea.hpp index ea8eec9..05ded61 100644 --- a/LiteLoader/Header/MC/TickingArea.hpp +++ b/LiteLoader/include/llapi/mc/TickingArea.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreaCommand.hpp b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp similarity index 97% rename from LiteLoader/Header/MC/TickingAreaCommand.hpp rename to LiteLoader/include/llapi/mc/TickingAreaCommand.hpp index f1c239b..11b853f 100644 --- a/LiteLoader/Header/MC/TickingAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreaDescription.hpp b/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp similarity index 95% rename from LiteLoader/Header/MC/TickingAreaDescription.hpp rename to LiteLoader/include/llapi/mc/TickingAreaDescription.hpp index 23e6a22..fc41837 100644 --- a/LiteLoader/Header/MC/TickingAreaDescription.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreaList.hpp b/LiteLoader/include/llapi/mc/TickingAreaList.hpp similarity index 95% rename from LiteLoader/Header/MC/TickingAreaList.hpp rename to LiteLoader/include/llapi/mc/TickingAreaList.hpp index 9a53cf2..b48ce6a 100644 --- a/LiteLoader/Header/MC/TickingAreaList.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaList.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreaListBase.hpp b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp similarity index 97% rename from LiteLoader/Header/MC/TickingAreaListBase.hpp rename to LiteLoader/include/llapi/mc/TickingAreaListBase.hpp index 6b4af0d..76b99fa 100644 --- a/LiteLoader/Header/MC/TickingAreaListBase.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreaView.hpp b/LiteLoader/include/llapi/mc/TickingAreaView.hpp similarity index 98% rename from LiteLoader/Header/MC/TickingAreaView.hpp rename to LiteLoader/include/llapi/mc/TickingAreaView.hpp index 3734192..2d6b905 100644 --- a/LiteLoader/Header/MC/TickingAreaView.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaView.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TickingAreasManager.hpp b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp similarity index 97% rename from LiteLoader/Header/MC/TickingAreasManager.hpp rename to LiteLoader/include/llapi/mc/TickingAreasManager.hpp index b456524..955880d 100644 --- a/LiteLoader/Header/MC/TickingAreasManager.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TimeCommand.hpp b/LiteLoader/include/llapi/mc/TimeCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TimeCommand.hpp rename to LiteLoader/include/llapi/mc/TimeCommand.hpp index c5d8522..ad80942 100644 --- a/LiteLoader/Header/MC/TimeCommand.hpp +++ b/LiteLoader/include/llapi/mc/TimeCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Timer.hpp b/LiteLoader/include/llapi/mc/Timer.hpp similarity index 94% rename from LiteLoader/Header/MC/Timer.hpp rename to LiteLoader/include/llapi/mc/Timer.hpp index b64da02..977c30a 100644 --- a/LiteLoader/Header/MC/Timer.hpp +++ b/LiteLoader/include/llapi/mc/Timer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TimerComponent.hpp b/LiteLoader/include/llapi/mc/TimerComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TimerComponent.hpp rename to LiteLoader/include/llapi/mc/TimerComponent.hpp index 811ecfd..e87ea0d 100644 --- a/LiteLoader/Header/MC/TimerComponent.hpp +++ b/LiteLoader/include/llapi/mc/TimerComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TimerDefinition.hpp b/LiteLoader/include/llapi/mc/TimerDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/TimerDefinition.hpp rename to LiteLoader/include/llapi/mc/TimerDefinition.hpp index 32bb4a7..5ba45ba 100644 --- a/LiteLoader/Header/MC/TimerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TimerDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TimerSystem.hpp b/LiteLoader/include/llapi/mc/TimerSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/TimerSystem.hpp rename to LiteLoader/include/llapi/mc/TimerSystem.hpp index 49b29ab..5c628c8 100644 --- a/LiteLoader/Header/MC/TimerSystem.hpp +++ b/LiteLoader/include/llapi/mc/TimerSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TitleCommand.hpp b/LiteLoader/include/llapi/mc/TitleCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TitleCommand.hpp rename to LiteLoader/include/llapi/mc/TitleCommand.hpp index 5cda83a..4ae1648 100644 --- a/LiteLoader/Header/MC/TitleCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TitleInfo.hpp b/LiteLoader/include/llapi/mc/TitleInfo.hpp similarity index 91% rename from LiteLoader/Header/MC/TitleInfo.hpp rename to LiteLoader/include/llapi/mc/TitleInfo.hpp index d6445a7..9060742 100644 --- a/LiteLoader/Header/MC/TitleInfo.hpp +++ b/LiteLoader/include/llapi/mc/TitleInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TitleRawCommand.hpp b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/TitleRawCommand.hpp rename to LiteLoader/include/llapi/mc/TitleRawCommand.hpp index d5e5531..77befa5 100644 --- a/LiteLoader/Header/MC/TitleRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TntBlock.hpp b/LiteLoader/include/llapi/mc/TntBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TntBlock.hpp rename to LiteLoader/include/llapi/mc/TntBlock.hpp index 5f18a52..db1ddcf 100644 --- a/LiteLoader/Header/MC/TntBlock.hpp +++ b/LiteLoader/include/llapi/mc/TntBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ToggleDownfallCommand.hpp b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/ToggleDownfallCommand.hpp rename to LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp index 70b975c..9ae3f4c 100644 --- a/LiteLoader/Header/MC/ToggleDownfallCommand.hpp +++ b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Token.hpp b/LiteLoader/include/llapi/mc/Token.hpp similarity index 95% rename from LiteLoader/Header/MC/Token.hpp rename to LiteLoader/include/llapi/mc/Token.hpp index 84e1604..d4deade 100644 --- a/LiteLoader/Header/MC/Token.hpp +++ b/LiteLoader/include/llapi/mc/Token.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ToolRecipes.hpp b/LiteLoader/include/llapi/mc/ToolRecipes.hpp similarity index 94% rename from LiteLoader/Header/MC/ToolRecipes.hpp rename to LiteLoader/include/llapi/mc/ToolRecipes.hpp index 9d172ba..87002dc 100644 --- a/LiteLoader/Header/MC/ToolRecipes.hpp +++ b/LiteLoader/include/llapi/mc/ToolRecipes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TopSnowBlock.hpp b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TopSnowBlock.hpp rename to LiteLoader/include/llapi/mc/TopSnowBlock.hpp index 7cc5cd7..d07cfbf 100644 --- a/LiteLoader/Header/MC/TopSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TopSnowBlockItem.hpp b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/TopSnowBlockItem.hpp rename to LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp index 6933b3c..4b758a9 100644 --- a/LiteLoader/Header/MC/TopSnowBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TorchBlock.hpp b/LiteLoader/include/llapi/mc/TorchBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TorchBlock.hpp rename to LiteLoader/include/llapi/mc/TorchBlock.hpp index 2c03cdd..94e4a86 100644 --- a/LiteLoader/Header/MC/TorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Trade.hpp b/LiteLoader/include/llapi/mc/Trade.hpp similarity index 94% rename from LiteLoader/Header/MC/Trade.hpp rename to LiteLoader/include/llapi/mc/Trade.hpp index f3c91d4..8929175 100644 --- a/LiteLoader/Header/MC/Trade.hpp +++ b/LiteLoader/include/llapi/mc/Trade.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Trade2ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/Trade2ContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp index ab2dd7b..f06e8dc 100644 --- a/LiteLoader/Header/MC/Trade2ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp similarity index 97% rename from LiteLoader/Header/MC/TradeContainerManagerModel.hpp rename to LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp index 2b7b1a1..7f7fd34 100644 --- a/LiteLoader/Header/MC/TradeContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ContainerManagerModel.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeGroup.hpp b/LiteLoader/include/llapi/mc/TradeGroup.hpp similarity index 94% rename from LiteLoader/Header/MC/TradeGroup.hpp rename to LiteLoader/include/llapi/mc/TradeGroup.hpp index 795f885..7f1c5cf 100644 --- a/LiteLoader/Header/MC/TradeGroup.hpp +++ b/LiteLoader/include/llapi/mc/TradeGroup.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeInterestGoal.hpp b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/TradeInterestGoal.hpp rename to LiteLoader/include/llapi/mc/TradeInterestGoal.hpp index 09ae7dc..df4e777 100644 --- a/LiteLoader/Header/MC/TradeInterestGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeItem.hpp b/LiteLoader/include/llapi/mc/TradeItem.hpp similarity index 94% rename from LiteLoader/Header/MC/TradeItem.hpp rename to LiteLoader/include/llapi/mc/TradeItem.hpp index 7941c3b..33bfe77 100644 --- a/LiteLoader/Header/MC/TradeItem.hpp +++ b/LiteLoader/include/llapi/mc/TradeItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeResupplyDescription.hpp b/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TradeResupplyDescription.hpp rename to LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp index cc0e4e1..e69efcc 100644 --- a/LiteLoader/Header/MC/TradeResupplyDescription.hpp +++ b/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeTable.hpp b/LiteLoader/include/llapi/mc/TradeTable.hpp similarity index 94% rename from LiteLoader/Header/MC/TradeTable.hpp rename to LiteLoader/include/llapi/mc/TradeTable.hpp index de60d13..b457d19 100644 --- a/LiteLoader/Header/MC/TradeTable.hpp +++ b/LiteLoader/include/llapi/mc/TradeTable.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeTables.hpp b/LiteLoader/include/llapi/mc/TradeTables.hpp similarity index 96% rename from LiteLoader/Header/MC/TradeTables.hpp rename to LiteLoader/include/llapi/mc/TradeTables.hpp index 9151482..fa8c443 100644 --- a/LiteLoader/Header/MC/TradeTables.hpp +++ b/LiteLoader/include/llapi/mc/TradeTables.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeTier.hpp b/LiteLoader/include/llapi/mc/TradeTier.hpp similarity index 94% rename from LiteLoader/Header/MC/TradeTier.hpp rename to LiteLoader/include/llapi/mc/TradeTier.hpp index eddadcd..34df2a2 100644 --- a/LiteLoader/Header/MC/TradeTier.hpp +++ b/LiteLoader/include/llapi/mc/TradeTier.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeWithPlayerGoal.hpp b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/TradeWithPlayerGoal.hpp rename to LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp index 7df6525..b4a2ceb 100644 --- a/LiteLoader/Header/MC/TradeWithPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TradeableSystem.hpp b/LiteLoader/include/llapi/mc/TradeableSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/TradeableSystem.hpp rename to LiteLoader/include/llapi/mc/TradeableSystem.hpp index beb70cc..7c821d7 100644 --- a/LiteLoader/Header/MC/TradeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/TradeableSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TraderMaterialTypeFunction.hpp b/LiteLoader/include/llapi/mc/TraderMaterialTypeFunction.hpp similarity index 97% rename from LiteLoader/Header/MC/TraderMaterialTypeFunction.hpp rename to LiteLoader/include/llapi/mc/TraderMaterialTypeFunction.hpp index d7c9c9e..ee3dc5e 100644 --- a/LiteLoader/Header/MC/TraderMaterialTypeFunction.hpp +++ b/LiteLoader/include/llapi/mc/TraderMaterialTypeFunction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LootItemFunction.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrailDescription.hpp b/LiteLoader/include/llapi/mc/TrailDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TrailDescription.hpp rename to LiteLoader/include/llapi/mc/TrailDescription.hpp index deb95be..2ec74fd 100644 --- a/LiteLoader/Header/MC/TrailDescription.hpp +++ b/LiteLoader/include/llapi/mc/TrailDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrailSystem.hpp b/LiteLoader/include/llapi/mc/TrailSystem.hpp similarity index 96% rename from LiteLoader/Header/MC/TrailSystem.hpp rename to LiteLoader/include/llapi/mc/TrailSystem.hpp index 1e73985..56ef557 100644 --- a/LiteLoader/Header/MC/TrailSystem.hpp +++ b/LiteLoader/include/llapi/mc/TrailSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransactionalWorldBlockTarget.hpp b/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp similarity index 98% rename from LiteLoader/Header/MC/TransactionalWorldBlockTarget.hpp rename to LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp index f3bbb7b..2ca9216 100644 --- a/LiteLoader/Header/MC/TransactionalWorldBlockTarget.hpp +++ b/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransferPacket.hpp b/LiteLoader/include/llapi/mc/TransferPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/TransferPacket.hpp rename to LiteLoader/include/llapi/mc/TransferPacket.hpp index 092f420..b484ea6 100644 --- a/LiteLoader/Header/MC/TransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/TransferPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransformationComponent.hpp b/LiteLoader/include/llapi/mc/TransformationComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TransformationComponent.hpp rename to LiteLoader/include/llapi/mc/TransformationComponent.hpp index fbc2b1e..1a19b05 100644 --- a/LiteLoader/Header/MC/TransformationComponent.hpp +++ b/LiteLoader/include/llapi/mc/TransformationComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransformationDescription.hpp b/LiteLoader/include/llapi/mc/TransformationDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TransformationDescription.hpp rename to LiteLoader/include/llapi/mc/TransformationDescription.hpp index e62e504..00ed0e1 100644 --- a/LiteLoader/Header/MC/TransformationDescription.hpp +++ b/LiteLoader/include/llapi/mc/TransformationDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransformationSystem.hpp b/LiteLoader/include/llapi/mc/TransformationSystem.hpp similarity index 95% rename from LiteLoader/Header/MC/TransformationSystem.hpp rename to LiteLoader/include/llapi/mc/TransformationSystem.hpp index 5b6c20a..75acfae 100644 --- a/LiteLoader/Header/MC/TransformationSystem.hpp +++ b/LiteLoader/include/llapi/mc/TransformationSystem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TransporterComponent.hpp b/LiteLoader/include/llapi/mc/TransporterComponent.hpp similarity index 97% rename from LiteLoader/Header/MC/TransporterComponent.hpp rename to LiteLoader/include/llapi/mc/TransporterComponent.hpp index ee71cbc..f1f4fdc 100644 --- a/LiteLoader/Header/MC/TransporterComponent.hpp +++ b/LiteLoader/include/llapi/mc/TransporterComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BaseCircuitComponent.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrapDoorBlock.hpp b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TrapDoorBlock.hpp rename to LiteLoader/include/llapi/mc/TrapDoorBlock.hpp index fe84dae..8c65ae7 100644 --- a/LiteLoader/Header/MC/TrapDoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TreeHelper.hpp b/LiteLoader/include/llapi/mc/TreeHelper.hpp similarity index 96% rename from LiteLoader/Header/MC/TreeHelper.hpp rename to LiteLoader/include/llapi/mc/TreeHelper.hpp index 10c7b4a..a496f86 100644 --- a/LiteLoader/Header/MC/TreeHelper.hpp +++ b/LiteLoader/include/llapi/mc/TreeHelper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TridentChannelingEnchant.hpp b/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp similarity index 97% rename from LiteLoader/Header/MC/TridentChannelingEnchant.hpp rename to LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp index 505e534..7f5f63f 100644 --- a/LiteLoader/Header/MC/TridentChannelingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TridentImpalerEnchant.hpp b/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/TridentImpalerEnchant.hpp rename to LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp index 776a287..f5dae23 100644 --- a/LiteLoader/Header/MC/TridentImpalerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TridentItem.hpp b/LiteLoader/include/llapi/mc/TridentItem.hpp similarity index 98% rename from LiteLoader/Header/MC/TridentItem.hpp rename to LiteLoader/include/llapi/mc/TridentItem.hpp index 1565317..7be7de3 100644 --- a/LiteLoader/Header/MC/TridentItem.hpp +++ b/LiteLoader/include/llapi/mc/TridentItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TridentLoyaltyEnchant.hpp b/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/TridentLoyaltyEnchant.hpp rename to LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp index edef6dc..9bd2c4a 100644 --- a/LiteLoader/Header/MC/TridentLoyaltyEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TridentRiptideEnchant.hpp b/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp similarity index 96% rename from LiteLoader/Header/MC/TridentRiptideEnchant.hpp rename to LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp index 2d71166..26665e3 100644 --- a/LiteLoader/Header/MC/TridentRiptideEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Enchant.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TriggerDescription.hpp b/LiteLoader/include/llapi/mc/TriggerDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TriggerDescription.hpp rename to LiteLoader/include/llapi/mc/TriggerDescription.hpp index c79e606..659d7e1 100644 --- a/LiteLoader/Header/MC/TriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/TriggerDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TripWireBlock.hpp b/LiteLoader/include/llapi/mc/TripWireBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TripWireBlock.hpp rename to LiteLoader/include/llapi/mc/TripWireBlock.hpp index 4068100..7adff88 100644 --- a/LiteLoader/Header/MC/TripWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TripWireHookBlock.hpp b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TripWireHookBlock.hpp rename to LiteLoader/include/llapi/mc/TripWireHookBlock.hpp index 589a7cd..94954e8 100644 --- a/LiteLoader/Header/MC/TripWireHookBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TripodCamera.hpp b/LiteLoader/include/llapi/mc/TripodCamera.hpp similarity index 98% rename from LiteLoader/Header/MC/TripodCamera.hpp rename to LiteLoader/include/llapi/mc/TripodCamera.hpp index 964f3d0..488b5b1 100644 --- a/LiteLoader/Header/MC/TripodCamera.hpp +++ b/LiteLoader/include/llapi/mc/TripodCamera.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/TripodCameraDescription.hpp b/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TripodCameraDescription.hpp rename to LiteLoader/include/llapi/mc/TripodCameraDescription.hpp index 124fffc..8809a53 100644 --- a/LiteLoader/Header/MC/TripodCameraDescription.hpp +++ b/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TropicalFish.hpp b/LiteLoader/include/llapi/mc/TropicalFish.hpp similarity index 98% rename from LiteLoader/Header/MC/TropicalFish.hpp rename to LiteLoader/include/llapi/mc/TropicalFish.hpp index 6e43efc..c1fa0b1 100644 --- a/LiteLoader/Header/MC/TropicalFish.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFish.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "WaterAnimal.hpp" diff --git a/LiteLoader/Header/MC/TropicalFishInfo.hpp b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/TropicalFishInfo.hpp rename to LiteLoader/include/llapi/mc/TropicalFishInfo.hpp index e02d1ed..8324a7c 100644 --- a/LiteLoader/Header/MC/TropicalFishInfo.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrustComponent.hpp b/LiteLoader/include/llapi/mc/TrustComponent.hpp similarity index 95% rename from LiteLoader/Header/MC/TrustComponent.hpp rename to LiteLoader/include/llapi/mc/TrustComponent.hpp index 0ed3f3e..8eeef35 100644 --- a/LiteLoader/Header/MC/TrustComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrustComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrustDescription.hpp b/LiteLoader/include/llapi/mc/TrustDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TrustDescription.hpp rename to LiteLoader/include/llapi/mc/TrustDescription.hpp index a1f0f32..7b449cc 100644 --- a/LiteLoader/Header/MC/TrustDescription.hpp +++ b/LiteLoader/include/llapi/mc/TrustDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrustedKeys.hpp b/LiteLoader/include/llapi/mc/TrustedKeys.hpp similarity index 90% rename from LiteLoader/Header/MC/TrustedKeys.hpp rename to LiteLoader/include/llapi/mc/TrustedKeys.hpp index 4ab1658..031e252 100644 --- a/LiteLoader/Header/MC/TrustedKeys.hpp +++ b/LiteLoader/include/llapi/mc/TrustedKeys.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrustingComponent.hpp b/LiteLoader/include/llapi/mc/TrustingComponent.hpp similarity index 96% rename from LiteLoader/Header/MC/TrustingComponent.hpp rename to LiteLoader/include/llapi/mc/TrustingComponent.hpp index ed7a0c9..5311662 100644 --- a/LiteLoader/Header/MC/TrustingComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrustingComponent.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TrustingDescription.hpp b/LiteLoader/include/llapi/mc/TrustingDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/TrustingDescription.hpp rename to LiteLoader/include/llapi/mc/TrustingDescription.hpp index 7202b77..ea079a3 100644 --- a/LiteLoader/Header/MC/TrustingDescription.hpp +++ b/LiteLoader/include/llapi/mc/TrustingDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Turtle.hpp b/LiteLoader/include/llapi/mc/Turtle.hpp similarity index 98% rename from LiteLoader/Header/MC/Turtle.hpp rename to LiteLoader/include/llapi/mc/Turtle.hpp index 673a89d..27ff5e1 100644 --- a/LiteLoader/Header/MC/Turtle.hpp +++ b/LiteLoader/include/llapi/mc/Turtle.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/TurtleEggBlock.hpp b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TurtleEggBlock.hpp rename to LiteLoader/include/llapi/mc/TurtleEggBlock.hpp index 0740f0e..7f59a18 100644 --- a/LiteLoader/Header/MC/TurtleEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TwistingVinesBlock.hpp b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/TwistingVinesBlock.hpp rename to LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp index 9df9471..4bcbf8d 100644 --- a/LiteLoader/Header/MC/TwistingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/TwistingVinesClusterFeature.hpp b/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/TwistingVinesClusterFeature.hpp rename to LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp index 8b05483..739e634 100644 --- a/LiteLoader/Header/MC/TwistingVinesClusterFeature.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Types.hpp b/LiteLoader/include/llapi/mc/Types.hpp similarity index 99% rename from LiteLoader/Header/MC/Types.hpp rename to LiteLoader/include/llapi/mc/Types.hpp index be1554d..963975b 100644 --- a/LiteLoader/Header/MC/Types.hpp +++ b/LiteLoader/include/llapi/mc/Types.hpp @@ -1,7 +1,7 @@ #pragma once -#include "HookAPI.h" -#include "../Global.h" +#include +#include "llapi/Global.h" #include "Vec2.hpp" #include "Vec3.hpp" #include "BlockPos.hpp" @@ -438,7 +438,7 @@ public: class Command; }; -#include "../MC/Automation.hpp" +#include "Automation.hpp" class ClientBlobCache { public: @@ -1352,10 +1352,11 @@ public: } }; -/* + enum class BlockActorType : int { + UnKnow = 0x0, Furnace = 0x01, Chest = 0x02, NetherReactor = 0x03, @@ -1403,7 +1404,7 @@ enum class BlockActorType : int SculkCatalyst = 0x30, SculkShrieker = 0x31, }; - +/* enum class ActorType; */ diff --git a/LiteLoader/Header/MC/UnburiedConstraint.hpp b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp similarity index 96% rename from LiteLoader/Header/MC/UnburiedConstraint.hpp rename to LiteLoader/include/llapi/mc/UnburiedConstraint.hpp index b6e51d8..8d80b37 100644 --- a/LiteLoader/Header/MC/UnburiedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UnderwaterCanyonFeature.hpp b/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/UnderwaterCanyonFeature.hpp rename to LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp index 21a6991..38d3453 100644 --- a/LiteLoader/Header/MC/UnderwaterCanyonFeature.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "CanyonFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UnderwaterLargeCaveFeature.hpp b/LiteLoader/include/llapi/mc/UnderwaterLargeCaveFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/UnderwaterLargeCaveFeature.hpp rename to LiteLoader/include/llapi/mc/UnderwaterLargeCaveFeature.hpp index 15714a5..72a3569 100644 --- a/LiteLoader/Header/MC/UnderwaterLargeCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterLargeCaveFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UnderwaterTorchBlock.hpp b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/UnderwaterTorchBlock.hpp rename to LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp index 10d4b8b..5a611e5 100644 --- a/LiteLoader/Header/MC/UnderwaterTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TorchBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UndyedShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/UndyedShulkerBoxBlock.hpp rename to LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp index 0c8bff7..930dc79 100644 --- a/LiteLoader/Header/MC/UndyedShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ShulkerBoxBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UnverifiedCertificate.hpp b/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp similarity index 97% rename from LiteLoader/Header/MC/UnverifiedCertificate.hpp rename to LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp index 4f30f0b..423bea4 100644 --- a/LiteLoader/Header/MC/UnverifiedCertificate.hpp +++ b/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateAttributesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/UpdateAttributesPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp index 805da16..38eb2f1 100644 --- a/LiteLoader/Header/MC/UpdateAttributesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateBlockPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/UpdateBlockPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp index 5d5fb2c..94ef275 100644 --- a/LiteLoader/Header/MC/UpdateBlockPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateBlockPropertiesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPropertiesPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/UpdateBlockPropertiesPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateBlockPropertiesPacket.hpp index 4d553ab..1a7dddc 100644 --- a/LiteLoader/Header/MC/UpdateBlockPropertiesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockPropertiesPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateBlockSyncedPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/UpdateBlockSyncedPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp index 2bd3f10..20163ff 100644 --- a/LiteLoader/Header/MC/UpdateBlockSyncedPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateEquipPacket.hpp b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp similarity index 96% rename from LiteLoader/Header/MC/UpdateEquipPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp index a0cb731..e2a4d8e 100644 --- a/LiteLoader/Header/MC/UpdateEquipPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdatePlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp similarity index 97% rename from LiteLoader/Header/MC/UpdatePlayerGameTypePacket.hpp rename to LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp index 2990ba7..3ec043a 100644 --- a/LiteLoader/Header/MC/UpdatePlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateSoftEnumPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp similarity index 97% rename from LiteLoader/Header/MC/UpdateSoftEnumPacket.hpp rename to LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp index 929bffd..102f583 100644 --- a/LiteLoader/Header/MC/UpdateSoftEnumPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp similarity index 96% rename from LiteLoader/Header/MC/UpdateTradePacket.hpp rename to LiteLoader/include/llapi/mc/UpdateTradePacket.hpp index 45cd25b..06b96e0 100644 --- a/LiteLoader/Header/MC/UpdateTradePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UriListener.hpp b/LiteLoader/include/llapi/mc/UriListener.hpp similarity index 94% rename from LiteLoader/Header/MC/UriListener.hpp rename to LiteLoader/include/llapi/mc/UriListener.hpp index 89c6369..1657354 100644 --- a/LiteLoader/Header/MC/UriListener.hpp +++ b/LiteLoader/include/llapi/mc/UriListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/UseActorDefinition.hpp b/LiteLoader/include/llapi/mc/UseActorDefinition.hpp similarity index 95% rename from LiteLoader/Header/MC/UseActorDefinition.hpp rename to LiteLoader/include/llapi/mc/UseActorDefinition.hpp index 669a276..e34b6ab 100644 --- a/LiteLoader/Header/MC/UseActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/UseActorDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/UseActorNode.hpp b/LiteLoader/include/llapi/mc/UseActorNode.hpp similarity index 95% rename from LiteLoader/Header/MC/UseActorNode.hpp rename to LiteLoader/include/llapi/mc/UseActorNode.hpp index f7e869d..e610876 100644 --- a/LiteLoader/Header/MC/UseActorNode.hpp +++ b/LiteLoader/include/llapi/mc/UseActorNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp similarity index 99% rename from LiteLoader/Header/MC/Util.hpp rename to LiteLoader/include/llapi/mc/Util.hpp index b67af0a..3847126 100644 --- a/LiteLoader/Header/MC/Util.hpp +++ b/LiteLoader/include/llapi/mc/Util.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaActorRendererId.hpp b/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaActorRendererId.hpp rename to LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp index 98772f8..6402425 100644 --- a/LiteLoader/Header/MC/VanillaActorRendererId.hpp +++ b/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaActors.hpp b/LiteLoader/include/llapi/mc/VanillaActors.hpp similarity index 89% rename from LiteLoader/Header/MC/VanillaActors.hpp rename to LiteLoader/include/llapi/mc/VanillaActors.hpp index 07d1777..26a084a5 100644 --- a/LiteLoader/Header/MC/VanillaActors.hpp +++ b/LiteLoader/include/llapi/mc/VanillaActors.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaAppConfigs.hpp b/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp similarity index 98% rename from LiteLoader/Header/MC/VanillaAppConfigs.hpp rename to LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp index bc06429..a6313af 100644 --- a/LiteLoader/Header/MC/VanillaAppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "AppConfigs.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBastionJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaBastionJigsawStructureBlockRules.hpp rename to LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp index ffd8b7c..99311e4 100644 --- a/LiteLoader/Header/MC/VanillaBastionJigsawStructureBlockRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBastionJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaBastionJigsawStructureElements.hpp rename to LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp index ea9f844..6a49cd5 100644 --- a/LiteLoader/Header/MC/VanillaBastionJigsawStructureElements.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBastionJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaBastionJigsawStructures.hpp rename to LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp index ddfaf4c..1c40be3 100644 --- a/LiteLoader/Header/MC/VanillaBastionJigsawStructures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBiomes.hpp b/LiteLoader/include/llapi/mc/VanillaBiomes.hpp similarity index 99% rename from LiteLoader/Header/MC/VanillaBiomes.hpp rename to LiteLoader/include/llapi/mc/VanillaBiomes.hpp index eb3379f..211d442 100644 --- a/LiteLoader/Header/MC/VanillaBiomes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBiomes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBlockConversion.hpp b/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp similarity index 94% rename from LiteLoader/Header/MC/VanillaBlockConversion.hpp rename to LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp index 0126350..c12a89e 100644 --- a/LiteLoader/Header/MC/VanillaBlockConversion.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBlockStateTransformUtils.hpp b/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp similarity index 97% rename from LiteLoader/Header/MC/VanillaBlockStateTransformUtils.hpp rename to LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp index 799d8cc..c347933 100644 --- a/LiteLoader/Header/MC/VanillaBlockStateTransformUtils.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBlockTypes.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp similarity index 99% rename from LiteLoader/Header/MC/VanillaBlockTypes.hpp rename to LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp index 95e955e..f982d29 100644 --- a/LiteLoader/Header/MC/VanillaBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBlockUpdater.hpp b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp similarity index 97% rename from LiteLoader/Header/MC/VanillaBlockUpdater.hpp rename to LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp index 4f477a4..e4325ef 100644 --- a/LiteLoader/Header/MC/VanillaBlockUpdater.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBlocks.hpp b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp similarity index 99% rename from LiteLoader/Header/MC/VanillaBlocks.hpp rename to LiteLoader/include/llapi/mc/VanillaBlocks.hpp index 78e2135..2e8c308 100644 --- a/LiteLoader/Header/MC/VanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaBuiltInEntities.hpp b/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp similarity index 90% rename from LiteLoader/Header/MC/VanillaBuiltInEntities.hpp rename to LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp index f4726b9..ae13cae 100644 --- a/LiteLoader/Header/MC/VanillaBuiltInEntities.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaDimensionFactory.hpp b/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp similarity index 92% rename from LiteLoader/Header/MC/VanillaDimensionFactory.hpp rename to LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp index 917b382..8b2948b 100644 --- a/LiteLoader/Header/MC/VanillaDimensionFactory.hpp +++ b/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaDimensions.hpp b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp similarity index 98% rename from LiteLoader/Header/MC/VanillaDimensions.hpp rename to LiteLoader/include/llapi/mc/VanillaDimensions.hpp index 94b3c5b..a8547e8 100644 --- a/LiteLoader/Header/MC/VanillaDimensions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaFeatures.hpp b/LiteLoader/include/llapi/mc/VanillaFeatures.hpp similarity index 95% rename from LiteLoader/Header/MC/VanillaFeatures.hpp rename to LiteLoader/include/llapi/mc/VanillaFeatures.hpp index b88e305..8d3fc0f 100644 --- a/LiteLoader/Header/MC/VanillaFeatures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaFeatures.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaGameModuleDedicatedServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaGameModuleDedicatedServer.hpp rename to LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp index 2975ed2..65e7d17 100644 --- a/LiteLoader/Header/MC/VanillaGameModuleDedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaGameModuleServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp similarity index 98% rename from LiteLoader/Header/MC/VanillaGameModuleServer.hpp rename to LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp index 2c890f4..8dd7526 100644 --- a/LiteLoader/Header/MC/VanillaGameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaGameVersions.hpp b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp similarity index 92% rename from LiteLoader/Header/MC/VanillaGameVersions.hpp rename to LiteLoader/include/llapi/mc/VanillaGameVersions.hpp index 5e2de74..58319b2 100644 --- a/LiteLoader/Header/MC/VanillaGameVersions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaGoalDefinition.hpp b/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp similarity index 89% rename from LiteLoader/Header/MC/VanillaGoalDefinition.hpp rename to LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp index f26da88..128f8f3 100644 --- a/LiteLoader/Header/MC/VanillaGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaGoalUtility.hpp b/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp similarity index 90% rename from LiteLoader/Header/MC/VanillaGoalUtility.hpp rename to LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp index d1378e4..27f955f 100644 --- a/LiteLoader/Header/MC/VanillaGoalUtility.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaInPackagePacks.hpp b/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaInPackagePacks.hpp rename to LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp index 8a9e2e3..957925b 100644 --- a/LiteLoader/Header/MC/VanillaInPackagePacks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaItemTiers.hpp b/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaItemTiers.hpp rename to LiteLoader/include/llapi/mc/VanillaItemTiers.hpp index 61d075b..10d1449 100644 --- a/LiteLoader/Header/MC/VanillaItemTiers.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaItems.hpp b/LiteLoader/include/llapi/mc/VanillaItems.hpp similarity index 99% rename from LiteLoader/Header/MC/VanillaItems.hpp rename to LiteLoader/include/llapi/mc/VanillaItems.hpp index e893f6a..1b9e026 100644 --- a/LiteLoader/Header/MC/VanillaItems.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItems.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaLevelChunkUpgrade.hpp b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp similarity index 97% rename from LiteLoader/Header/MC/VanillaLevelChunkUpgrade.hpp rename to LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp index 57fc35a..df43745 100644 --- a/LiteLoader/Header/MC/VanillaLevelChunkUpgrade.hpp +++ b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaOverworldBiomeSource.hpp b/LiteLoader/include/llapi/mc/VanillaOverworldBiomeSource.hpp similarity index 97% rename from LiteLoader/Header/MC/VanillaOverworldBiomeSource.hpp rename to LiteLoader/include/llapi/mc/VanillaOverworldBiomeSource.hpp index 23cbe36..46a9f48 100644 --- a/LiteLoader/Header/MC/VanillaOverworldBiomeSource.hpp +++ b/LiteLoader/include/llapi/mc/VanillaOverworldBiomeSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "LayerBiomeSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaServerGameplayEventListener.hpp b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp similarity index 98% rename from LiteLoader/Header/MC/VanillaServerGameplayEventListener.hpp rename to LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp index e9f668b..6ba049f 100644 --- a/LiteLoader/Header/MC/VanillaServerGameplayEventListener.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaServerNetworkHandler.hpp rename to LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp index eb9b6eb..b94d2c2 100644 --- a/LiteLoader/Header/MC/VanillaServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp similarity index 99% rename from LiteLoader/Header/MC/VanillaStates.hpp rename to LiteLoader/include/llapi/mc/VanillaStates.hpp index 5b29487..e7e9e34 100644 --- a/LiteLoader/Header/MC/VanillaStates.hpp +++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaSystemsRegistration.hpp b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp similarity index 93% rename from LiteLoader/Header/MC/VanillaSystemsRegistration.hpp rename to LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp index 6f0f2a7..569ab24 100644 --- a/LiteLoader/Header/MC/VanillaSystemsRegistration.hpp +++ b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaTreeFeature.hpp b/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp similarity index 98% rename from LiteLoader/Header/MC/VanillaTreeFeature.hpp rename to LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp index df26186..f2cfe98 100644 --- a/LiteLoader/Header/MC/VanillaTreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "JsonUtil.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaVillageJigsawStructureActorRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaVillageJigsawStructureActorRules.hpp rename to LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp index bbb69f9..a46ccab 100644 --- a/LiteLoader/Header/MC/VanillaVillageJigsawStructureActorRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockRules.hpp rename to LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp index f73b698..0bc5a8c 100644 --- a/LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockTagRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockTagRules.hpp rename to LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp index 3089af4..ae2ceaa 100644 --- a/LiteLoader/Header/MC/VanillaVillageJigsawStructureBlockTagRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaVillageJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaVillageJigsawStructureElements.hpp rename to LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp index 9def636..da92761 100644 --- a/LiteLoader/Header/MC/VanillaVillageJigsawStructureElements.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaVillageJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp similarity index 96% rename from LiteLoader/Header/MC/VanillaVillageJigsawStructures.hpp rename to LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp index 65b2644..4c84546 100644 --- a/LiteLoader/Header/MC/VanillaVillageJigsawStructures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VanillaWorldSystems.hpp b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp similarity index 92% rename from LiteLoader/Header/MC/VanillaWorldSystems.hpp rename to LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp index 5677b50..21a830a 100644 --- a/LiteLoader/Header/MC/VanillaWorldSystems.hpp +++ b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VarIntDataInput.hpp b/LiteLoader/include/llapi/mc/VarIntDataInput.hpp similarity index 95% rename from LiteLoader/Header/MC/VarIntDataInput.hpp rename to LiteLoader/include/llapi/mc/VarIntDataInput.hpp index b37bdcd..e9b47c0 100644 --- a/LiteLoader/Header/MC/VarIntDataInput.hpp +++ b/LiteLoader/include/llapi/mc/VarIntDataInput.hpp @@ -1,10 +1,10 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA -#include "MC/ReadOnlyBinaryStream.hpp" +#include "ReadOnlyBinaryStream.hpp" #undef BEFORE_EXTRA class VarIntDataInput { diff --git a/LiteLoader/Header/MC/VarIntDataOutput.hpp b/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp similarity index 97% rename from LiteLoader/Header/MC/VarIntDataOutput.hpp rename to LiteLoader/include/llapi/mc/VarIntDataOutput.hpp index 45a7ac0..97bf2ac 100644 --- a/LiteLoader/Header/MC/VarIntDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VariantDescription.hpp b/LiteLoader/include/llapi/mc/VariantDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/VariantDescription.hpp rename to LiteLoader/include/llapi/mc/VariantDescription.hpp index 4737301..bec8966 100644 --- a/LiteLoader/Header/MC/VariantDescription.hpp +++ b/LiteLoader/include/llapi/mc/VariantDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Vec2.hpp b/LiteLoader/include/llapi/mc/Vec2.hpp similarity index 97% rename from LiteLoader/Header/MC/Vec2.hpp rename to LiteLoader/include/llapi/mc/Vec2.hpp index 7c76fef..05a0991 100644 --- a/LiteLoader/Header/MC/Vec2.hpp +++ b/LiteLoader/include/llapi/mc/Vec2.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Vec3.hpp b/LiteLoader/include/llapi/mc/Vec3.hpp similarity index 99% rename from LiteLoader/Header/MC/Vec3.hpp rename to LiteLoader/include/llapi/mc/Vec3.hpp index d5f2537..082f227 100644 --- a/LiteLoader/Header/MC/Vec3.hpp +++ b/LiteLoader/include/llapi/mc/Vec3.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockPos.hpp" class Vec3 { diff --git a/LiteLoader/Header/MC/Vex.hpp b/LiteLoader/include/llapi/mc/Vex.hpp similarity index 98% rename from LiteLoader/Header/MC/Vex.hpp rename to LiteLoader/include/llapi/mc/Vex.hpp index c9efc51..ea56c39 100644 --- a/LiteLoader/Header/MC/Vex.hpp +++ b/LiteLoader/include/llapi/mc/Vex.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/VexCopyOwnerTargetGoal.hpp b/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/VexCopyOwnerTargetGoal.hpp rename to LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp index 4ce101b..8c1a601 100644 --- a/LiteLoader/Header/MC/VexCopyOwnerTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VexRandomMoveGoal.hpp b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp similarity index 96% rename from LiteLoader/Header/MC/VexRandomMoveGoal.hpp rename to LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp index 45413fe..c2a34b1 100644 --- a/LiteLoader/Header/MC/VexRandomMoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Village.hpp b/LiteLoader/include/llapi/mc/Village.hpp similarity index 99% rename from LiteLoader/Header/MC/Village.hpp rename to LiteLoader/include/llapi/mc/Village.hpp index 0472bec..24d2b03 100644 --- a/LiteLoader/Header/MC/Village.hpp +++ b/LiteLoader/include/llapi/mc/Village.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VillageFeature.hpp b/LiteLoader/include/llapi/mc/VillageFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/VillageFeature.hpp rename to LiteLoader/include/llapi/mc/VillageFeature.hpp index 9b58c84..a10584c 100644 --- a/LiteLoader/Header/MC/VillageFeature.hpp +++ b/LiteLoader/include/llapi/mc/VillageFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VillageManager.hpp b/LiteLoader/include/llapi/mc/VillageManager.hpp similarity index 98% rename from LiteLoader/Header/MC/VillageManager.hpp rename to LiteLoader/include/llapi/mc/VillageManager.hpp index dc760e4..0336b65 100644 --- a/LiteLoader/Header/MC/VillageManager.hpp +++ b/LiteLoader/include/llapi/mc/VillageManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VillagePiece.hpp b/LiteLoader/include/llapi/mc/VillagePiece.hpp similarity index 98% rename from LiteLoader/Header/MC/VillagePiece.hpp rename to LiteLoader/include/llapi/mc/VillagePiece.hpp index 884fe52..7f2e9a9 100644 --- a/LiteLoader/Header/MC/VillagePiece.hpp +++ b/LiteLoader/include/llapi/mc/VillagePiece.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PoolElementStructurePiece.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VillageStart.hpp b/LiteLoader/include/llapi/mc/VillageStart.hpp similarity index 96% rename from LiteLoader/Header/MC/VillageStart.hpp rename to LiteLoader/include/llapi/mc/VillageStart.hpp index 58c1d73..e5c1164 100644 --- a/LiteLoader/Header/MC/VillageStart.hpp +++ b/LiteLoader/include/llapi/mc/VillageStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Villager.hpp b/LiteLoader/include/llapi/mc/Villager.hpp similarity index 98% rename from LiteLoader/Header/MC/Villager.hpp rename to LiteLoader/include/llapi/mc/Villager.hpp index f6e572e..c0b79cd 100644 --- a/LiteLoader/Header/MC/Villager.hpp +++ b/LiteLoader/include/llapi/mc/Villager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "VillagerBase.hpp" diff --git a/LiteLoader/Header/MC/VillagerBase.hpp b/LiteLoader/include/llapi/mc/VillagerBase.hpp similarity index 98% rename from LiteLoader/Header/MC/VillagerBase.hpp rename to LiteLoader/include/llapi/mc/VillagerBase.hpp index 5c41c0f..7196452 100644 --- a/LiteLoader/Header/MC/VillagerBase.hpp +++ b/LiteLoader/include/llapi/mc/VillagerBase.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/VillagerV2.hpp b/LiteLoader/include/llapi/mc/VillagerV2.hpp similarity index 98% rename from LiteLoader/Header/MC/VillagerV2.hpp rename to LiteLoader/include/llapi/mc/VillagerV2.hpp index 839c292..8c9aae2 100644 --- a/LiteLoader/Header/MC/VillagerV2.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "VillagerBase.hpp" diff --git a/LiteLoader/Header/MC/VindicationIllager.hpp b/LiteLoader/include/llapi/mc/VindicationIllager.hpp similarity index 98% rename from LiteLoader/Header/MC/VindicationIllager.hpp rename to LiteLoader/include/llapi/mc/VindicationIllager.hpp index f41bcce..97c0191 100644 --- a/LiteLoader/Header/MC/VindicationIllager.hpp +++ b/LiteLoader/include/llapi/mc/VindicationIllager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/VineBlock.hpp b/LiteLoader/include/llapi/mc/VineBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/VineBlock.hpp rename to LiteLoader/include/llapi/mc/VineBlock.hpp index cb252d8..82c80fb 100644 --- a/LiteLoader/Header/MC/VineBlock.hpp +++ b/LiteLoader/include/llapi/mc/VineBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VinesFeature.hpp b/LiteLoader/include/llapi/mc/VinesFeature.hpp similarity index 95% rename from LiteLoader/Header/MC/VinesFeature.hpp rename to LiteLoader/include/llapi/mc/VinesFeature.hpp index d12ccb5..f94c623 100644 --- a/LiteLoader/Header/MC/VinesFeature.hpp +++ b/LiteLoader/include/llapi/mc/VinesFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/VirtualCommandOrigin.hpp b/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp similarity index 98% rename from LiteLoader/Header/MC/VirtualCommandOrigin.hpp rename to LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp index 6f8056d..29a8190 100644 --- a/LiteLoader/Header/MC/VirtualCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "CommandOrigin.hpp" diff --git a/LiteLoader/Header/MC/WASDControlledDescription.hpp b/LiteLoader/include/llapi/mc/WASDControlledDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/WASDControlledDescription.hpp rename to LiteLoader/include/llapi/mc/WASDControlledDescription.hpp index f93ec82..793e638 100644 --- a/LiteLoader/Header/MC/WASDControlledDescription.hpp +++ b/LiteLoader/include/llapi/mc/WASDControlledDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WSAStartupSingleton.hpp b/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp similarity index 95% rename from LiteLoader/Header/MC/WSAStartupSingleton.hpp rename to LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp index e4019b0..6ad7b93 100644 --- a/LiteLoader/Header/MC/WSAStartupSingleton.hpp +++ b/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WSServerCommand.hpp b/LiteLoader/include/llapi/mc/WSServerCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/WSServerCommand.hpp rename to LiteLoader/include/llapi/mc/WSServerCommand.hpp index 829ce2f..0cfcdb1 100644 --- a/LiteLoader/Header/MC/WSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/WSServerCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaitDefinition.hpp b/LiteLoader/include/llapi/mc/WaitDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/WaitDefinition.hpp rename to LiteLoader/include/llapi/mc/WaitDefinition.hpp index 7275d74..f345ec3 100644 --- a/LiteLoader/Header/MC/WaitDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WaitDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/WaitNode.hpp b/LiteLoader/include/llapi/mc/WaitNode.hpp similarity index 95% rename from LiteLoader/Header/MC/WaitNode.hpp rename to LiteLoader/include/llapi/mc/WaitNode.hpp index 8281f4b..4eabcae 100644 --- a/LiteLoader/Header/MC/WaitNode.hpp +++ b/LiteLoader/include/llapi/mc/WaitNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaitTicksDefinition.hpp b/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp similarity index 96% rename from LiteLoader/Header/MC/WaitTicksDefinition.hpp rename to LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp index 8ec0b76..ad5f3c2 100644 --- a/LiteLoader/Header/MC/WaitTicksDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #include "BehaviorDefinition.hpp" diff --git a/LiteLoader/Header/MC/WaitTicksNode.hpp b/LiteLoader/include/llapi/mc/WaitTicksNode.hpp similarity index 95% rename from LiteLoader/Header/MC/WaitTicksNode.hpp rename to LiteLoader/include/llapi/mc/WaitTicksNode.hpp index 7fe7a45..796163a 100644 --- a/LiteLoader/Header/MC/WaitTicksNode.hpp +++ b/LiteLoader/include/llapi/mc/WaitTicksNode.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WalkAnimationSpeedDescription.hpp b/LiteLoader/include/llapi/mc/WalkAnimationSpeedDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/WalkAnimationSpeedDescription.hpp rename to LiteLoader/include/llapi/mc/WalkAnimationSpeedDescription.hpp index 39d8024..1fa2125 100644 --- a/LiteLoader/Header/MC/WalkAnimationSpeedDescription.hpp +++ b/LiteLoader/include/llapi/mc/WalkAnimationSpeedDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WalkState.hpp b/LiteLoader/include/llapi/mc/WalkState.hpp similarity index 95% rename from LiteLoader/Header/MC/WalkState.hpp rename to LiteLoader/include/llapi/mc/WalkState.hpp index c7762df..90ed0a5 100644 --- a/LiteLoader/Header/MC/WalkState.hpp +++ b/LiteLoader/include/llapi/mc/WalkState.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PetSleepWithOwnerState.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/WallBlock.hpp rename to LiteLoader/include/llapi/mc/WallBlock.hpp index d8d52ab..dfb4571 100644 --- a/LiteLoader/Header/MC/WallBlock.hpp +++ b/LiteLoader/include/llapi/mc/WallBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WallClimberPathNavigation.hpp b/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp similarity index 97% rename from LiteLoader/Header/MC/WallClimberPathNavigation.hpp rename to LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp index 96d3ed5..e7b58f6 100644 --- a/LiteLoader/Header/MC/WallClimberPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WanderingTrader.hpp b/LiteLoader/include/llapi/mc/WanderingTrader.hpp similarity index 98% rename from LiteLoader/Header/MC/WanderingTrader.hpp rename to LiteLoader/include/llapi/mc/WanderingTrader.hpp index 75b0667..63e6f83 100644 --- a/LiteLoader/Header/MC/WanderingTrader.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTrader.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/WanderingTraderScheduler.hpp b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp similarity index 97% rename from LiteLoader/Header/MC/WanderingTraderScheduler.hpp rename to LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp index ace9739..641ef21 100644 --- a/LiteLoader/Header/MC/WanderingTraderScheduler.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WantsJockeyDescription.hpp b/LiteLoader/include/llapi/mc/WantsJockeyDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/WantsJockeyDescription.hpp rename to LiteLoader/include/llapi/mc/WantsJockeyDescription.hpp index 75839c1..4c20147 100644 --- a/LiteLoader/Header/MC/WantsJockeyDescription.hpp +++ b/LiteLoader/include/llapi/mc/WantsJockeyDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WarpedFungusOnAStickItem.hpp b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp similarity index 98% rename from LiteLoader/Header/MC/WarpedFungusOnAStickItem.hpp rename to LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp index 4bbee20..a71ab1d 100644 --- a/LiteLoader/Header/MC/WarpedFungusOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaterAnimal.hpp b/LiteLoader/include/llapi/mc/WaterAnimal.hpp similarity index 98% rename from LiteLoader/Header/MC/WaterAnimal.hpp rename to LiteLoader/include/llapi/mc/WaterAnimal.hpp index 4f1cbef..914689b 100644 --- a/LiteLoader/Header/MC/WaterAnimal.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Mob.hpp" diff --git a/LiteLoader/Header/MC/WaterBoundPathNavigation.hpp b/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp similarity index 97% rename from LiteLoader/Header/MC/WaterBoundPathNavigation.hpp rename to LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp index 7e5f830..38664d6 100644 --- a/LiteLoader/Header/MC/WaterBoundPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "PathNavigation.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaterLilyBlockItem.hpp b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp similarity index 98% rename from LiteLoader/Header/MC/WaterLilyBlockItem.hpp rename to LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp index e6bdbc9..0617519 100644 --- a/LiteLoader/Header/MC/WaterLilyBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaterMovementDescription.hpp b/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp similarity index 96% rename from LiteLoader/Header/MC/WaterMovementDescription.hpp rename to LiteLoader/include/llapi/mc/WaterMovementDescription.hpp index e7d681e..681e756 100644 --- a/LiteLoader/Header/MC/WaterMovementDescription.hpp +++ b/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaterlilyBlock.hpp b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WaterlilyBlock.hpp rename to LiteLoader/include/llapi/mc/WaterlilyBlock.hpp index 8506fd9..e3cc1bc 100644 --- a/LiteLoader/Header/MC/WaterlilyBlock.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BushBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WaterlilyFeature.hpp b/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/WaterlilyFeature.hpp rename to LiteLoader/include/llapi/mc/WaterlilyFeature.hpp index 421720f..1c42070 100644 --- a/LiteLoader/Header/MC/WaterlilyFeature.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeaponItem.hpp b/LiteLoader/include/llapi/mc/WeaponItem.hpp similarity index 98% rename from LiteLoader/Header/MC/WeaponItem.hpp rename to LiteLoader/include/llapi/mc/WeaponItem.hpp index 1b0d8dd..5c0ba28 100644 --- a/LiteLoader/Header/MC/WeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeaponRecipes.hpp b/LiteLoader/include/llapi/mc/WeaponRecipes.hpp similarity index 95% rename from LiteLoader/Header/MC/WeaponRecipes.hpp rename to LiteLoader/include/llapi/mc/WeaponRecipes.hpp index f6a8160..f77d1b2 100644 --- a/LiteLoader/Header/MC/WeaponRecipes.hpp +++ b/LiteLoader/include/llapi/mc/WeaponRecipes.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Weather.hpp b/LiteLoader/include/llapi/mc/Weather.hpp similarity index 98% rename from LiteLoader/Header/MC/Weather.hpp rename to LiteLoader/include/llapi/mc/Weather.hpp index 3f66e65..3f5d33c 100644 --- a/LiteLoader/Header/MC/Weather.hpp +++ b/LiteLoader/include/llapi/mc/Weather.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeatherCommand.hpp b/LiteLoader/include/llapi/mc/WeatherCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/WeatherCommand.hpp rename to LiteLoader/include/llapi/mc/WeatherCommand.hpp index 8505a19..d96f767 100644 --- a/LiteLoader/Header/MC/WeatherCommand.hpp +++ b/LiteLoader/include/llapi/mc/WeatherCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeatherHelpers.hpp b/LiteLoader/include/llapi/mc/WeatherHelpers.hpp similarity index 91% rename from LiteLoader/Header/MC/WeatherHelpers.hpp rename to LiteLoader/include/llapi/mc/WeatherHelpers.hpp index 8ef0c98..7b8e68d 100644 --- a/LiteLoader/Header/MC/WeatherHelpers.hpp +++ b/LiteLoader/include/llapi/mc/WeatherHelpers.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WebBlock.hpp b/LiteLoader/include/llapi/mc/WebBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WebBlock.hpp rename to LiteLoader/include/llapi/mc/WebBlock.hpp index 3a61c82..4045a7f 100644 --- a/LiteLoader/Header/MC/WebBlock.hpp +++ b/LiteLoader/include/llapi/mc/WebBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WebToken.hpp b/LiteLoader/include/llapi/mc/WebToken.hpp similarity index 97% rename from LiteLoader/Header/MC/WebToken.hpp rename to LiteLoader/include/llapi/mc/WebToken.hpp index 27735e6..c3c6743 100644 --- a/LiteLoader/Header/MC/WebToken.hpp +++ b/LiteLoader/include/llapi/mc/WebToken.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WebviewObserver.hpp b/LiteLoader/include/llapi/mc/WebviewObserver.hpp similarity index 97% rename from LiteLoader/Header/MC/WebviewObserver.hpp rename to LiteLoader/include/llapi/mc/WebviewObserver.hpp index b25df71..605e5ce 100644 --- a/LiteLoader/Header/MC/WebviewObserver.hpp +++ b/LiteLoader/include/llapi/mc/WebviewObserver.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeepingVinesBlock.hpp b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/WeepingVinesBlock.hpp rename to LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp index 4bbb229..9ac2c5e 100644 --- a/LiteLoader/Header/MC/WeepingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeepingVinesClusterFeature.hpp b/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/WeepingVinesClusterFeature.hpp rename to LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp index 654927e..131b83a 100644 --- a/LiteLoader/Header/MC/WeepingVinesClusterFeature.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Feature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeightedPressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WeightedPressurePlateBlock.hpp rename to LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp index c2768f4..5559cbf 100644 --- a/LiteLoader/Header/MC/WeightedPressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BasePressurePlateBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WeightedRandomFeature.hpp b/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp similarity index 96% rename from LiteLoader/Header/MC/WeightedRandomFeature.hpp rename to LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp index d903306..e672eea 100644 --- a/LiteLoader/Header/MC/WeightedRandomFeature.hpp +++ b/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WellKnownBiomeTags.hpp b/LiteLoader/include/llapi/mc/WellKnownBiomeTags.hpp similarity index 95% rename from LiteLoader/Header/MC/WellKnownBiomeTags.hpp rename to LiteLoader/include/llapi/mc/WellKnownBiomeTags.hpp index ac1a5ee..b917662 100644 --- a/LiteLoader/Header/MC/WellKnownBiomeTags.hpp +++ b/LiteLoader/include/llapi/mc/WellKnownBiomeTags.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Whitelist.hpp b/LiteLoader/include/llapi/mc/Whitelist.hpp similarity index 96% rename from LiteLoader/Header/MC/Whitelist.hpp rename to LiteLoader/include/llapi/mc/Whitelist.hpp index fcbdfa6..0c37d64 100644 --- a/LiteLoader/Header/MC/Whitelist.hpp +++ b/LiteLoader/include/llapi/mc/Whitelist.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WhitelistCommand.hpp b/LiteLoader/include/llapi/mc/WhitelistCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/WhitelistCommand.hpp rename to LiteLoader/include/llapi/mc/WhitelistCommand.hpp index da3e887..644124b 100644 --- a/LiteLoader/Header/MC/WhitelistCommand.hpp +++ b/LiteLoader/include/llapi/mc/WhitelistCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WhitelistEntry.hpp b/LiteLoader/include/llapi/mc/WhitelistEntry.hpp similarity index 96% rename from LiteLoader/Header/MC/WhitelistEntry.hpp rename to LiteLoader/include/llapi/mc/WhitelistEntry.hpp index 6d703fe..9d4bb2b 100644 --- a/LiteLoader/Header/MC/WhitelistEntry.hpp +++ b/LiteLoader/include/llapi/mc/WhitelistEntry.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WhitelistFile.hpp b/LiteLoader/include/llapi/mc/WhitelistFile.hpp similarity index 95% rename from LiteLoader/Header/MC/WhitelistFile.hpp rename to LiteLoader/include/llapi/mc/WhitelistFile.hpp index 034f751..a89a0c9 100644 --- a/LiteLoader/Header/MC/WhitelistFile.hpp +++ b/LiteLoader/include/llapi/mc/WhitelistFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WinStackTrace.hpp b/LiteLoader/include/llapi/mc/WinStackTrace.hpp similarity index 95% rename from LiteLoader/Header/MC/WinStackTrace.hpp rename to LiteLoader/include/llapi/mc/WinStackTrace.hpp index c90f69c..28d3a7e 100644 --- a/LiteLoader/Header/MC/WinStackTrace.hpp +++ b/LiteLoader/include/llapi/mc/WinStackTrace.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WireframeQueue.hpp b/LiteLoader/include/llapi/mc/WireframeQueue.hpp similarity index 95% rename from LiteLoader/Header/MC/WireframeQueue.hpp rename to LiteLoader/include/llapi/mc/WireframeQueue.hpp index de0917b..2181ce4 100644 --- a/LiteLoader/Header/MC/WireframeQueue.hpp +++ b/LiteLoader/include/llapi/mc/WireframeQueue.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Witch.hpp b/LiteLoader/include/llapi/mc/Witch.hpp similarity index 98% rename from LiteLoader/Header/MC/Witch.hpp rename to LiteLoader/include/llapi/mc/Witch.hpp index 3490a6e..cfdce2e 100644 --- a/LiteLoader/Header/MC/Witch.hpp +++ b/LiteLoader/include/llapi/mc/Witch.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/WitherBoss.hpp b/LiteLoader/include/llapi/mc/WitherBoss.hpp similarity index 99% rename from LiteLoader/Header/MC/WitherBoss.hpp rename to LiteLoader/include/llapi/mc/WitherBoss.hpp index b3227b5..639e1dd 100644 --- a/LiteLoader/Header/MC/WitherBoss.hpp +++ b/LiteLoader/include/llapi/mc/WitherBoss.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Monster.hpp" diff --git a/LiteLoader/Header/MC/WitherBossSpawnUtilities.hpp b/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp similarity index 93% rename from LiteLoader/Header/MC/WitherBossSpawnUtilities.hpp rename to LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp index 51269b4..5ea7633 100644 --- a/LiteLoader/Header/MC/WitherBossSpawnUtilities.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WitherRandomAttackPosGoal.hpp b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/WitherRandomAttackPosGoal.hpp rename to LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp index b10f506..95e4d2f 100644 --- a/LiteLoader/Header/MC/WitherRandomAttackPosGoal.hpp +++ b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RandomStrollGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WitherRoseBlock.hpp b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WitherRoseBlock.hpp rename to LiteLoader/include/llapi/mc/WitherRoseBlock.hpp index 6d2c1a3..bbb14d1 100644 --- a/LiteLoader/Header/MC/WitherRoseBlock.hpp +++ b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "FlowerBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WitherSkull.hpp b/LiteLoader/include/llapi/mc/WitherSkull.hpp similarity index 98% rename from LiteLoader/Header/MC/WitherSkull.hpp rename to LiteLoader/include/llapi/mc/WitherSkull.hpp index 8e7be9c..925c665 100644 --- a/LiteLoader/Header/MC/WitherSkull.hpp +++ b/LiteLoader/include/llapi/mc/WitherSkull.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Fireball.hpp" diff --git a/LiteLoader/Header/MC/WitherTargetHighestDamage.hpp b/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp similarity index 97% rename from LiteLoader/Header/MC/WitherTargetHighestDamage.hpp rename to LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp index b149f91..e76d909 100644 --- a/LiteLoader/Header/MC/WitherTargetHighestDamage.hpp +++ b/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "TargetGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Wolf.hpp b/LiteLoader/include/llapi/mc/Wolf.hpp similarity index 98% rename from LiteLoader/Header/MC/Wolf.hpp rename to LiteLoader/include/llapi/mc/Wolf.hpp index f1a08fa..e551571 100644 --- a/LiteLoader/Header/MC/Wolf.hpp +++ b/LiteLoader/include/llapi/mc/Wolf.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Animal.hpp" diff --git a/LiteLoader/Header/MC/WoodBlock.hpp b/LiteLoader/include/llapi/mc/WoodBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WoodBlock.hpp rename to LiteLoader/include/llapi/mc/WoodBlock.hpp index 8fd285d..36157fb 100644 --- a/LiteLoader/Header/MC/WoodBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodButtonBlock.hpp b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WoodButtonBlock.hpp rename to LiteLoader/include/llapi/mc/WoodButtonBlock.hpp index 11ea2ca..0363c0e 100644 --- a/LiteLoader/Header/MC/WoodButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ButtonBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodSlabBlock.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WoodSlabBlock.hpp rename to LiteLoader/include/llapi/mc/WoodSlabBlock.hpp index e804420..7749de1 100644 --- a/LiteLoader/Header/MC/WoodSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "SlabBlock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp similarity index 97% rename from LiteLoader/Header/MC/WoodSlabBlockItem.hpp rename to LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp index 61597bd..761f0d3 100644 --- a/LiteLoader/Header/MC/WoodSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockItem.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodlandMansionFeature.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp similarity index 97% rename from LiteLoader/Header/MC/WoodlandMansionFeature.hpp rename to LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp index a5eb279..3c9aa9b 100644 --- a/LiteLoader/Header/MC/WoodlandMansionFeature.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "StructureFeature.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodlandMansionPieces.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp similarity index 96% rename from LiteLoader/Header/MC/WoodlandMansionPieces.hpp rename to LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp index a0e2333..5fd8f36 100644 --- a/LiteLoader/Header/MC/WoodlandMansionPieces.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoodlandMansionStart.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp similarity index 97% rename from LiteLoader/Header/MC/WoodlandMansionStart.hpp rename to LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp index 9d3e5fb..030694e 100644 --- a/LiteLoader/Header/MC/WoodlandMansionStart.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WoolCarpetBlock.hpp b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp similarity index 99% rename from LiteLoader/Header/MC/WoolCarpetBlock.hpp rename to LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp index 11b93a5..d9f3519 100644 --- a/LiteLoader/Header/MC/WoolCarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorkGoal.hpp b/LiteLoader/include/llapi/mc/WorkGoal.hpp similarity index 97% rename from LiteLoader/Header/MC/WorkGoal.hpp rename to LiteLoader/include/llapi/mc/WorkGoal.hpp index bf9ca97..34e676b 100644 --- a/LiteLoader/Header/MC/WorkGoal.hpp +++ b/LiteLoader/include/llapi/mc/WorkGoal.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "MoveToPOIGoal.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorkbenchBlock.hpp b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp similarity index 98% rename from LiteLoader/Header/MC/WorkbenchBlock.hpp rename to LiteLoader/include/llapi/mc/WorkbenchBlock.hpp index 54d46c3..b391b88 100644 --- a/LiteLoader/Header/MC/WorkbenchBlock.hpp +++ b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "BlockLegacy.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorkerPool.hpp b/LiteLoader/include/llapi/mc/WorkerPool.hpp similarity index 97% rename from LiteLoader/Header/MC/WorkerPool.hpp rename to LiteLoader/include/llapi/mc/WorkerPool.hpp index a343fc9..18ff51a 100644 --- a/LiteLoader/Header/MC/WorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/WorkerPool.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Bedrock.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldBlockTarget.hpp b/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp similarity index 97% rename from LiteLoader/Header/MC/WorldBlockTarget.hpp rename to LiteLoader/include/llapi/mc/WorldBlockTarget.hpp index 5784fb5..d63171c 100644 --- a/LiteLoader/Header/MC/WorldBlockTarget.hpp +++ b/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldBuilderCommand.hpp b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldBuilderCommand.hpp rename to LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp index 0a6308a..413861c 100644 --- a/LiteLoader/Header/MC/WorldBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldChangeTransaction.hpp b/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldChangeTransaction.hpp rename to LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp index 8ba7af0..8e42871 100644 --- a/LiteLoader/Header/MC/WorldChangeTransaction.hpp +++ b/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldGenerator.hpp b/LiteLoader/include/llapi/mc/WorldGenerator.hpp similarity index 97% rename from LiteLoader/Header/MC/WorldGenerator.hpp rename to LiteLoader/include/llapi/mc/WorldGenerator.hpp index 22f8496..1be1758 100644 --- a/LiteLoader/Header/MC/WorldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenerator.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldHistoryPackSource.hpp b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp similarity index 97% rename from LiteLoader/Header/MC/WorldHistoryPackSource.hpp rename to LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp index b492ee3..60c33d0 100644 --- a/LiteLoader/Header/MC/WorldHistoryPackSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldLimitChunkSource.hpp b/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp similarity index 97% rename from LiteLoader/Header/MC/WorldLimitChunkSource.hpp rename to LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp index 8cfea6f..2b00496 100644 --- a/LiteLoader/Header/MC/WorldLimitChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ChunkSource.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldPackHistory.hpp b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldPackHistory.hpp rename to LiteLoader/include/llapi/mc/WorldPackHistory.hpp index 31ae20f..243b41d 100644 --- a/LiteLoader/Header/MC/WorldPackHistory.hpp +++ b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldPacksHistoryFile.hpp b/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldPacksHistoryFile.hpp rename to LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp index a64f2d2..2634fab 100644 --- a/LiteLoader/Header/MC/WorldPacksHistoryFile.hpp +++ b/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Json.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldSessionEndPoint.hpp b/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldSessionEndPoint.hpp rename to LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp index d0ba105..0861eac 100644 --- a/LiteLoader/Header/MC/WorldSessionEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldTemplateInfo.hpp b/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp similarity index 95% rename from LiteLoader/Header/MC/WorldTemplateInfo.hpp rename to LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp index b592574..5cc2e28 100644 --- a/LiteLoader/Header/MC/WorldTemplateInfo.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA #include "NetworkHandler.hpp" diff --git a/LiteLoader/Header/MC/WorldTemplateLevelData.hpp b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldTemplateLevelData.hpp rename to LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp index 4dcd573..4d8e44c 100644 --- a/LiteLoader/Header/MC/WorldTemplateLevelData.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldTemplateManager.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldTemplateManager.hpp rename to LiteLoader/include/llapi/mc/WorldTemplateManager.hpp index 4babe94..9b5e26a 100644 --- a/LiteLoader/Header/MC/WorldTemplateManager.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldTemplateManagerProxyCallbacks.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldTemplateManagerProxyCallbacks.hpp rename to LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp index 450b98c..5fceeba 100644 --- a/LiteLoader/Header/MC/WorldTemplateManagerProxyCallbacks.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldTemplatePackManifest.hpp b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldTemplatePackManifest.hpp rename to LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp index 7031514..2ce4554 100644 --- a/LiteLoader/Header/MC/WorldTemplatePackManifest.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WorldTemplatePackSource.hpp b/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp similarity index 96% rename from LiteLoader/Header/MC/WorldTemplatePackSource.hpp rename to LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp index bffb4c0..e6f7d19 100644 --- a/LiteLoader/Header/MC/WorldTemplatePackSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WritableBookItem.hpp b/LiteLoader/include/llapi/mc/WritableBookItem.hpp similarity index 98% rename from LiteLoader/Header/MC/WritableBookItem.hpp rename to LiteLoader/include/llapi/mc/WritableBookItem.hpp index e031c4d..5179446 100644 --- a/LiteLoader/Header/MC/WritableBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WritableBookItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/WrittenBookItem.hpp b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp similarity index 99% rename from LiteLoader/Header/MC/WrittenBookItem.hpp rename to LiteLoader/include/llapi/mc/WrittenBookItem.hpp index 28f1ce1..5fb9cee 100644 --- a/LiteLoader/Header/MC/WrittenBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Item.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/XPCommand.hpp b/LiteLoader/include/llapi/mc/XPCommand.hpp similarity index 96% rename from LiteLoader/Header/MC/XPCommand.hpp rename to LiteLoader/include/llapi/mc/XPCommand.hpp index 0eb2f8c..2dc778d 100644 --- a/LiteLoader/Header/MC/XPCommand.hpp +++ b/LiteLoader/include/llapi/mc/XPCommand.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Command.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/ZipPackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp similarity index 98% rename from LiteLoader/Header/MC/ZipPackAccessStrategy.hpp rename to LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp index 91311d5..bb38cc4 100644 --- a/LiteLoader/Header/MC/ZipPackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "PackAccessStrategy.hpp" diff --git a/LiteLoader/Header/MC/ZipPackAccessStrategyOwningFileAcccess.hpp b/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAcccess.hpp similarity index 97% rename from LiteLoader/Header/MC/ZipPackAccessStrategyOwningFileAcccess.hpp rename to LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAcccess.hpp index 5627d6c..6034a12 100644 --- a/LiteLoader/Header/MC/ZipPackAccessStrategyOwningFileAcccess.hpp +++ b/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAcccess.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Core.hpp" #include "ZipPackAccessStrategy.hpp" diff --git a/LiteLoader/Header/MC/ZlibFileAccessWrapper.hpp b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp similarity index 95% rename from LiteLoader/Header/MC/ZlibFileAccessWrapper.hpp rename to LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp index fd64b44..4da2d47 100644 --- a/LiteLoader/Header/MC/ZlibFileAccessWrapper.hpp +++ b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/Zombie.hpp b/LiteLoader/include/llapi/mc/Zombie.hpp similarity index 98% rename from LiteLoader/Header/MC/Zombie.hpp rename to LiteLoader/include/llapi/mc/Zombie.hpp index a042e9a..79d18a8 100644 --- a/LiteLoader/Header/MC/Zombie.hpp +++ b/LiteLoader/include/llapi/mc/Zombie.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "HumanoidMonster.hpp" diff --git a/LiteLoader/Header/MC/ZombieVillager.hpp b/LiteLoader/include/llapi/mc/ZombieVillager.hpp similarity index 98% rename from LiteLoader/Header/MC/ZombieVillager.hpp rename to LiteLoader/include/llapi/mc/ZombieVillager.hpp index 2cfb896..d320391 100644 --- a/LiteLoader/Header/MC/ZombieVillager.hpp +++ b/LiteLoader/include/llapi/mc/ZombieVillager.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "Actor.hpp" #include "Zombie.hpp" diff --git a/LiteLoader/Header/MC/_ProfilerLiteTimer.hpp b/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp similarity index 96% rename from LiteLoader/Header/MC/_ProfilerLiteTimer.hpp rename to LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp index 5247814..4061a59 100644 --- a/LiteLoader/Header/MC/_ProfilerLiteTimer.hpp +++ b/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #include "ProfilerLite.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/_TickPtr.hpp b/LiteLoader/include/llapi/mc/_TickPtr.hpp similarity index 94% rename from LiteLoader/Header/MC/_TickPtr.hpp rename to LiteLoader/include/llapi/mc/_TickPtr.hpp index 85c8f82..e8e48f3 100644 --- a/LiteLoader/Header/MC/_TickPtr.hpp +++ b/LiteLoader/include/llapi/mc/_TickPtr.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/glTFExporter.hpp b/LiteLoader/include/llapi/mc/glTFExporter.hpp similarity index 96% rename from LiteLoader/Header/MC/glTFExporter.hpp rename to LiteLoader/include/llapi/mc/glTFExporter.hpp index abbcbd7..2594b4b 100644 --- a/LiteLoader/Header/MC/glTFExporter.hpp +++ b/LiteLoader/include/llapi/mc/glTFExporter.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/persona.hpp b/LiteLoader/include/llapi/mc/persona.hpp similarity index 98% rename from LiteLoader/Header/MC/persona.hpp rename to LiteLoader/include/llapi/mc/persona.hpp index 6598908..8f9ddbd 100644 --- a/LiteLoader/Header/MC/persona.hpp +++ b/LiteLoader/include/llapi/mc/persona.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/MC/port.hpp b/LiteLoader/include/llapi/mc/port.hpp similarity index 92% rename from LiteLoader/Header/MC/port.hpp rename to LiteLoader/include/llapi/mc/port.hpp index ad2819b..06430dc 100644 --- a/LiteLoader/Header/MC/port.hpp +++ b/LiteLoader/include/llapi/mc/port.hpp @@ -1,7 +1,7 @@ // This Header is auto generated by BDSLiteLoader Toolchain #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA diff --git a/LiteLoader/Header/PERM/Foundation.hpp b/LiteLoader/include/llapi/perm/Foundation.hpp similarity index 99% rename from LiteLoader/Header/PERM/Foundation.hpp rename to LiteLoader/include/llapi/perm/Foundation.hpp index 2a4c064..1bb8a17 100644 --- a/LiteLoader/Header/PERM/Foundation.hpp +++ b/LiteLoader/include/llapi/perm/Foundation.hpp @@ -7,7 +7,7 @@ * */ #pragma once -#include +#include "llapi/Global.h" namespace PERM { diff --git a/LiteLoader/Header/PERM/Member.hpp b/LiteLoader/include/llapi/perm/Member.hpp similarity index 88% rename from LiteLoader/Header/PERM/Member.hpp rename to LiteLoader/include/llapi/perm/Member.hpp index acbae84..be28748 100644 --- a/LiteLoader/Header/PERM/Member.hpp +++ b/LiteLoader/include/llapi/perm/Member.hpp @@ -7,7 +7,7 @@ * */ #pragma once -#include "Foundation.hpp" +#include "llapi/perm/Foundation.hpp" namespace PERM { diff --git a/LiteLoader/Header/PERM/Permission.hpp b/LiteLoader/include/llapi/perm/Permission.hpp similarity index 96% rename from LiteLoader/Header/PERM/Permission.hpp rename to LiteLoader/include/llapi/perm/Permission.hpp index 4dea3b0..1abd110 100644 --- a/LiteLoader/Header/PERM/Permission.hpp +++ b/LiteLoader/include/llapi/perm/Permission.hpp @@ -7,8 +7,8 @@ * */ #pragma once -#include -#include "Foundation.hpp" +#include "Nlohmann/json.hpp" +#include "llapi/perm/Foundation.hpp" namespace PERM { diff --git a/LiteLoader/Header/PERM/Role.hpp b/LiteLoader/include/llapi/perm/Role.hpp similarity index 99% rename from LiteLoader/Header/PERM/Role.hpp rename to LiteLoader/include/llapi/perm/Role.hpp index b4c238a..7349c88 100644 --- a/LiteLoader/Header/PERM/Role.hpp +++ b/LiteLoader/include/llapi/perm/Role.hpp @@ -7,8 +7,8 @@ * */ #pragma once -#include "Member.hpp" -#include "Permission.hpp" +#include "llapi/perm/Member.hpp" +#include "llapi/perm/Permission.hpp" namespace PERM { diff --git a/LiteLoader/Header/Utils/Bstream.h b/LiteLoader/include/llapi/utils/Bstream.h similarity index 100% rename from LiteLoader/Header/Utils/Bstream.h rename to LiteLoader/include/llapi/utils/Bstream.h diff --git a/LiteLoader/Header/Utils/CryptHelper.h b/LiteLoader/include/llapi/utils/CryptHelper.h similarity index 51% rename from LiteLoader/Header/Utils/CryptHelper.h rename to LiteLoader/include/llapi/utils/CryptHelper.h index 3363e9c..7633754 100644 --- a/LiteLoader/Header/Utils/CryptHelper.h +++ b/LiteLoader/include/llapi/utils/CryptHelper.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include LIAPI std::string CalcMD5(const std::string& str); diff --git a/LiteLoader/Header/Utils/CsLock.h b/LiteLoader/include/llapi/utils/CsLock.h similarity index 91% rename from LiteLoader/Header/Utils/CsLock.h rename to LiteLoader/include/llapi/utils/CsLock.h index d6eb4ab..f705a78 100644 --- a/LiteLoader/Header/Utils/CsLock.h +++ b/LiteLoader/include/llapi/utils/CsLock.h @@ -1,6 +1,7 @@ #pragma once -#include "../Global.h" -#include + +#include "llapi/Global.h" +#include // ===== Critical Section Locker ===== // a simple lock which is much faster than std::mutex diff --git a/LiteLoader/Header/Utils/DbgHelper.h b/LiteLoader/include/llapi/utils/DbgHelper.h similarity index 94% rename from LiteLoader/Header/Utils/DbgHelper.h rename to LiteLoader/include/llapi/utils/DbgHelper.h index bf51f1f..1c045ec 100644 --- a/LiteLoader/Header/Utils/DbgHelper.h +++ b/LiteLoader/include/llapi/utils/DbgHelper.h @@ -1,6 +1,7 @@ #pragma once -#include -#include + +#include "llapi/Global.h" +#include #include class Logger; diff --git a/LiteLoader/Header/Utils/FileHelper.h b/LiteLoader/include/llapi/utils/FileHelper.h similarity index 86% rename from LiteLoader/Header/Utils/FileHelper.h rename to LiteLoader/include/llapi/utils/FileHelper.h index 0de1bb3..eb377e9 100644 --- a/LiteLoader/Header/Utils/FileHelper.h +++ b/LiteLoader/include/llapi/utils/FileHelper.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include #include #include diff --git a/LiteLoader/Header/Utils/Hash.h b/LiteLoader/include/llapi/utils/Hash.h similarity index 100% rename from LiteLoader/Header/Utils/Hash.h rename to LiteLoader/include/llapi/utils/Hash.h diff --git a/LiteLoader/Header/Utils/Json.h b/LiteLoader/include/llapi/utils/Json.h similarity index 99% rename from LiteLoader/Header/Utils/Json.h rename to LiteLoader/include/llapi/utils/Json.h index 1f78f44..c1f6393 100644 --- a/LiteLoader/Header/Utils/Json.h +++ b/LiteLoader/include/llapi/utils/Json.h @@ -1,6 +1,6 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include #include #include diff --git a/LiteLoader/Header/Utils/NetworkHelper.h b/LiteLoader/include/llapi/utils/NetworkHelper.h similarity index 90% rename from LiteLoader/Header/Utils/NetworkHelper.h rename to LiteLoader/include/llapi/utils/NetworkHelper.h index 787c82e..9200d85 100644 --- a/LiteLoader/Header/Utils/NetworkHelper.h +++ b/LiteLoader/include/llapi/utils/NetworkHelper.h @@ -1,8 +1,8 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include #include -#include +#include "httplib/httplib.h" // "http(s)://www.aaa.com/bbb/c.html" -> ""http(s)://www.aaa.com" & "/bbb/c.html" LIAPI void SplitHttpUrl(const std::string& url, std::string& host, std::string& path); diff --git a/LiteLoader/Header/Utils/Optional.h b/LiteLoader/include/llapi/utils/Optional.h similarity index 100% rename from LiteLoader/Header/Utils/Optional.h rename to LiteLoader/include/llapi/utils/Optional.h diff --git a/LiteLoader/Header/Utils/PatchHelper.h b/LiteLoader/include/llapi/utils/PatchHelper.h similarity index 100% rename from LiteLoader/Header/Utils/PatchHelper.h rename to LiteLoader/include/llapi/utils/PatchHelper.h diff --git a/LiteLoader/Header/Utils/PlayerMap.h b/LiteLoader/include/llapi/utils/PlayerMap.h similarity index 97% rename from LiteLoader/Header/Utils/PlayerMap.h rename to LiteLoader/include/llapi/utils/PlayerMap.h index 48ebb35..5bdb146 100644 --- a/LiteLoader/Header/Utils/PlayerMap.h +++ b/LiteLoader/include/llapi/utils/PlayerMap.h @@ -1,5 +1,5 @@ #pragma once -#include +#include "llapi/Global.h" class ServerPlayer; struct DePlayerCB { void* userdata; diff --git a/LiteLoader/Header/Utils/PluginOwnData.h b/LiteLoader/include/llapi/utils/PluginOwnData.h similarity index 98% rename from LiteLoader/Header/Utils/PluginOwnData.h rename to LiteLoader/include/llapi/utils/PluginOwnData.h index 4ede1a2..9d3bad9 100644 --- a/LiteLoader/Header/Utils/PluginOwnData.h +++ b/LiteLoader/include/llapi/utils/PluginOwnData.h @@ -20,7 +20,7 @@ #include "WinHelper.h" #include #include -#include "../Global.h" +#include "llapi/Global.h" LIAPI extern std::unordered_map> ll_PluginOwnData; diff --git a/LiteLoader/Header/Utils/RNG.h b/LiteLoader/include/llapi/utils/RNG.h similarity index 98% rename from LiteLoader/Header/Utils/RNG.h rename to LiteLoader/include/llapi/utils/RNG.h index 54774e1..039c3e8 100644 --- a/LiteLoader/Header/Utils/RNG.h +++ b/LiteLoader/include/llapi/utils/RNG.h @@ -7,8 +7,8 @@ * */ #pragma once -#include "Global.h" -#include +#include "llapi/Global.h" +#include "pcg/pcg_random.hpp" namespace RNG { template diff --git a/LiteLoader/Header/Utils/SRWLock.h b/LiteLoader/include/llapi/utils/SRWLock.h similarity index 93% rename from LiteLoader/Header/Utils/SRWLock.h rename to LiteLoader/include/llapi/utils/SRWLock.h index efa29e2..b39d3a6 100644 --- a/LiteLoader/Header/Utils/SRWLock.h +++ b/LiteLoader/include/llapi/utils/SRWLock.h @@ -1,5 +1,6 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" +#include class SRWLock { bool inited = false; diff --git a/LiteLoader/Header/Utils/STLHelper.h b/LiteLoader/include/llapi/utils/STLHelper.h similarity index 100% rename from LiteLoader/Header/Utils/STLHelper.h rename to LiteLoader/include/llapi/utils/STLHelper.h diff --git a/LiteLoader/Header/Utils/ShellLinkFile.h b/LiteLoader/include/llapi/utils/ShellLinkFile.h similarity index 99% rename from LiteLoader/Header/Utils/ShellLinkFile.h rename to LiteLoader/include/llapi/utils/ShellLinkFile.h index 923559e..309dd23 100644 --- a/LiteLoader/Header/Utils/ShellLinkFile.h +++ b/LiteLoader/include/llapi/utils/ShellLinkFile.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" struct IShellLinkW; struct IPersistFile; diff --git a/LiteLoader/Header/Utils/StringHelper.h b/LiteLoader/include/llapi/utils/StringHelper.h similarity index 98% rename from LiteLoader/Header/Utils/StringHelper.h rename to LiteLoader/include/llapi/utils/StringHelper.h index 021cb43..e208f3f 100644 --- a/LiteLoader/Header/Utils/StringHelper.h +++ b/LiteLoader/include/llapi/utils/StringHelper.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include #include diff --git a/LiteLoader/Header/Utils/StringReader.h b/LiteLoader/include/llapi/utils/StringReader.h similarity index 98% rename from LiteLoader/Header/Utils/StringReader.h rename to LiteLoader/include/llapi/utils/StringReader.h index 3b30f31..268c663 100644 --- a/LiteLoader/Header/Utils/StringReader.h +++ b/LiteLoader/include/llapi/utils/StringReader.h @@ -1,5 +1,5 @@ #pragma once -#include <../Global.h> +#include "llapi/Global.h" class StringReader { diff --git a/LiteLoader/Header/Utils/TypeConversionHelper.hpp b/LiteLoader/include/llapi/utils/TypeConversionHelper.hpp similarity index 94% rename from LiteLoader/Header/Utils/TypeConversionHelper.hpp rename to LiteLoader/include/llapi/utils/TypeConversionHelper.hpp index 640923c..dba95e5 100644 --- a/LiteLoader/Header/Utils/TypeConversionHelper.hpp +++ b/LiteLoader/include/llapi/utils/TypeConversionHelper.hpp @@ -1,7 +1,7 @@ #pragma once -#include <../Global.h> +#include "llapi/Global.h" #include -#include +#include "ModUtils/ModUtils.h" using namespace std; namespace TCHelper { diff --git a/LiteLoader/Header/Utils/VarInt.h b/LiteLoader/include/llapi/utils/VarInt.h similarity index 100% rename from LiteLoader/Header/Utils/VarInt.h rename to LiteLoader/include/llapi/utils/VarInt.h diff --git a/LiteLoader/Header/Utils/ViewHelper.h b/LiteLoader/include/llapi/utils/ViewHelper.h similarity index 100% rename from LiteLoader/Header/Utils/ViewHelper.h rename to LiteLoader/include/llapi/utils/ViewHelper.h diff --git a/LiteLoader/Header/Utils/WinHelper.h b/LiteLoader/include/llapi/utils/WinHelper.h similarity index 97% rename from LiteLoader/Header/Utils/WinHelper.h rename to LiteLoader/include/llapi/utils/WinHelper.h index 7fd7474..284d7da 100644 --- a/LiteLoader/Header/Utils/WinHelper.h +++ b/LiteLoader/include/llapi/utils/WinHelper.h @@ -1,5 +1,5 @@ #pragma once -#include "../Global.h" +#include "llapi/Global.h" #include #include diff --git a/LiteLoader/Main/AddonsHelper.cpp b/LiteLoader/src/liteloader/AddonsHelper.cpp similarity index 96% rename from LiteLoader/Main/AddonsHelper.cpp rename to LiteLoader/src/liteloader/AddonsHelper.cpp index 9d5274a..869bf3d 100644 --- a/LiteLoader/Main/AddonsHelper.cpp +++ b/LiteLoader/src/liteloader/AddonsHelper.cpp @@ -1,25 +1,25 @@ -#include "AddonsHelper.h" -#include
-#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "liteloader/AddonsHelper.h" +#include "liteloader/Config.h" +#include "llapi/EventAPI.h" +#include "llapi/RegCommandAPI.h" +#include "llapi/LLAPI.h" +#include +#include +#include +#include +#include +#include +#include "llapi/GlobalServiceAPI.h" +#include +#include #include -#include
-#include -#include +#include "liteloader/Config.h" +#include "llapi/LoggerAPI.h" +#include "llapi/I18nAPI.h" #include #include #include -#include +#include #include using namespace std; using namespace RegisterCommandHelper; @@ -49,7 +49,7 @@ inline bool isManifestFile(std::string const& filename) { return filename == "manifest.json" || filename == "pack_manifest.json"; } -#include +#include inline std::string FixMojangJson(std::string const& content) { Json::Value value; JsonHelpers::parseJson(content, value); @@ -79,7 +79,7 @@ std::optional parseAddonFromPath(std::filesystem::path addonPath) { addon.directory = UTF82String(addonPath.u8string()); auto ver = header["version"]; - addon.version = LL::Version(ver[0], ver[1], ver[2]); + addon.version = ll::Version(ver[0], ver[1], ver[2]); string type = manifest["modules"][0]["type"]; if (type == "resources") @@ -239,7 +239,7 @@ void FindManifest(vector& result, const string& path) { } std::string Addon::getPrintName() const { - if (LL::globalConfig.colorLog) + if (ll::globalConfig.colorLog) return ColorFormat::convertToConsole(std::string(name)); else return ColorFormat::removeColorCode(std::string(name)); @@ -619,7 +619,7 @@ bool AutoInstallAddons(string path) { std::error_code ec; if (!filesystem::exists(str2wstr(path))) { filesystem::create_directories(str2wstr(path), ec); - addonLogger.info(tr("ll.addonsHelper.autoInstall.tip.dirCreated", LL::globalConfig.addonsInstallPath)); + addonLogger.info(tr("ll.addonsHelper.autoInstall.tip.dirCreated", ll::globalConfig.addonsInstallPath)); return false; } std::vector toInstallList; @@ -659,13 +659,13 @@ bool AutoInstallAddons(string path) { } void InitAddonsHelper() { - if (LL::isDebugMode()) + if (ll::isDebugMode()) addonLogger.consoleLevel = addonLogger.debug.level; filesystem::remove_all(ADDON_INSTALL_TEMP_DIR); filesystem::create_directories(ADDON_INSTALL_TEMP_DIR); - AutoInstallAddons(LL::globalConfig.addonsInstallPath); + AutoInstallAddons(ll::globalConfig.addonsInstallPath); BuildAddonsList(); filesystem::remove_all(ADDON_INSTALL_TEMP_DIR); diff --git a/LiteLoader/Main/BStats.cpp b/LiteLoader/src/liteloader/BStats.cpp similarity index 94% rename from LiteLoader/Main/BStats.cpp rename to LiteLoader/src/liteloader/BStats.cpp index ca8cd46..8cfa89a 100644 --- a/LiteLoader/Main/BStats.cpp +++ b/LiteLoader/src/liteloader/BStats.cpp @@ -1,16 +1,16 @@ -#include "LiteLoader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "liteloader/LiteLoader.h" +#include "llapi/EventAPI.h" +#include "llapi/Global.h" +#include "llapi/ScheduleAPI.h" +#include "llapi/ServerAPI.h" +#include +#include +#include +#include +#include +#include +#include +#include #define BSTATS_JSON(key, val) \ if (json.find(key) != json.end()) { \ @@ -225,8 +225,8 @@ nlohmann::json addAdvancedPie(const string& key, const unordered_map //#include // -//using namespace LL; +//using namespace ll; // //// Fix bug //TClasslessInstanceHook(bool, "?_read@ClientCacheBlobStatusPacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", @@ -185,7 +185,7 @@ //TInstanceHook(void, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", ServerPlayer , ActorDamageSource* ds) //{ // original(this, ds); -// if (LL::globalConfig.enableFixMcBug) +// if (ll::globalConfig.enableFixMcBug) // { // auto name = getRealName(); // Schedule::delay([name]() { @@ -199,7 +199,7 @@ // //// Fix Fishing Hook changeDimension Crash //TInstanceHook(__int64, "?changeDimension@Actor@@UEAAXV?$AutomaticID@VDimension@@H@@@Z", Actor, unsigned int a1) { -// if (!LL::globalConfig.enableFixMcBug) +// if (!ll::globalConfig.enableFixMcBug) // return original(this, a1); // if ((int)this->getEntityTypeId() == 0x4D) // return 0; @@ -207,7 +207,7 @@ //} // //TClasslessInstanceHook(__int64, "?teleportEntity@EndGatewayBlockActor@@QEAAXAEAVActor@@@Z", Actor* a1) { -// if (!LL::globalConfig.enableFixMcBug) +// if (!ll::globalConfig.enableFixMcBug) // return original(this, a1); // if ((int)a1->getEntityTypeId() == 0x4D) // return 0; @@ -235,33 +235,33 @@ //// Fix command crash when server is stopping //TClasslessInstanceHook(void, "?fireEventPlayerMessage@MinecraftEventing@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z", // std::string const& a1, std::string const& a2, std::string const& a3, std::string const& a4) { -// if (LL::isServerStopping()) +// if (ll::isServerStopping()) // return; // original(this, a1, a2, a3, a4); //} //TClasslessInstanceHook(void, "?fireEventPlayerTransform@MinecraftEventing@@SAXAEAVPlayer@@@Z", // class Player& a1) { -// if (LL::isServerStopping()) +// if (ll::isServerStopping()) // return; // original(this, a1); //} // //TClasslessInstanceHook(void, "?fireEventPlayerTravelled@MinecraftEventing@@UEAAXPEAVPlayer@@M@Z", // class Player& a1, float a2) { -// if (LL::isServerStopping()) +// if (ll::isServerStopping()) // return; // original(this, a1, a2); //} //TClasslessInstanceHook(void, "?fireEventPlayerTeleported@MinecraftEventing@@SAXPEAVPlayer@@MW4TeleportationCause@1@H@Z", // class Player* a1, float a2, int a3, int a4) { -// if (LL::isServerStopping()) +// if (ll::isServerStopping()) // return; // original(this, a1, a2, a3, a4); //} // //// Set stdin mode to text mode if in wine environment //inline bool _tryFixConsoleInputMode() { -// if ((LL::globalConfig.enableFixMcBug && IsWineEnvironment()) || LL::globalConfig.enableForceUtf8Input) { +// if ((ll::globalConfig.enableFixMcBug && IsWineEnvironment()) || ll::globalConfig.enableForceUtf8Input) { // int result = _setmode(_fileno(stdin), _O_U8TEXT); // if (result == -1) { // logger.error("Cannot set stdin to utf8 text mode"); @@ -285,14 +285,14 @@ // //// Fix server broadcast bug. //TClasslessInstanceHook(bool, "?getLANBroadcast@LevelData@@QEBA_NXZ") { -// if (LL::globalConfig.enableFixBroadcastBug) { +// if (ll::globalConfig.enableFixBroadcastBug) { // return true; // } // return original(this); //} // //TClasslessInstanceHook(bool, "?getLANBroadcastIntent@LevelData@@QEBA_NXZ") { -// if (LL::globalConfig.enableFixBroadcastBug) { +// if (ll::globalConfig.enableFixBroadcastBug) { // return true; // } // return original(this); @@ -302,7 +302,7 @@ //bool pauseBLogging = false; //THook(__int64, "std::_Func_impl_no_alloc<,TaskResult>::_Do_call", // __int64 a1, __int64 a2) { -// if (LL::globalConfig.disableAutoCompactionLog) { +// if (ll::globalConfig.disableAutoCompactionLog) { // pauseBLogging = true; // auto v = original(a1, a2); // pauseBLogging = false; @@ -313,7 +313,7 @@ // //TClasslessInstanceHook(char, "?log_va@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@W4LogAreaID@@IPEBDH4PEAD@Z", // char a2, int a3, int a4, unsigned int a5, __int64 a6, int a7, __int64 a8, __int64 a9) { -// if (LL::globalConfig.disableAutoCompactionLog && pauseBLogging) { +// if (ll::globalConfig.disableAutoCompactionLog && pauseBLogging) { // return 0; // } // return original(this, a2, a3, a4, a5, a6, a7, a8, a9); @@ -325,7 +325,7 @@ // //THook(void*, "??0ScopedTimer@ImguiProfiler@@QEAA@PEBD0_N@Z", // void* self, char* a2, char* a3, char a4) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // return nullptr; // } // return original(self, a2, a3, a4); @@ -333,7 +333,7 @@ // //THook(void, "??1ScopedTimer@ImguiProfiler@@UEAA@XZ", // void* self) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // return; // } // return original(self); @@ -342,7 +342,7 @@ //SHook2("_tickDimensionTransition", __int64, "40 53 55 41 56 41 57 48 ?? ?? ?? ?? ?? ?? 48 ?? ?? ?? ?? ?? ?? 48 33 " // "C4 48 89 ?? ?? ?? 48 8B C2 4C 8B F9 48 8B C8 33 D2 49 8B D9 49 8B E8 E8 ?? ?? ?? ?? 4C 8B F0 48 85 C0", // __int64 a1, ActorOwnerComponent* a2, __int64 a3, void* a4) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // auto ac = Actor::tryGetFromComponent(*a2, 0); // if (ac) { // auto bs = &ac->getRegionConst(); @@ -355,7 +355,7 @@ // //THook(void, "?_trackMovement@GameEventMovementTrackingSystem@@CAXAEAVActor@@AEAVGameEventMovementTrackingComponent@@@Z", // Actor* a1, void* self) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // auto bs = &a1->getRegionConst(); // if (bs == nullptr || !bs) { // return; @@ -369,7 +369,7 @@ // //THook(LevelChunk*, "?getChunk@BlockSource@@QEBAPEAVLevelChunk@@AEBVChunkPos@@@Z", // BlockSource* self, ChunkPos* a2) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // LevelChunk* ptr = nullptr; // try { // ptr = original(self, a2); @@ -384,7 +384,7 @@ // //THook(__int64, "?getAvailableChunk@ChunkSource@@QEAA?AV?$shared_ptr@VLevelChunk@@@std@@AEBVChunkPos@@@Z", // __int64 a1, __int64 a2) { -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // __int64 ptr = NULL; // try { // ptr = original(a1, a2); @@ -400,7 +400,7 @@ // Actor) { // // auto bs = original(this); -// if (LL::globalConfig.enableFixBDSCrash) { +// if (ll::globalConfig.enableFixBDSCrash) { // if (!bs) { // return Level::getBlockSource(getDimensionId()); // } diff --git a/LiteLoader/Main/BuiltinCommands.cpp b/LiteLoader/src/liteloader/BuiltinCommands.cpp similarity index 94% rename from LiteLoader/Main/BuiltinCommands.cpp rename to LiteLoader/src/liteloader/BuiltinCommands.cpp index 890062c..93032bc 100644 --- a/LiteLoader/Main/BuiltinCommands.cpp +++ b/LiteLoader/src/liteloader/BuiltinCommands.cpp @@ -1,21 +1,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include
-#include
-#include "../ScriptEngine/Main/Configs.h" +#include "llapi/EventAPI.h" +#include "llapi/LLAPI.h" +#include "llapi/ServerAPI.h" +#include "llapi/RegCommandAPI.h" +#include "llapi/mc/CommandOrigin.hpp" +#include "llapi/mc/CommandOutput.hpp" +#include "llapi/mc/CommandPosition.hpp" +#include "llapi/mc/CommandRegistry.hpp" +#include "llapi/mc/Packet.hpp" +#include "llapi/mc/ServerPlayer.hpp" +#include "llapi/mc/VanillaDimensions.hpp" +#include "liteloader/Config.h" +#include "liteloader/PluginManager.h" +#include "ScriptEngine/src/main/Configs.h" using namespace RegisterCommandHelper; -using namespace LL; +using namespace ll; //static_assert(sizeof(CommandSelector) == 200); @@ -149,7 +149,7 @@ public: }; void LLListPluginsCommand(CommandOutput& output) { - auto plugins = LL::getAllPlugins(); + auto plugins = ll::getAllPlugins(); output.trSuccess("ll.cmd.listPlugin.overview", plugins.size()); std::ostringstream oss; @@ -170,7 +170,7 @@ void LLListPluginsCommand(CommandOutput& output) { } void LLPluginInfoCommand(CommandOutput& output, const string& pluginName) { - auto plugin = LL::getPlugin(pluginName); + auto plugin = ll::getPlugin(pluginName); if (plugin) { std::map outs; std::ostringstream oss; @@ -201,7 +201,7 @@ void LLPluginInfoCommand(CommandOutput& output, const string& pluginName) { } void LLVersionCommand(CommandOutput& output) { - output.trSuccess("ll.cmd.version.msg", LL::getBdsVersion(), LL::getLoaderVersionString(), LL::getServerProtocolVersion()); + output.trSuccess("ll.cmd.version.msg", ll::getBdsVersion(), ll::getLoaderVersionString(), ll::getServerProtocolVersion()); } void LLHelpCommand(CommandOutput& output) { @@ -209,7 +209,7 @@ void LLHelpCommand(CommandOutput& output) { } void LLLoadPluginCommand(CommandOutput& output, const string& path) { - // if (!LL::isDebugMode()) + // if (!ll::isDebugMode()) // return; if (PluginManager::loadPlugin(path, true)) { output.trSuccess("ll.cmd.loadPlugin.success", path); @@ -219,7 +219,7 @@ void LLLoadPluginCommand(CommandOutput& output, const string& path) { } void LLUnloadPluginCommand(CommandOutput& output, const string& pluginName) { - // if (!LL::isDebugMode()) + // if (!ll::isDebugMode()) // return; if (PluginManager::unloadPlugin(pluginName, true)) { output.trSuccess("ll.cmd.unloadPlugin.success", pluginName); @@ -229,7 +229,7 @@ void LLUnloadPluginCommand(CommandOutput& output, const string& pluginName) { } void LLReloadPluginCommand(CommandOutput& output, const string& pluginName, bool reloadAll) { - // if (!LL::isDebugMode()) + // if (!ll::isDebugMode()) // return; if (!reloadAll) { if (PluginManager::reloadPlugin(pluginName, true)) { @@ -316,7 +316,7 @@ public: // Register softenum vector pluginList; - for (auto& [name, p] : LL::getAllPlugins()) { + for (auto& [name, p] : ll::getAllPlugins()) { pluginList.push_back(name); } registry->addSoftEnum("PluginName", pluginList); @@ -381,7 +381,7 @@ void RegisterCommands() { Event::RegCmdEvent::subscribe([](Event::RegCmdEvent ev) { // Register commands LLCommand::setup(ev.mCommandRegistry); VersionCommand::setup(ev.mCommandRegistry); - if (LL::globalConfig.enableTpdimCommand) { + if (ll::globalConfig.enableTpdimCommand) { TeleportDimensionCommand::setup(ev.mCommandRegistry); } return true; diff --git a/LiteLoader/Main/BuiltinUnlockCmd.cpp b/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp similarity index 91% rename from LiteLoader/Main/BuiltinUnlockCmd.cpp rename to LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp index 3edf4b3..736a504 100644 --- a/LiteLoader/Main/BuiltinUnlockCmd.cpp +++ b/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp @@ -1,7 +1,7 @@ -#include "Global.h" -#include
-#include -#include +#include "llapi/Global.h" +#include "liteloader/Config.h" +#include +#include "llapi/HookAPI.h" /////////////////// Built in UnlockCmd /////////////////// bool isUnlockCmdEnabled = true; @@ -19,10 +19,10 @@ TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@D throw std::runtime_error("There is already a command named " + name); } } - if (LL::globalConfig.enableUnlockCmd) { + if (ll::globalConfig.enableUnlockCmd) { flag1 |= 0x80; } - if (LL::globalConfig.debugMode) { + if (ll::globalConfig.debugMode) { LogCommandRegistration(name, description, perm, flag1, flag2); } return original(this, name, description, perm, flag1, flag2); @@ -32,7 +32,7 @@ class CommandSelectorBase; class CommandOrigin; //TClasslessInstanceHook(bool, "?isExpansionAllowed@CommandSelectorBase@@AEBA_NAEBVCommandOrigin@@@Z", // CommandOrigin* a2) { -// if (LL::globalConfig.enableUnlockCmd) { +// if (ll::globalConfig.enableUnlockCmd) { // original(this, a2); // return true; // } @@ -40,9 +40,9 @@ class CommandOrigin; //} //#include -#include -#include -#include +#include +#include +#include inline void tryChangeStringToRawText(CommandParameterData& data) { if (false /* config.xxxx*/ && data.tid.value == type_id().value) @@ -87,7 +87,7 @@ class CommandOrigin; } TClasslessInstanceHook(void, "?addEnumValueConstraints@CommandRegistry@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@3@W4SemanticConstraint@@@Z", std::string const& enumName, std::vector const& enumValues, SemanticConstraint constraint) { - if (!LL::globalConfig.enableUnlockCmd) + if (!ll::globalConfig.enableUnlockCmd) return original(this, enumName, enumValues, constraint); if (constraint & SemanticConstraint::RequiresCheatsEnabled) { constraint = (SemanticConstraint)(constraint & (~SemanticConstraint::RequiresCheatsEnabled)); diff --git a/LiteLoader/Main/Config.cpp b/LiteLoader/src/liteloader/Config.cpp similarity index 94% rename from LiteLoader/Main/Config.cpp rename to LiteLoader/src/liteloader/Config.cpp index 6b46b20..cbd7c73 100644 --- a/LiteLoader/Main/Config.cpp +++ b/LiteLoader/src/liteloader/Config.cpp @@ -1,17 +1,17 @@ #include #include #include -#include -#include
-#include
-#include +#include +#include "liteloader/Config.h" +#include "liteloader/LiteLoader.h" +#include "llapi/LoggerAPI.h" using namespace std; -namespace LL { +namespace ll { LIAPI LLConfig globalConfig; -LIAPI LL::CommandLineOption commandLineOption; +LIAPI ll::CommandLineOption commandLineOption; void inline to_json(nlohmann::json& j, const LLConfig& conf) { // clang-format off @@ -96,7 +96,7 @@ void inline to_json(nlohmann::json& j, const LLConfig& conf) { void inline from_json(const nlohmann::json& j, LLConfig& conf) { conf.debugMode = j.value("DebugMode", false); - if (LL::commandLineOption.noColorOption) + if (ll::commandLineOption.noColorOption) conf.colorLog = false; else conf.colorLog = j.value("ColorLog", true); @@ -207,7 +207,7 @@ void inline from_json(const nlohmann::json& j, LLConfig& conf) { } } } -} // namespace LL +} // namespace ll inline bool SaveConfig(nlohmann::json& config) { std::ofstream of(LITELOADER_CONFIG_FILE); @@ -240,12 +240,12 @@ void ChooseLanguage() { std::cin >> selected; std::cin.ignore(); if (!languages[selected].empty()) { - LL::globalConfig.language = languages[selected]; + ll::globalConfig.language = languages[selected]; } } */ -bool LL::LoadLLConfig() { +bool ll::LoadLLConfig() { try { auto content = ReadAllFile(LITELOADER_CONFIG_FILE); @@ -255,17 +255,17 @@ bool LL::LoadLLConfig() { // ChooseLanguage(); // } filesystem::create_directories(filesystem::path(LITELOADER_CONFIG_FILE).remove_filename().u8string()); - LL::SaveLLConfig(); + ll::SaveLLConfig(); } else { try { auto out = nlohmann::json::parse(*content, nullptr, false, true); - LL::globalConfig = out; - auto config = nlohmann::json(LL::globalConfig); + ll::globalConfig = out; + auto config = nlohmann::json(ll::globalConfig); if (out != config) { logger.warn(tr("ll.config.warning.configOutdated", LITELOADER_CONFIG_FILE)); logger.warn(tr("ll.config.updating")); - LL::globalConfig.language = "system"; - config = nlohmann::json(LL::globalConfig); + ll::globalConfig.language = "system"; + config = nlohmann::json(ll::globalConfig); return SaveConfig(config); } return true; @@ -273,7 +273,7 @@ bool LL::LoadLLConfig() { logger.error("Fail to parse config file <{}> !", LITELOADER_CONFIG_FILE); logger.error("{}", e.what()); logger.error("Using default config file..."); - return LL::SaveLLConfig(); + return ll::SaveLLConfig(); } } } catch (const nlohmann::json::exception& e) { @@ -287,7 +287,7 @@ bool LL::LoadLLConfig() { return true; } -bool LL::SaveLLConfig() { - auto config = nlohmann::json(LL::globalConfig); +bool ll::SaveLLConfig() { + auto config = nlohmann::json(ll::globalConfig); return SaveConfig(config); } diff --git a/LiteLoader/Main/CrashLogger.cpp b/LiteLoader/src/liteloader/CrashLogger.cpp similarity index 89% rename from LiteLoader/Main/CrashLogger.cpp rename to LiteLoader/src/liteloader/CrashLogger.cpp index 86910ea..dfdae2e 100644 --- a/LiteLoader/Main/CrashLogger.cpp +++ b/LiteLoader/src/liteloader/CrashLogger.cpp @@ -1,17 +1,17 @@ -#include "Main/CrashLogger.h" -#include "Main/Config.h" -#include -#include -#include +#include "liteloader/CrashLogger.h" +#include "liteloader/Config.h" +#include "llapi/LoggerAPI.h" +#include +#include #include -#include -#include +#include +#include using namespace std; -using namespace LL; +using namespace ll; Logger crashLogger("CrashLogger"); -bool LL::StartCrashLoggerProcess() { +bool ll::StartCrashLoggerProcess() { if (IsDebuggerPresent()) { crashLogger.info(tr("ll.crashLogger.existsingDebuggerDetected")); return true; @@ -45,7 +45,7 @@ bool LL::StartCrashLoggerProcess() { return true; } -void LL::InitCrashLogger(bool enableCrashLogger) { +void ll::InitCrashLogger(bool enableCrashLogger) { // Enable PreLog Module try { LoadLibrary(CL_PRELOG_MODULE); diff --git a/LiteLoader/Main/LiteLoader.cpp b/LiteLoader/src/liteloader/LiteLoader.cpp similarity index 90% rename from LiteLoader/Main/LiteLoader.cpp rename to LiteLoader/src/liteloader/LiteLoader.cpp index 17224f7..780577b 100644 --- a/LiteLoader/Main/LiteLoader.cpp +++ b/LiteLoader/src/liteloader/LiteLoader.cpp @@ -1,22 +1,29 @@ -#include -#include -#include +#include #include #include -#include -#include -#include + + +#include +#include + #include -#include -#include -#include "Config.h" -#include "Loader.h" -#include "CrashLogger.h" -#include "AddonsHelper.h" -#include -#include "Version.h" -#include "MC/Minecraft.hpp" -#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include using namespace std; @@ -73,7 +80,7 @@ void DecompressResourcePacks() { } void CheckRunningBDS() { - if (!LL::globalConfig.enableCheckRunningBDS) + if (!ll::globalConfig.enableCheckRunningBDS) return; std::vector pids; PROCESSENTRY32 pe32{}; @@ -152,7 +159,7 @@ extern bool InitPlayerDatabase(); extern void RegisterSimpleServerLogger(); void Welcome() { - if (!LL::globalConfig.enableWelcomeText) + if (!ll::globalConfig.enableWelcomeText) return; @@ -177,19 +184,19 @@ void Welcome() { } void CheckDevMode() { - if (LL::globalConfig.debugMode) + if (ll::globalConfig.debugMode) logger.warn(tr("ll.main.warning.inDevMode")); } void CheckBetaVersion() { - if (LITELOADER_VERSION_STATUS != LL::Version::Release) { + if (LITELOADER_VERSION_STATUS != ll::Version::Release) { logger.warn(tr("ll.main.warning.betaVersion")); logger.warn(tr("ll.main.warning.productionEnv")); } } void CheckProtocolVersion() { - auto currentProtocol = LL::getServerProtocolVersion(); + auto currentProtocol = ll::getServerProtocolVersion(); if (TARGET_BDS_PROTOCOL_VERSION != currentProtocol) { logger.warn(tr("ll.main.warning.protocolVersionNotMatch.1"), TARGET_BDS_PROTOCOL_VERSION, currentProtocol); logger.warn(tr("ll.main.warning.protocolVersionNotMatch.2")); @@ -250,7 +257,7 @@ void LLMain() { auto i18n = Translation::load("plugins/LiteLoader/LangPack/"); // Load Config - LL::LoadLLConfig(); + ll::LoadLLConfig(); //Unzip packed Node Modules UnzipNodeModules(); @@ -259,12 +266,12 @@ void LLMain() { DecompressResourcePacks(); // If SEH Protection is not enabled (Debug mode), restore old SE translator - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(oldSeTranslator); // Update default language - if (i18n && LL::globalConfig.language != "system") { - i18n->defaultLocaleName = LL::globalConfig.language; + if (i18n && ll::globalConfig.language != "system") { + i18n->defaultLocaleName = ll::globalConfig.language; } // Check Protocol Version @@ -284,14 +291,14 @@ void LLMain() { CheckRunningBDS(); // Builtin CrashLogger - LL::InitCrashLogger(LL::globalConfig.enableCrashLogger); + ll::InitCrashLogger(ll::globalConfig.enableCrashLogger); // Initialize Player Database InitPlayerDatabase(); // Rename Window HWND hwnd = GetConsoleWindow(); - std::wstring s = L"Bedrock Dedicated Server " + str2wstr(LL::getBdsVersion().substr(1)); + std::wstring s = L"Bedrock Dedicated Server " + str2wstr(ll::getBdsVersion().substr(1)); SetWindowText(hwnd, s.c_str()); // Register Exit Event Handler. @@ -306,12 +313,12 @@ void LLMain() { CheckDevMode(); // Addon Helper - if (LL::globalConfig.enableAddonsHelper) { + if (ll::globalConfig.enableAddonsHelper) { InitAddonsHelper(); } // Load plugins - LL::LoadMain(); + ll::LoadMain(); // Register built-in commands RegisterCommands(); @@ -344,7 +351,7 @@ THook(int, "main", int a, void* b) { char** str = static_cast(b); for (int i = 0; i < a; ++i) { if (strcmp(str[i], "--noColor") == 0) { - LL::commandLineOption.noColorOption = true; + ll::commandLineOption.noColorOption = true; break; } } diff --git a/LiteLoader/Main/Loader.cpp b/LiteLoader/src/liteloader/Loader.cpp similarity index 93% rename from LiteLoader/Main/Loader.cpp rename to LiteLoader/src/liteloader/Loader.cpp index b0612cf..4dec0c9 100644 --- a/LiteLoader/Main/Loader.cpp +++ b/LiteLoader/src/liteloader/Loader.cpp @@ -1,23 +1,23 @@ - #include
-#include +#include "liteloader/Loader.h" +#include #include #include #include -#include -#include -#include
-#include
-#include -#include -#include -#include -#include -#include -#include "Config.h" -#include "Version.h" -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; @@ -192,7 +192,7 @@ void LoadParticleAPI() { } -void LL::LoadMain() { +void ll::LoadMain() { logger.info(tr("ll.loader.loadMain.start")); CleanOldScriptEngine(); @@ -263,7 +263,7 @@ void LL::LoadMain() { } if (PluginManager::getPlugin(lib) == nullptr) { - if (!RegisterPlugin(lib, pluginFileName, pluginFileName, LL::Version(1, 0, 0), {})) { + if (!RegisterPlugin(lib, pluginFileName, pluginFileName, ll::Version(1, 0, 0), {})) { logger.error(tr("ll.pluginManager.error.failToRegisterPlugin", UTF82String(path.u8string()))); if (getPlugin(pluginFileName)) { logger.error(tr("ll.pluginManager.error.hasBeenRegistered", pluginFileName)); @@ -283,22 +283,22 @@ void LL::LoadMain() { } // Load PermissionAPI - if(LL::globalConfig.enablePermissionAPI) { + if(ll::globalConfig.enablePermissionAPI) { if (filesystem::exists("plugins/LiteLoader/PermissionAPI.dll")) { LoadPermissionAPI(); } } - if(LL::globalConfig.enableParticleAPI) { + if(ll::globalConfig.enableParticleAPI) { if (filesystem::exists("plugins/LiteLoader/ParticleAPI.dll")) { LoadParticleAPI(); } } // Load ScriptEngine - if (LL::globalConfig.enableScriptEngine) { + if (ll::globalConfig.enableScriptEngine) { InitNodeJsDirectories(); - if (LL::globalConfig.alwaysLaunchScriptEngine || IsExistNodeJsPlugin() || IsExistScriptPlugin()) { + if (ll::globalConfig.alwaysLaunchScriptEngine || IsExistNodeJsPlugin() || IsExistScriptPlugin()) { LoadScriptEngine(); } } diff --git a/LiteLoader/Main/ModifyInfomation.cpp b/LiteLoader/src/liteloader/ModifyInfomation.cpp similarity index 87% rename from LiteLoader/Main/ModifyInfomation.cpp rename to LiteLoader/src/liteloader/ModifyInfomation.cpp index c3ca1b1..b8428e5 100644 --- a/LiteLoader/Main/ModifyInfomation.cpp +++ b/LiteLoader/src/liteloader/ModifyInfomation.cpp @@ -1,17 +1,17 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include "Main/Config.h" +#include using namespace std; Logger serverLogger("Server"); extern void CheckBetaVersion(); THook(std::string, "?getServerVersionString@Common@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ") { CheckBetaVersion(); - return original() + "(ProtocolVersion " + to_string(LL::getServerProtocolVersion()) + ") with " + fmt::format(LL::globalConfig.colorLog ? fg(fmt::color::light_sky_blue) | fmt::emphasis::bold | fmt::emphasis::italic : fmt::text_style(), "LiteLoaderBDS " + LL::getLoaderVersion().toString(true)); + return original() + "(ProtocolVersion " + to_string(ll::getServerProtocolVersion()) + ") with " + fmt::format(ll::globalConfig.colorLog ? fg(fmt::color::light_sky_blue) | fmt::emphasis::bold | fmt::emphasis::italic : fmt::text_style(), "LiteLoaderBDS " + ll::getLoaderVersion().toString(true)); } @@ -55,8 +55,8 @@ THook(void, "?PlatformBedrockLogOut@@YAXIPEBD@Z", int a1, const char* ts) { // return; // } -#include "LiteLoader.h" -#include +#include +#include namespace ModifyInfomation { int telemetryText = 0; } @@ -80,9 +80,9 @@ THook(void, "?log@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@ return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, a8, va); } -#include -#include -#include +#include +#include +#include extern std::unordered_map resultOfOrigin; TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin@@AEBVCommandOutput@@@Z", class CommandOrigin const& origin, class CommandOutput const& output) { @@ -91,7 +91,7 @@ TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin std::cout.rdbuf(&tmpBuf); auto rv = original(this, origin, output); std::cout.rdbuf(oldBuf); - if (LL::isDebugMode() && LL::globalConfig.tickThreadId != std::this_thread::get_id()) { + if (ll::isDebugMode() && ll::globalConfig.tickThreadId != std::this_thread::get_id()) { logger.warn("The thread executing the CommandOutputSender::send is not the \"MC_SERVER\" thread"); logger.warn("Output: {}", tmpBuf.str()); } @@ -107,7 +107,7 @@ TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin resultOfOrigin.erase(it); return rv; } catch (...) { - if (LL::isDebugMode()) { + if (ll::isDebugMode()) { logger.warn("Output: {}", tmpBuf.str()); logger.warn("size of resultOfOrigin: {}", resultOfOrigin.size()); } @@ -120,7 +120,7 @@ TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin std::istringstream iss(tmpBuf.str()); string line; while (getline(iss, line)) { - if (LL::globalConfig.colorLog) + if (ll::globalConfig.colorLog) log << ColorFormat::convertToConsole(line, false) << Logger::endl; else log << ColorFormat::removeColorCode(line) << Logger::endl; diff --git a/LiteLoader/Main/ModifyPack.cpp b/LiteLoader/src/liteloader/ModifyPack.cpp similarity index 100% rename from LiteLoader/Main/ModifyPack.cpp rename to LiteLoader/src/liteloader/ModifyPack.cpp diff --git a/LiteLoader/Main/PluginManager.cpp b/LiteLoader/src/liteloader/PluginManager.cpp similarity index 87% rename from LiteLoader/Main/PluginManager.cpp rename to LiteLoader/src/liteloader/PluginManager.cpp index 548836e..41c6393 100644 --- a/LiteLoader/Main/PluginManager.cpp +++ b/LiteLoader/src/liteloader/PluginManager.cpp @@ -1,24 +1,24 @@ -#include "Main/PluginManager.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "llapi/I18nAPI.h" +#include +#include +#include #include #include -#include "../ScriptEngine/Main/Configs.h" +#include using namespace std; extern Logger logger; -std::unordered_map plugins; +std::unordered_map plugins; -bool LL::PluginManager::registerPlugin(HMODULE handle, std::string name, std::string desc, LL::Version version, +bool ll::PluginManager::registerPlugin(HMODULE handle, std::string name, std::string desc, ll::Version version, std::map others) { if (handle != nullptr) // DLL Plugin { @@ -31,7 +31,7 @@ bool LL::PluginManager::registerPlugin(HMODULE handle, std::string name, std::st } } - LL::Plugin plugin{name, desc, version, others}; + ll::Plugin plugin{name, desc, version, others}; plugin.handle = handle; try { plugin.type = others.at("PluginType") == "Script Plugin" ? Plugin::PluginType::ScriptPlugin : Plugin::PluginType::DllPlugin; @@ -52,7 +52,7 @@ bool LL::PluginManager::registerPlugin(HMODULE handle, std::string name, std::st return true; } -bool LL::PluginManager::unRegisterPlugin(std::string name) { +bool ll::PluginManager::unRegisterPlugin(std::string name) { auto plugin = getPlugin(name); if (plugin == nullptr) { return false; @@ -63,10 +63,10 @@ bool LL::PluginManager::unRegisterPlugin(std::string name) { } // Helper -LL::Plugin* GetPlugin_Raw(std::string name, bool includeScriptPlugin) { +ll::Plugin* GetPlugin_Raw(std::string name, bool includeScriptPlugin) { for (auto& it : plugins) { if (it.second.name == name || UTF82String(filesystem::path(str2wstr(it.second.filePath)).filename().u8string()) == name) { - if (!includeScriptPlugin && it.second.type == LL::Plugin::PluginType::ScriptPlugin) + if (!includeScriptPlugin && it.second.type == ll::Plugin::PluginType::ScriptPlugin) continue; return &it.second; } @@ -74,7 +74,7 @@ LL::Plugin* GetPlugin_Raw(std::string name, bool includeScriptPlugin) { return nullptr; } -LL::Plugin* LL::PluginManager::getPlugin(std::string name, bool includeScriptPlugin) { +ll::Plugin* ll::PluginManager::getPlugin(std::string name, bool includeScriptPlugin) { auto res = GetPlugin_Raw(name, includeScriptPlugin); if (res) return res; @@ -90,7 +90,7 @@ LL::Plugin* LL::PluginManager::getPlugin(std::string name, bool includeScriptPlu return nullptr; } -LL::Plugin* LL::PluginManager::getPlugin(HMODULE handle) { +ll::Plugin* ll::PluginManager::getPlugin(HMODULE handle) { if (!handle) return nullptr; @@ -102,12 +102,12 @@ LL::Plugin* LL::PluginManager::getPlugin(HMODULE handle) { return nullptr; } -bool LL::PluginManager::hasPlugin(std::string name, bool includeScriptPlugin) { +bool ll::PluginManager::hasPlugin(std::string name, bool includeScriptPlugin) { return getPlugin(name, includeScriptPlugin) != nullptr; } -std::unordered_map LL::PluginManager::getAllPlugins(bool includeScriptPlugin) { - std::unordered_map res; +std::unordered_map ll::PluginManager::getAllPlugins(bool includeScriptPlugin) { + std::unordered_map res; for (auto& [k, v] : plugins) { if (!includeScriptPlugin && v.type == Plugin::PluginType::ScriptPlugin) continue; @@ -116,8 +116,8 @@ std::unordered_map LL::PluginManager::getAllPlugins(bo return res; } -bool LL::PluginManager::loadPlugin(string pluginFilePath, bool outputResult, bool isHotLoad) { - // if (!LL::isDebugMode()) +bool ll::PluginManager::loadPlugin(string pluginFilePath, bool outputResult, bool isHotLoad) { + // if (!ll::isDebugMode()) // return false; try { filesystem::path path(filesystem::path(str2wstr(pluginFilePath)).lexically_normal()); @@ -179,7 +179,7 @@ bool LL::PluginManager::loadPlugin(string pluginFilePath, bool outputResult, boo auto lib = LoadLibrary(str2wstr(pluginFilePath).c_str()); if (lib) { if (getPlugin(lib) == nullptr) { - if (!RegisterPlugin(lib, pluginFileName, pluginFileName, LL::Version(1, 0, 0), {})) { + if (!RegisterPlugin(lib, pluginFileName, pluginFileName, ll::Version(1, 0, 0), {})) { logger.error(tr("ll.pluginManager.error.failToRegisterPlugin", pluginFilePath)); if (getPlugin(pluginFileName)) { logger.error(tr("ll.pluginManager.error.hasBeenRegistered", pluginFileName)); @@ -240,11 +240,11 @@ bool LL::PluginManager::loadPlugin(string pluginFilePath, bool outputResult, boo } } -bool LL::PluginManager::unloadPlugin(string pluginName, bool outputResult) { - // if (!LL::isDebugMode()) +bool ll::PluginManager::unloadPlugin(string pluginName, bool outputResult) { + // if (!ll::isDebugMode()) // return false; try { - LL::Plugin* plugin = getPlugin(pluginName); + ll::Plugin* plugin = getPlugin(pluginName); if (!plugin) { if (outputResult) { logger.error(tr("ll.pluginManager.error.pluginNotFound")); @@ -284,11 +284,11 @@ bool LL::PluginManager::unloadPlugin(string pluginName, bool outputResult) { } } -bool LL::PluginManager::reloadPlugin(string pluginName, bool outputResult) { - // if (!LL::isDebugMode()) +bool ll::PluginManager::reloadPlugin(string pluginName, bool outputResult) { + // if (!ll::isDebugMode()) // return false; try { - LL::Plugin* plugin = getPlugin(pluginName); + ll::Plugin* plugin = getPlugin(pluginName); if (!plugin) { if (outputResult) { logger.error(tr("ll.pluginManager.error.pluginNotFound")); @@ -327,8 +327,8 @@ bool LL::PluginManager::reloadPlugin(string pluginName, bool outputResult) { } } -int LL::PluginManager::reloadAllPlugins(bool outputResult) { - // if (!LL::isDebugMode()) +int ll::PluginManager::reloadAllPlugins(bool outputResult) { + // if (!ll::isDebugMode()) // return false; try { auto plugins = getAllPlugins(true); @@ -367,8 +367,8 @@ int LL::PluginManager::reloadAllPlugins(bool outputResult) { } } -bool LL::PluginManager::callEventAtHotLoad(std::string pluginName) { - // if (!LL::isDebugMode()) +bool ll::PluginManager::callEventAtHotLoad(std::string pluginName) { + // if (!ll::isDebugMode()) // return false; Schedule::nextTick([pluginName]() { Event::ServerStartedEvent().callToPlugin(pluginName); // ServerStartedEvent @@ -395,8 +395,8 @@ bool LL::PluginManager::callEventAtHotLoad(std::string pluginName) { return true; } -bool LL::PluginManager::callEventAtHotUnload(std::string pluginName) { - // if (!LL::isDebugMode()) +bool ll::PluginManager::callEventAtHotUnload(std::string pluginName) { + // if (!ll::isDebugMode()) // return false; auto players = Level::getAllPlayers(); for (auto& pl : players) // PlayerLeftEvent @@ -412,9 +412,9 @@ bool LL::PluginManager::callEventAtHotUnload(std::string pluginName) { } // Helper -LIAPI bool RegisterPlugin(HMODULE handle, std::string name, std::string desc, LL::Version version, +LIAPI bool RegisterPlugin(HMODULE handle, std::string name, std::string desc, ll::Version version, std::map others) { others["PluginType"] = "DLL Plugin"; others["PluginFilePath"] = handle ? GetModulePath(handle) : name; - return LL::PluginManager::registerPlugin(handle, name, desc, version, others); + return ll::PluginManager::registerPlugin(handle, name, desc, version, others); } \ No newline at end of file diff --git a/LiteLoader/Main/SEHProtection.cpp b/LiteLoader/src/liteloader/SEHProtection.cpp similarity index 92% rename from LiteLoader/Main/SEHProtection.cpp rename to LiteLoader/src/liteloader/SEHProtection.cpp index 3bfa4ea..d6e3a25 100644 --- a/LiteLoader/Main/SEHProtection.cpp +++ b/LiteLoader/src/liteloader/SEHProtection.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/LiteLoader/Main/SimpleServerLogger.cpp b/LiteLoader/src/liteloader/SimpleServerLogger.cpp similarity index 76% rename from LiteLoader/Main/SimpleServerLogger.cpp rename to LiteLoader/src/liteloader/SimpleServerLogger.cpp index 39078b6..83573c0 100644 --- a/LiteLoader/Main/SimpleServerLogger.cpp +++ b/LiteLoader/src/liteloader/SimpleServerLogger.cpp @@ -1,16 +1,16 @@ -#include -#include -#include -#include
-#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include using namespace Event; void RegisterSimpleServerLogger() { - if (LL::globalConfig.enableSimpleServerLogger) { + if (ll::globalConfig.enableSimpleServerLogger) { Event::PlayerChatEvent::subscribe([](const Event::PlayerChatEvent& ev) { static Logger logger("Chat"); logger.info("<{}> {}", ev.mPlayer->getRealName(), ev.mMessage); @@ -24,10 +24,11 @@ void RegisterSimpleServerLogger() { } } -#include +#include +#include TInstanceHook(void, "?setPermissions@ServerPlayer@@UEAAXW4CommandPermissionLevel@@@Z", Player, CommandPermissionLevel perm) { - if (LL::globalConfig.enableSimpleServerLogger) { + if (ll::globalConfig.enableSimpleServerLogger) { static Logger logger("Permissions"); logger.info("<{}> {}({}) -> {}({})", getRealName(), magic_enum::enum_name(getCommandPermissionLevel()), (int)getCommandPermissionLevel(), magic_enum::enum_name(perm), (int)perm); @@ -36,7 +37,7 @@ TInstanceHook(void, "?setPermissions@ServerPlayer@@UEAAXW4CommandPermissionLevel } // ==> LiteLoader/Main/BuiltinUnlockCmd.cpp -#include +#include void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) { static Logger logger("RegsterCommand"); logger.consoleLevel = logger.debug.level; diff --git a/LiteLoader/Main/dllmain.cpp b/LiteLoader/src/liteloader/dllmain.cpp similarity index 97% rename from LiteLoader/Main/dllmain.cpp rename to LiteLoader/src/liteloader/dllmain.cpp index 8f65092..265ac9b 100644 --- a/LiteLoader/Main/dllmain.cpp +++ b/LiteLoader/src/liteloader/dllmain.cpp @@ -7,7 +7,7 @@ #pragma comment(linker, "/export:?dlsym_reverse@@YA?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@H@Z=LLPreLoader.?dlsym_reverse@@YA?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@H@Z") -#include +#include BOOL WINAPI DllMain(HMODULE, DWORD ul_reason_for_call, LPVOID) { switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: diff --git a/LiteLoader/Kernel/AllowListAPI.cpp b/LiteLoader/src/llapi/AllowListAPI.cpp similarity index 100% rename from LiteLoader/Kernel/AllowListAPI.cpp rename to LiteLoader/src/llapi/AllowListAPI.cpp diff --git a/LiteLoader/Kernel/Compatibility.cpp b/LiteLoader/src/llapi/Compatibility.cpp similarity index 97% rename from LiteLoader/Kernel/Compatibility.cpp rename to LiteLoader/src/llapi/Compatibility.cpp index dd17511..dd11390 100644 --- a/LiteLoader/Kernel/Compatibility.cpp +++ b/LiteLoader/src/llapi/Compatibility.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include extern Logger logger; LIAPI void OutputEventError(const std::string& errorMsg, const std::string& eventName, const std::string& pluginName) { diff --git a/LiteLoader/Kernel/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp similarity index 95% rename from LiteLoader/Kernel/EventAPI.cpp rename to LiteLoader/src/llapi/EventAPI.cpp index d3e517b..97bca2f 100644 --- a/LiteLoader/Kernel/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -1,67 +1,67 @@ -#include
-#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// #include -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// #include +// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -// #include -#include -#include -#include -#include -#include -#include -// #include -#include -#include -#include +#include +#include +#include +// #include +#include +#include +#include +#include +#include +#include +// #include +#include +#include +#include static_assert(offsetof(InventoryAction, source) == 0x0); static_assert(offsetof(InventoryAction, slot) == 0x0c); @@ -133,7 +133,7 @@ inline void OutputError(std::string errorMsg, int errorCode, std::string errorWh logger.error("Error: Code [{}] {}", errorCode, errorWhat); logger.error("In Event ({})", eventName); if (!pluginName.empty()) { - auto plugin = LL::getPlugin(pluginName); + auto plugin = ll::getPlugin(pluginName); if (plugin) { logger.error("In Plugin <{} {}>", plugin->name, plugin->version.toString()); } else { @@ -586,7 +586,7 @@ TInstanceHook(void, "?onEffectRemoved@ServerPlayer@@MEAAXAEAVMobEffectInstance@@ } /////////////////// PlayerPlaceBlock /////////////////// -#include +#include // 符号变更 TInstanceHook(char, "?checkBlockPermissions@BlockSource@@QEAA_NAEAVActor@@AEBVBlockPos@@EAEBVItemStack@@_N@Z", BlockSource, Actor* ac, BlockPos* bp, unsigned __int8 facing, ItemStackBase* item, bool a6) { @@ -621,8 +621,8 @@ TClasslessInstanceHook(void, "?sendBlockPlacedByPlayer@BlockEventCoordinator@@QE } /* -#include -#include +#include +#include TInstanceHook(bool, "?_useOn@BlockItem@@MEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z", Item, ItemStack* a2, Actor* ac, BlockPos* a4, unsigned __int8 a5, class Vec3* a6) { @@ -869,7 +869,7 @@ TInstanceHook(bool, "?_calculatePlacePos@SignItem@@EEBA_NAEAVItemStackBase@@AEAV // return original(a1, a2, a3, a4, a5, a6); //} -#include +#include TInstanceHook(bool, "?useOn@SeedItemComponentLegacy@@QEAA_NAEAVItemStack@@AEAVActor@@AEBVBlockPos@@EAEBVVec3@@@Z", SeedItemComponentLegacy, ItemStack* a2, Actor* a3, BlockPos const* a4, unsigned char a5, Vec3 const* a6) { @@ -996,8 +996,8 @@ TInstanceHook(void, "?setSprinting@Mob@@UEAAX_N@Z", IF_LISTENED_END(PlayerSprintEvent) return original(this, sprinting); } -#include -#include +#include +#include /////////////////// PlayerSetArmor /////////////////// TInstanceHook(void, "?setArmor@Player@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z", Player, unsigned slot, ItemStack* it) { @@ -1071,7 +1071,7 @@ TInstanceHook(bool, "?canOpenContainerScreen@Player@@UEAA_NXZ", Player) { return rtn; } - if (LL::isDebugMode() && LL::globalConfig.tickThreadId != std::this_thread::get_id()) { + if (ll::isDebugMode() && ll::globalConfig.tickThreadId != std::this_thread::get_id()) { logger.warn("The thread executing the command \"{}\" is not the \"MC_SERVER\" thread", cmd); } if (sp) { @@ -1238,7 +1238,7 @@ TClasslessInstanceHook(bool, "?mayPlace@FireBlock@@UEBA_NAEAVBlockSource@@AEBVBl /////////////////// ContainerChange /////////////////// -// #include +// #include // TInstanceHook(void, "?_onItemChanged@LevelContainerModel@@MEAAXHAEBVItemStack@@0@Z", // LevelContainerModel, int slotNumber, ItemStack* oldItem, ItemStack* newItem) { @@ -1469,7 +1469,7 @@ TClasslessInstanceHook(bool, "?attack@ItemFrameBlock@@UEBA_NPEAVPlayer@@AEBVBloc } /////////////////// LiquidSpreadEvent /////////////////// -#include +#include TInstanceHook(bool, "?_canSpreadTo@LiquidBlockDynamic@@AEBA_NAEAVBlockSource@@AEBVBlockPos@@1E@Z", LiquidBlockDynamic, class BlockSource& bs, class BlockPos const& to, class BlockPos const& from, unsigned char unk) { auto rtn = original(this, bs, to, from, unk); @@ -1527,7 +1527,7 @@ TInstanceHook(void*, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", Server return out; } -#include +#include /////////////////// PlayerDestroy /////////////////// // TInstanceHook(bool, "?destroyBlock@SurvivalMode@@UEAA_NAEBVBlockPos@@E@Z", @@ -1625,7 +1625,7 @@ TInstanceHook(bool, "?useItemOn@GameMode@@UEAA_NAEAVItemStack@@AEBVBlockPos@@EAE // } //////////////// PlayerUseItem & PlayerEat //////////////// -// #include +// #include TInstanceHook(bool, "?baseUseItem@GameMode@@QEAA_NAEAVItemStack@@@Z", GameMode, ItemStack& it) { auto pl = this->getPlayer(); IF_LISTENED(PlayerUseItemEvent) { @@ -1867,8 +1867,8 @@ THook(void, "?destroyBlocks@@YAXAEAVLevel@@AEBVAABB@@AEAVBlockSource@@H@Z", // return projectile; // } -// #include -#include +// #include +#include // static_assert(sizeof(ActorDefinitionIdentifier) == 176); // TInstanceHook(void, "?_shootFirework@CrossbowItem@@AEBAXAEBVItemInstance@@AEAVPlayer@@@Z", // CrossbowItem, void* a1, Player* a2) { @@ -1902,8 +1902,8 @@ THook(void, "?destroyBlocks@@YAXAEAVLevel@@AEBVAABB@@AEAVBlockSource@@H@Z", // return original(this, a2, a3, a4); // } -// #include -// #include +// #include +// #include ////////////// NpcCmd ////////////// // TInstanceHook(void, @@ -1991,19 +1991,19 @@ TClasslessInstanceHook(void, "?onScoreChanged@ServerScoreboard@@UEAAXAEBUScorebo } -#include +#include ////////////// ServerStarted ////////////// // 没有这个符号 TClasslessInstanceHook(void, "?onServerThreadStarted@MinecraftServerScriptEngine@@UEAA?AW4EventResult@@AEAVServerInstance@@@Z", class ServerInstance& ins) { - if(!LL::isDebugMode()) + if(!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); - LL::globalConfig.tickThreadId = std::this_thread::get_id(); + ll::globalConfig.tickThreadId = std::this_thread::get_id(); Global = Global->getLevel(); Global = (ServerLevel*)Global->getLevel(); // Global = Global->getServerNetworkHandler(); - LL::globalConfig.serverStatus = LL::LLServerStatus::Running; + ll::globalConfig.serverStatus = ll::LLServerStatus::Running; IF_LISTENED(ServerStartedEvent) { ServerStartedEvent ev{}; @@ -2016,7 +2016,7 @@ TClasslessInstanceHook(void, "?onScoreChanged@ServerScoreboard@@UEAAXAEBUScorebo ////////////// ServerStopped ////////////// TClasslessInstanceHook(void, "??1DedicatedServer@@UEAA@XZ") { - LL::globalConfig.serverStatus = LL::LLServerStatus::Stopping; + ll::globalConfig.serverStatus = ll::LLServerStatus::Stopping; IF_LISTENED(ServerStoppedEvent) { ServerStoppedEvent ev{}; @@ -2027,7 +2027,7 @@ TClasslessInstanceHook(void, "??1DedicatedServer@@UEAA@XZ") { } TClasslessInstanceHook(void, "?execute@StopCommand@@UEBAXAEBVCommandOrigin@@AEAVCommandOutput@@@Z", class CommandOrigin const& origin, class CommandOutput& output) { - LL::globalConfig.serverStatus = LL::LLServerStatus::Stopping; + ll::globalConfig.serverStatus = ll::LLServerStatus::Stopping; original(this, origin, output); } @@ -2128,7 +2128,7 @@ TInstanceHook(int, "?startSleepInBed@Player@@UEAA?AW4BedSleepingResult@@AEBVBloc return original(this, blk); } -#include +#include ////////////// MobSpawn ////////////// TInstanceHook(Mob*, "?spawnMob@Spawner@@QEAAPEAVMob@@AEAVBlockSource@@AEBUActorDefinitionIdentifier@@PEAVActor@@AEBVVec3@@_N44@Z", @@ -2145,9 +2145,9 @@ TInstanceHook(int, "?startSleepInBed@Player@@UEAA?AW4BedSleepingResult@@AEBVBloc return original(this, a2, a3, a4, a5, a6, a7, a8); } -#include "Impl/FormPacketHelper.h" -#include -#include +#include +#include +#include ////////////// FormResponsePacket ////////////// TClasslessInstanceHook(void, "?handle@?$PacketHandlerDispatcherInstance@VModalFormResponsePacket@@$0A@@@UEBAXAEBVNetworkIdentifier@@AEAVNetEventCallback@@AEAV?$shared_ptr@VPacket@@@std@@@Z", diff --git a/LiteLoader/Kernel/FormPacketHelper.cpp b/LiteLoader/src/llapi/FormPacketHelper.cpp similarity index 94% rename from LiteLoader/Kernel/FormPacketHelper.cpp rename to LiteLoader/src/llapi/FormPacketHelper.cpp index 8f5f023..4165438 100644 --- a/LiteLoader/Kernel/FormPacketHelper.cpp +++ b/LiteLoader/src/llapi/FormPacketHelper.cpp @@ -1,17 +1,17 @@ -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include -#include -#include
+#include +#include -#include -#include -#include -#include +#include +#include +#include +#include using namespace std; diff --git a/LiteLoader/Kernel/FormUI.cpp b/LiteLoader/src/llapi/FormUI.cpp similarity index 97% rename from LiteLoader/Kernel/FormUI.cpp rename to LiteLoader/src/llapi/FormUI.cpp index f3d6da2..ea306fe 100644 --- a/LiteLoader/Kernel/FormUI.cpp +++ b/LiteLoader/src/llapi/FormUI.cpp @@ -1,14 +1,14 @@ -#include +#include #include #include -#include +#include -#include -#include -#include -#include
+#include +#include +#include +#include #include -#include +#include using namespace std; diff --git a/LiteLoader/Kernel/I18nAPI.cpp b/LiteLoader/src/llapi/I18nAPI.cpp similarity index 97% rename from LiteLoader/Kernel/I18nAPI.cpp rename to LiteLoader/src/llapi/I18nAPI.cpp index 2086e4f..448e581 100644 --- a/LiteLoader/Kernel/I18nAPI.cpp +++ b/LiteLoader/src/llapi/I18nAPI.cpp @@ -1,6 +1,8 @@ -#include -#include -#include
+#include +#include +#include +#include + using namespace std; namespace fs = std::filesystem; @@ -241,7 +243,14 @@ I18nBase* loadFromImpl(HMODULE hPlugin, HMODULE hTarget) { ///////////////////////////// Encoding-CodePage Map ///////////////////////////// +#ifdef UNICODE +#include +#define UNICODE +#else +#include +#endif #undef UNICODE + namespace TextEncoding { const std::unordered_map Encoding_CodePage_Map = { {Encoding::ISO_8859_1, 28591}, diff --git a/LiteLoader/Kernel/KVDBAPI.cpp b/LiteLoader/src/llapi/KVDBAPI.cpp similarity index 96% rename from LiteLoader/Kernel/KVDBAPI.cpp rename to LiteLoader/src/llapi/KVDBAPI.cpp index bc7fa83..3afd661 100644 --- a/LiteLoader/Kernel/KVDBAPI.cpp +++ b/LiteLoader/src/llapi/KVDBAPI.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include Logger levelDBLogger("LevelDB"); diff --git a/LiteLoader/Kernel/LLAPI.cpp b/LiteLoader/src/llapi/LLAPI.cpp similarity index 60% rename from LiteLoader/Kernel/LLAPI.cpp rename to LiteLoader/src/llapi/LLAPI.cpp index af17572..842f286 100644 --- a/LiteLoader/Kernel/LLAPI.cpp +++ b/LiteLoader/src/llapi/LLAPI.cpp @@ -1,16 +1,16 @@ #pragma comment(lib, "version") -#include
-#include -#include
-#include -#include -#include
+#include +#include +#include +#include +#include +#include #include #include using namespace std; -std::string LL::getDataPath(const std::string& pluginName) { +std::string ll::getDataPath(const std::string& pluginName) { string dataPath = "plugins\\LiteLoader\\" + pluginName; if (!filesystem::exists(str2wstr(dataPath))) { std::error_code ec; @@ -19,53 +19,53 @@ std::string LL::getDataPath(const std::string& pluginName) { return dataPath; } -std::string LL::getLoaderVersionString() { +std::string ll::getLoaderVersionString() { return getLoaderVersion().toString(); } -LL::Version LL::getLoaderVersion() { - return Version(LITELOADER_VERSION_MAJOR, LITELOADER_VERSION_MINOR, LITELOADER_VERSION_REVISION, (LL::Version::Status)LITELOADER_VERSION_STATUS); +ll::Version ll::getLoaderVersion() { + return Version(LITELOADER_VERSION_MAJOR, LITELOADER_VERSION_MINOR, LITELOADER_VERSION_REVISION, (ll::Version::Status)LITELOADER_VERSION_STATUS); } -bool LL::isDebugMode() { - return LL::globalConfig.debugMode; +bool ll::isDebugMode() { + return ll::globalConfig.debugMode; } -LL::Plugin* LL::getPlugin(std::string name) { +ll::Plugin* ll::getPlugin(std::string name) { return PluginManager::getPlugin(name); } -LL::Plugin* LL::getPlugin(HMODULE handle) { +ll::Plugin* ll::getPlugin(HMODULE handle) { return PluginManager::getPlugin(handle); } -bool LL::hasPlugin(std::string name) { +bool ll::hasPlugin(std::string name) { return PluginManager::hasPlugin(name); } -std::unordered_map LL::getAllPlugins() { +std::unordered_map ll::getAllPlugins() { return PluginManager::getAllPlugins(); } -HMODULE LL::getLoaderHandle() { +HMODULE ll::getLoaderHandle() { return GetCurrentModule(); } // Version -LL::Version::Version(int major, int minor, int revision, Status status) +ll::Version::Version(int major, int minor, int revision, Status status) : major(major), minor(minor), revision(revision), status(status) { } -bool LL::Version::operator<(LL::Version b) { +bool ll::Version::operator<(ll::Version b) { return major < b.major || (major == b.major && minor < b.minor) || (major == b.major && minor == b.minor && revision < b.revision); } -bool LL::Version::operator==(LL::Version b) { +bool ll::Version::operator==(ll::Version b) { return major == b.major && minor == b.minor && revision == b.revision; } -std::string LL::Version::toString(bool needStatus) { +std::string ll::Version::toString(bool needStatus) { string res = to_string(major) + "." + to_string(minor) + "." + to_string(revision); if (needStatus) { if (status == Status::Beta) @@ -77,7 +77,7 @@ std::string LL::Version::toString(bool needStatus) { } -LL::Version LL::Version::parse(const std::string& str) { +ll::Version ll::Version::parse(const std::string& str) { Version ver; std::string a = str; std::string status; @@ -106,18 +106,18 @@ LL::Version LL::Version::parse(const std::string& str) { return ver; } -LL::ServerStatus LL::getServerStatus() { - return (LL::ServerStatus)(LL::globalConfig.serverStatus); +ll::ServerStatus ll::getServerStatus() { + return (ll::ServerStatus)(ll::globalConfig.serverStatus); } -bool LL::isServerStarting() { - return getServerStatus() == LL::ServerStatus::Starting; +bool ll::isServerStarting() { + return getServerStatus() == ll::ServerStatus::Starting; } -bool LL::isServerStopping() { - return getServerStatus() == LL::ServerStatus::Stopping; +bool ll::isServerStopping() { + return getServerStatus() == ll::ServerStatus::Stopping; } -std::string LL::getLanguage() { - return LL::globalConfig.language; +std::string ll::getLanguage() { + return ll::globalConfig.language; } \ No newline at end of file diff --git a/LiteLoader/Kernel/LoggerAPI.cpp b/LiteLoader/src/llapi/LoggerAPI.cpp similarity index 92% rename from LiteLoader/Kernel/LoggerAPI.cpp rename to LiteLoader/src/llapi/LoggerAPI.cpp index c5bd308..c8b44e3 100644 --- a/LiteLoader/Kernel/LoggerAPI.cpp +++ b/LiteLoader/src/llapi/LoggerAPI.cpp @@ -4,9 +4,9 @@ #pragma once -#include -#include "Main/Config.h" -#include +#include +#include +#include #include #include @@ -88,13 +88,13 @@ Logger::OutputStream::OutputStream(Logger* logger, int level, std::string&& cons bool checkLogLevel(int level, int outLevel) { if (level >= outLevel) return true; - if (level == -1 && LL::globalConfig.logLevel >= outLevel) + if (level == -1 && ll::globalConfig.logLevel >= outLevel) return true; return false; } #define H do_hash fmt::text_style getModeColor(string a1) { - if (!LL::globalConfig.colorLog) + if (!ll::globalConfig.colorLog) return fmt::text_style(); switch (H(a1.c_str())) { case H("INFO"): @@ -148,8 +148,8 @@ void Logger::endlImpl(HMODULE hPlugin, OutputStream& o) { auto text = o.os.str(); bool filterBanned = false; // Output Filter - if (LL::globalConfig.enableOutputFilter) - for (auto& regexStr : LL::globalConfig.outputFilterRegex) { + if (ll::globalConfig.enableOutputFilter) + for (auto& regexStr : ll::globalConfig.outputFilterRegex) { try { std::regex re(regexStr); if (std::regex_search(text, re) || std::regex_search(title, re)) { @@ -162,14 +162,14 @@ void Logger::endlImpl(HMODULE hPlugin, OutputStream& o) { if (checkLogLevel(o.logger->consoleLevel, o.level) && !filterBanned) { fmt::print( o.consoleFormat, - applyTextStyle(LL::globalConfig.colorLog ? fg(fmt::color::light_blue) : fmt::text_style(), + applyTextStyle(ll::globalConfig.colorLog ? fg(fmt::color::light_blue) : fmt::text_style(), fmt::format("{:%H:%M:%S}", fmt::localtime(_time64(nullptr)))), applyTextStyle(getModeColor(o.levelPrefix), o.levelPrefix), - applyTextStyle(LL::globalConfig.colorLog ? o.style : fmt::text_style(), title), - applyTextStyle(LL::globalConfig.colorLog ? o.style : fmt::text_style(), text)); + applyTextStyle(ll::globalConfig.colorLog ? o.style : fmt::text_style(), title), + applyTextStyle(ll::globalConfig.colorLog ? o.style : fmt::text_style(), text)); } - if (checkLogLevel(o.logger->fileLevel, o.level) && (LL::globalConfig.onlyFilterConsoleOutput || !filterBanned)) { + if (checkLogLevel(o.logger->fileLevel, o.level) && (ll::globalConfig.onlyFilterConsoleOutput || !filterBanned)) { if (o.logger->ofs.is_open() || PluginOwnData::hasImpl(hPlugin, LOGGER_CURRENT_FILE)) { auto fileContent = fmt::format(o.fileFormat, fmt::localtime(_time64(nullptr)), o.levelPrefix, title, text); if (o.logger->ofs.is_open()) @@ -180,7 +180,7 @@ void Logger::endlImpl(HMODULE hPlugin, OutputStream& o) { } } - if (checkLogLevel(o.logger->playerLevel, o.level) && o.logger->player && Player::isValid(o.logger->player) && (LL::globalConfig.onlyFilterConsoleOutput || !filterBanned)) { + if (checkLogLevel(o.logger->playerLevel, o.level) && o.logger->player && Player::isValid(o.logger->player) && (ll::globalConfig.onlyFilterConsoleOutput || !filterBanned)) { o.logger->player->sendTextPacket( fmt::format(o.playerFormat, fmt::localtime(_time64(nullptr)), o.levelPrefix, title, text)); } diff --git a/LiteLoader/Kernel/ObjectivePacketHelper.cpp b/LiteLoader/src/llapi/ObjectivePacketHelper.cpp similarity index 84% rename from LiteLoader/Kernel/ObjectivePacketHelper.cpp rename to LiteLoader/src/llapi/ObjectivePacketHelper.cpp index f255f12..03adec2 100644 --- a/LiteLoader/Kernel/ObjectivePacketHelper.cpp +++ b/LiteLoader/src/llapi/ObjectivePacketHelper.cpp @@ -1,5 +1,5 @@ #include -#include +#include std::set scoreIds; #define RAND_SCORE_ID() (uint64_t)((rand() << 16) + rand() + 1145140) diff --git a/LiteLoader/src/llapi/ParticleAPI.cpp b/LiteLoader/src/llapi/ParticleAPI.cpp new file mode 100644 index 0000000..d21e4cc --- /dev/null +++ b/LiteLoader/src/llapi/ParticleAPI.cpp @@ -0,0 +1,19 @@ +// +// Created by OEOTYAN on 2022/08/27. +// +#include +#include +#include +#include +#include +#include +#include +#include +//void InitParticle() { +// Event::ResourcePackInitEvent::subscribe([](const Event::ResourcePackInitEvent& ev) { +// ev.mRepo->setCustomResourcePackPath(PackType::PackType_Resources, R"(plugins/LiteLoader/ResourcePacks)"); +// return true; +// }); +//} + +ParticleAPI ParticleCUI::api{}; \ No newline at end of file diff --git a/LiteLoader/src/llapi/PermissionAPI.cpp b/LiteLoader/src/llapi/PermissionAPI.cpp new file mode 100644 index 0000000..a54f31e --- /dev/null +++ b/LiteLoader/src/llapi/PermissionAPI.cpp @@ -0,0 +1,3 @@ +#include + +DynPermissionAPI Permission::api{}; \ No newline at end of file diff --git a/LiteLoader/Kernel/PlayerInfoAPI.cpp b/LiteLoader/src/llapi/PlayerInfoAPI.cpp similarity index 94% rename from LiteLoader/Kernel/PlayerInfoAPI.cpp rename to LiteLoader/src/llapi/PlayerInfoAPI.cpp index 4148b5a..14cef4d 100644 --- a/LiteLoader/Kernel/PlayerInfoAPI.cpp +++ b/LiteLoader/src/llapi/PlayerInfoAPI.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include
-#include +#include +#include +#include +#include +#include +#include #include -#include +#include #define PLAYER_DATABASE_PATH "plugins/LiteLoader/PlayerDB.db" #define SQL_CREATE_PLAYER_TABLE \ diff --git a/LiteLoader/Kernel/RemoteCallAPI.cpp b/LiteLoader/src/llapi/RemoteCallAPI.cpp similarity index 97% rename from LiteLoader/Kernel/RemoteCallAPI.cpp rename to LiteLoader/src/llapi/RemoteCallAPI.cpp index 2fab250..8884cfa 100644 --- a/LiteLoader/Kernel/RemoteCallAPI.cpp +++ b/LiteLoader/src/llapi/RemoteCallAPI.cpp @@ -1,7 +1,7 @@ -#include "RemoteCallAPI.h" -#include -#include -#include +#include +#include +#include +#include extern Logger logger; @@ -41,7 +41,7 @@ bool removeFunc(std::string const& nameSpace, std::string const& funcName) { void _onCallError(std::string const& msg, HMODULE handle) { logger.error(msg); - auto plugin = LL::getPlugin(handle); + auto plugin = ll::getPlugin(handle); if (plugin) logger.error("In plugin <{}>", plugin->name); } diff --git a/LiteLoader/Kernel/ScheduleAPI.cpp b/LiteLoader/src/llapi/ScheduleAPI.cpp similarity index 92% rename from LiteLoader/Kernel/ScheduleAPI.cpp rename to LiteLoader/src/llapi/ScheduleAPI.cpp index 22003d8..4c5af75 100644 --- a/LiteLoader/Kernel/ScheduleAPI.cpp +++ b/LiteLoader/src/llapi/ScheduleAPI.cpp @@ -1,13 +1,13 @@ -#include -#include +#include +#include #include #include -#include
-#include
-#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace std; @@ -147,18 +147,18 @@ public: logger.error("SEH exception occurred in ScheduleTask!"); logger.error("{}", TextEncoding::toUTF8(e.what())); logger.error("TaskId: {}", t.taskId); - if (auto plugin = LL::getPlugin(t.handle)) + if (auto plugin = ll::getPlugin(t.handle)) logger.error("In Plugin: <{} {}>", plugin->name, plugin->version.toString()); } catch (const std::exception& e) { logger.error("Exception occurred in ScheduleTask!"); logger.error("{}", TextEncoding::toUTF8(e.what())); logger.error("TaskId: {}", t.taskId); - if (auto plugin = LL::getPlugin(t.handle)) + if (auto plugin = ll::getPlugin(t.handle)) logger.error("In Plugin: <{} {}>", plugin->name, plugin->version.toString()); } catch (...) { logger.error("Exception occurred in ScheduleTask!"); logger.error("TaskId: {}", t.taskId); - if (auto plugin = LL::getPlugin(t.handle)) + if (auto plugin = ll::getPlugin(t.handle)) logger.error("In Plugin: <{} {}>", plugin->name, plugin->version.toString()); } pop(); @@ -181,7 +181,7 @@ ScheduleTaskQueueType taskQueue; namespace Schedule { ScheduleTask delay(std::function task, unsigned long long tickDelay, HMODULE handle) { - if (LL::globalConfig.serverStatus >= LL::LLServerStatus::Stopping) + if (ll::globalConfig.serverStatus >= ll::LLServerStatus::Stopping) return ScheduleTask((unsigned)-1); ScheduleTaskData sche(ScheduleTaskData::TaskType::Delay, task, tickDelay, -1, -1, handle); locker.lock(); @@ -191,7 +191,7 @@ ScheduleTask delay(std::function task, unsigned long long tickDelay, } ScheduleTask repeat(std::function task, unsigned long long tickRepeat, int maxCount, HMODULE handle) { - if (LL::globalConfig.serverStatus >= LL::LLServerStatus::Stopping) + if (ll::globalConfig.serverStatus >= ll::LLServerStatus::Stopping) return ScheduleTask((unsigned)-1); ScheduleTaskData::TaskType type = maxCount < 0 ? ScheduleTaskData::TaskType::InfiniteRepeat : ScheduleTaskData::TaskType::Repeat; @@ -204,7 +204,7 @@ ScheduleTask repeat(std::function task, unsigned long long tickRepea ScheduleTask delayRepeat(std::function task, unsigned long long tickDelay, unsigned long long tickRepeat, int maxCount, HMODULE handle) { - if (LL::globalConfig.serverStatus >= LL::LLServerStatus::Stopping) + if (ll::globalConfig.serverStatus >= ll::LLServerStatus::Stopping) return ScheduleTask((unsigned)-1); ScheduleTaskData::TaskType type = maxCount < 0 ? ScheduleTaskData::TaskType::InfiniteRepeat : ScheduleTaskData::TaskType::Repeat; @@ -216,7 +216,7 @@ ScheduleTask delayRepeat(std::function task, unsigned long long tick } ScheduleTask nextTick(std::function task, HMODULE handle) { - if (LL::globalConfig.serverStatus >= LL::LLServerStatus::Stopping) + if (ll::globalConfig.serverStatus >= ll::LLServerStatus::Stopping) return ScheduleTask((unsigned)-1); ScheduleTaskData sche(ScheduleTaskData::TaskType::Delay, task, 1, -1, -1, handle); locker.lock(); diff --git a/LiteLoader/Kernel/ServerAPI.cpp b/LiteLoader/src/llapi/ServerAPI.cpp similarity index 66% rename from LiteLoader/Kernel/ServerAPI.cpp rename to LiteLoader/src/llapi/ServerAPI.cpp index cab0be7..74b8506 100644 --- a/LiteLoader/Kernel/ServerAPI.cpp +++ b/LiteLoader/src/llapi/ServerAPI.cpp @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class UserEntityIdentifierComponent; -namespace LL { +namespace ll { std::string getBdsVersion() { return Common::getGameVersionString(); } @@ -22,4 +22,4 @@ bool setServerMotd(const std::string& motd) { Global->allowIncomingConnections(motd, true); return true; } -} // namespace LL +} // namespace ll diff --git a/LiteLoader/Kernel/Command/CommandOriginAPI.cpp b/LiteLoader/src/llapi/command/CommandOriginAPI.cpp similarity index 73% rename from LiteLoader/Kernel/Command/CommandOriginAPI.cpp rename to LiteLoader/src/llapi/command/CommandOriginAPI.cpp index 92a03d7..41a221f 100644 --- a/LiteLoader/Kernel/Command/CommandOriginAPI.cpp +++ b/LiteLoader/src/llapi/command/CommandOriginAPI.cpp @@ -1,6 +1,6 @@ - #include - #include -#include "MC/CompoundTag.hpp" +#include +#include +#include ServerPlayer* CommandOrigin::getPlayer() const { Actor* origin = getEntity(); diff --git a/LiteLoader/src/llapi/command/CommandOutputAPI.cpp b/LiteLoader/src/llapi/command/CommandOutputAPI.cpp new file mode 100644 index 0000000..6631989 --- /dev/null +++ b/LiteLoader/src/llapi/command/CommandOutputAPI.cpp @@ -0,0 +1,13 @@ +#include + +void CommandOutput::addMessage(const std::string& str) { + this->addMessage(str, {}, (CommandOutputMessageType)0); +} + +void CommandOutput::success(const std::string& str) { + this->success(str, {}); +} + +void CommandOutput::error(const std::string& str) { + this->error(str, {}); +} \ No newline at end of file diff --git a/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp b/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp similarity index 97% rename from LiteLoader/Kernel/Command/CommandRegistryAPI.cpp rename to LiteLoader/src/llapi/command/CommandRegistryAPI.cpp index 3d30beb..7e0ab78 100644 --- a/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp +++ b/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp @@ -1,10 +1,10 @@ #define COMMAND_REGISTRY_EXTRA - #include - #include - #include + #include + #include + #include #include - #include - #include + #include + #include static_assert(offsetof(CommandParameterData, options) == 73); static_assert(offsetof(CommandParameterData, name) == 16); static_assert(offsetof(CommandParameterData, unk56) == 56); @@ -91,9 +91,9 @@ return ""; } - #include
+ #include bool CommandRegistry::unregisterCommand(std::string const& name) { - if (!LL::globalConfig.debugMode) { + if (!ll::globalConfig.debugMode) { logger.error("unregister command is only enabled in debug mode"); return false; } diff --git a/LiteLoader/Kernel/Command/DynamicCommandAPI.cpp b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp similarity index 98% rename from LiteLoader/Kernel/Command/DynamicCommandAPI.cpp rename to LiteLoader/src/llapi/command/DynamicCommandAPI.cpp index b1172d0..874eb0f 100644 --- a/LiteLoader/Kernel/Command/DynamicCommandAPI.cpp +++ b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp @@ -1,24 +1,25 @@  //#define COMMAND_REGISTRY_EXTRA - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include #include - #include - #include + #include + #include + #include extern Logger logger; @@ -126,7 +127,7 @@ logger.error(errorMsg); logger.error("Error: Code [{}] {}", errorCode, errorWhat); logger.error("In Function ({})", func); - if (auto plugin = LL::getPlugin(handle)) + if (auto plugin = ll::getPlugin(handle)) logger.error("In Plugin <{}>", plugin->name); } @@ -536,7 +537,7 @@ std::string name = command->getCommandName(); auto handle = command->handle; try { - if (!LL::getPlugin(handle) && handle != GetCurrentModule()) + if (!ll::getPlugin(handle) && handle != GetCurrentModule()) throw std::runtime_error("Plugin that registered command \"" + name + "\" not found"); auto res = DynamicCommand::_setup(std::move(command)); if (!res) @@ -594,9 +595,9 @@ std::unique_ptr DynamicCommand::createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission, CommandFlag flag1, CommandFlag flag2, HMODULE handle) { return DynamicCommandInstance::create(name, description, permission, flag1 |= flag2, handle); } - #include - #include - #include
+ #include + #include + #include DynamicCommandInstance const* DynamicCommand::setup(std::unique_ptr commandInstance) { auto ptr = commandInstance.get(); @@ -697,7 +698,7 @@ } inline std::unique_ptr DynamicCommandInstance::create(std::string const& name, std::string const& description, CommandPermissionLevel permission, CommandFlag flag, HMODULE handle) { - if (LL::globalConfig.serverStatus != LL::LLServerStatus::Running) { + if (ll::globalConfig.serverStatus != ll::LLServerStatus::Running) { for (auto& cmd : delaySetupCommandInstances) { if (cmd->name == name) { logger.error("Command \"{}\" already exists", name); @@ -962,9 +963,9 @@ #ifdef TEST_DYNAMIC_COMMAND - #include - #include - #include + #include + #include + #include void setupTestParamCommand() { using Param = DynamicCommand::ParameterData; @@ -1278,7 +1279,7 @@ TClasslessInstanceHook(void, "?compile@BaseCommandBlock@@AEAAXAEBVCommandOrigin@@AEAVLevel@@@Z", class CommandOrigin const& origin, class Level& level) { - if (LL::globalConfig.tickThreadId != std::this_thread::get_id()) { + if (ll::globalConfig.tickThreadId != std::this_thread::get_id()) { SRWLockSharedHolder locker(delaySetupLock); return original(this, origin, level); } diff --git a/LiteLoader/Kernel/DB/Any.cpp b/LiteLoader/src/llapi/db/Any.cpp similarity index 99% rename from LiteLoader/Kernel/DB/Any.cpp rename to LiteLoader/src/llapi/db/Any.cpp index 18febd9..ce3927f 100644 --- a/LiteLoader/Kernel/DB/Any.cpp +++ b/LiteLoader/src/llapi/db/Any.cpp @@ -1,4 +1,4 @@ -#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/ConnParams.cpp b/LiteLoader/src/llapi/db/ConnParams.cpp similarity index 98% rename from LiteLoader/Kernel/DB/ConnParams.cpp rename to LiteLoader/src/llapi/db/ConnParams.cpp index ba17982..9c5d971 100644 --- a/LiteLoader/Kernel/DB/ConnParams.cpp +++ b/LiteLoader/src/llapi/db/ConnParams.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/Impl/MySQL/Session.cpp b/LiteLoader/src/llapi/db/Impl/MySQL/Session.cpp similarity index 98% rename from LiteLoader/Kernel/DB/Impl/MySQL/Session.cpp rename to LiteLoader/src/llapi/db/Impl/MySQL/Session.cpp index 50a0353..e156fbd 100644 --- a/LiteLoader/Kernel/DB/Impl/MySQL/Session.cpp +++ b/LiteLoader/src/llapi/db/Impl/MySQL/Session.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #define OK 0 namespace DB { diff --git a/LiteLoader/Kernel/DB/Impl/MySQL/Stmt.cpp b/LiteLoader/src/llapi/db/Impl/MySQL/Stmt.cpp similarity index 99% rename from LiteLoader/Kernel/DB/Impl/MySQL/Stmt.cpp rename to LiteLoader/src/llapi/db/Impl/MySQL/Stmt.cpp index d610ab2..53d9c74 100644 --- a/LiteLoader/Kernel/DB/Impl/MySQL/Stmt.cpp +++ b/LiteLoader/src/llapi/db/Impl/MySQL/Stmt.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define Wptr2MySQLSession(x) ((MySQLSession*)x.lock().get()) #pragma warning(disable : 4267) #pragma warning(disable : 26812) diff --git a/LiteLoader/Kernel/DB/Impl/SQLite/Session.cpp b/LiteLoader/src/llapi/db/Impl/SQLite/Session.cpp similarity index 96% rename from LiteLoader/Kernel/DB/Impl/SQLite/Session.cpp rename to LiteLoader/src/llapi/db/Impl/SQLite/Session.cpp index 0848d67..adf51aa 100644 --- a/LiteLoader/Kernel/DB/Impl/SQLite/Session.cpp +++ b/LiteLoader/src/llapi/db/Impl/SQLite/Session.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/Impl/SQLite/Stmt.cpp b/LiteLoader/src/llapi/db/Impl/SQLite/Stmt.cpp similarity index 98% rename from LiteLoader/Kernel/DB/Impl/SQLite/Stmt.cpp rename to LiteLoader/src/llapi/db/Impl/SQLite/Stmt.cpp index 6fb7968..83eb69e 100644 --- a/LiteLoader/Kernel/DB/Impl/SQLite/Stmt.cpp +++ b/LiteLoader/src/llapi/db/Impl/SQLite/Stmt.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/Row.cpp b/LiteLoader/src/llapi/db/Row.cpp similarity index 99% rename from LiteLoader/Kernel/DB/Row.cpp rename to LiteLoader/src/llapi/db/Row.cpp index d8a3268..ebcba6f 100644 --- a/LiteLoader/Kernel/DB/Row.cpp +++ b/LiteLoader/src/llapi/db/Row.cpp @@ -1,4 +1,4 @@ -#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/RowSet.cpp b/LiteLoader/src/llapi/db/RowSet.cpp similarity index 98% rename from LiteLoader/Kernel/DB/RowSet.cpp rename to LiteLoader/src/llapi/db/RowSet.cpp index 2482859..2bd6377 100644 --- a/LiteLoader/Kernel/DB/RowSet.cpp +++ b/LiteLoader/src/llapi/db/RowSet.cpp @@ -1,4 +1,4 @@ -#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/Session.cpp b/LiteLoader/src/llapi/db/Session.cpp similarity index 95% rename from LiteLoader/Kernel/DB/Session.cpp rename to LiteLoader/src/llapi/db/Session.cpp index 979dfa7..a0a59e4 100644 --- a/LiteLoader/Kernel/DB/Session.cpp +++ b/LiteLoader/src/llapi/db/Session.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include namespace DB { diff --git a/LiteLoader/Kernel/DB/Stmt.cpp b/LiteLoader/src/llapi/db/Stmt.cpp similarity index 94% rename from LiteLoader/Kernel/DB/Stmt.cpp rename to LiteLoader/src/llapi/db/Stmt.cpp index 7ab2124..8ce95f8 100644 --- a/LiteLoader/Kernel/DB/Stmt.cpp +++ b/LiteLoader/src/llapi/db/Stmt.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace DB { diff --git a/LiteLoader/Kernel/MC/ActorAPI.cpp b/LiteLoader/src/llapi/mc/ActorAPI.cpp similarity index 88% rename from LiteLoader/Kernel/MC/ActorAPI.cpp rename to LiteLoader/src/llapi/mc/ActorAPI.cpp index d118d00..9c17b2f 100644 --- a/LiteLoader/Kernel/MC/ActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/ActorAPI.cpp @@ -1,31 +1,32 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -//#include -#include -//#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +//#include +#include +//#include +#include +#include +#include +#include // class UserEntityIdentifierComponent; diff --git a/LiteLoader/Kernel/MC/ActorDamageSource.cpp b/LiteLoader/src/llapi/mc/ActorDamageSource.cpp similarity index 64% rename from LiteLoader/Kernel/MC/ActorDamageSource.cpp rename to LiteLoader/src/llapi/mc/ActorDamageSource.cpp index ef5fa28..35960f7 100644 --- a/LiteLoader/Kernel/MC/ActorDamageSource.cpp +++ b/LiteLoader/src/llapi/mc/ActorDamageSource.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include Actor* ActorDamageSource::getEntity() { ActorUniqueID v6 = getDamagingEntityUniqueID(); diff --git a/LiteLoader/Kernel/MC/BiomeAPI.cpp b/LiteLoader/src/llapi/mc/BiomeAPI.cpp similarity index 89% rename from LiteLoader/Kernel/MC/BiomeAPI.cpp rename to LiteLoader/src/llapi/mc/BiomeAPI.cpp index b9a64bc..33c1cd7 100644 --- a/LiteLoader/Kernel/MC/BiomeAPI.cpp +++ b/LiteLoader/src/llapi/mc/BiomeAPI.cpp @@ -1,7 +1,8 @@ -#include -#include -#include -#include +#include +#include +#include +#include +#include int Biome::getId() const { return dAccess(this); @@ -34,7 +35,7 @@ std::vector Biome::getBiomesByType(VanillaBiomeTypes type) { #ifdef DEBUG #include -#include +#include extern Logger logger; TClasslessInstanceHook2("startServerThread_TestBiome", void, "?startServerThread@ServerInstance@@QEAAXXZ") { diff --git a/LiteLoader/Kernel/MC/BlockAPI.cpp b/LiteLoader/src/llapi/mc/BlockAPI.cpp similarity index 78% rename from LiteLoader/Kernel/MC/BlockAPI.cpp rename to LiteLoader/src/llapi/mc/BlockAPI.cpp index 7b26eed..955947f 100644 --- a/LiteLoader/Kernel/MC/BlockAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockAPI.cpp @@ -1,12 +1,13 @@ -#include -#include
-#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Block* Block::create(const string& name, unsigned short tileData) { BlockPalette* generator = Global->getBlockPalettePtr(); @@ -63,5 +64,5 @@ bool Block::setNbt(CompoundTag* nbt) { unsigned int const & Block::getRuntimeId() const{ // Actor::_playFlySound Line7 - return dAccess(this, 12); + return dAccess(this, 48); } \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/BlockActorAPI.cpp b/LiteLoader/src/llapi/mc/BlockActorAPI.cpp similarity index 67% rename from LiteLoader/Kernel/MC/BlockActorAPI.cpp rename to LiteLoader/src/llapi/mc/BlockActorAPI.cpp index ced2fd3..3fefec1 100644 --- a/LiteLoader/Kernel/MC/BlockActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockActorAPI.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include unsigned int BlockActor::getBlockEntityType(Block* block) { - return block->getBlockEntityType(); // IDA Block::getBlockEntityType + return (unsigned int)block->getBlockEntityType(); // IDA Block::getBlockEntityType } bool BlockActor::refreshData() { diff --git a/LiteLoader/Kernel/MC/BlockInstanceAPI.cpp b/LiteLoader/src/llapi/mc/BlockInstanceAPI.cpp similarity index 84% rename from LiteLoader/Kernel/MC/BlockInstanceAPI.cpp rename to LiteLoader/src/llapi/mc/BlockInstanceAPI.cpp index b507f74..601326d 100644 --- a/LiteLoader/Kernel/MC/BlockInstanceAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockInstanceAPI.cpp @@ -1,15 +1,16 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include BlockInstance::BlockInstance(Block* block, BlockPos pos, int dimID) : block(block) @@ -103,5 +104,5 @@ bool BlockInstance::isNull() { return *this == BlockInstance::Null; } -#include +#include const BlockInstance BlockInstance::Null = BlockInstance(nullptr, BlockPos::MIN, VanillaDimensions::Undefined); diff --git a/LiteLoader/Kernel/MC/BlockLegacyAPI.cpp b/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp similarity index 81% rename from LiteLoader/Kernel/MC/BlockLegacyAPI.cpp rename to LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp index c2bf103..206f68b 100644 --- a/LiteLoader/Kernel/MC/BlockLegacyAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp @@ -1,7 +1,9 @@ -#include -#include -#include -#include +#include +#include +#include +#include +#include + Block* BlockLegacy::toBlock(unsigned short tileData) { auto* bl = (Block*)&getStateFromLegacyData(tileData); // 某些方块在 tileData 太大时会变成其他方块，原版 /setblock 指令就存在这个问题（也有可能是被设计成这样的？） diff --git a/LiteLoader/Kernel/MC/BlockSourceAPI.cpp b/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp similarity index 60% rename from LiteLoader/Kernel/MC/BlockSourceAPI.cpp rename to LiteLoader/src/llapi/mc/BlockSourceAPI.cpp index 8165a03..d1e1e11 100644 --- a/LiteLoader/Kernel/MC/BlockSourceAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include BlockInstance BlockSource::getBlockInstance(BlockPos a1) { return BlockInstance{const_cast(&getBlock(a1)), a1, this->getDimensionId()}; diff --git a/LiteLoader/Kernel/MC/ColorFormatAPI.cpp b/LiteLoader/src/llapi/mc/ColorFormatAPI.cpp similarity index 99% rename from LiteLoader/Kernel/MC/ColorFormatAPI.cpp rename to LiteLoader/src/llapi/mc/ColorFormatAPI.cpp index e783dd8..9781492 100644 --- a/LiteLoader/Kernel/MC/ColorFormatAPI.cpp +++ b/LiteLoader/src/llapi/mc/ColorFormatAPI.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include extern Logger logger; -#include +#include namespace ColorFormat { std::unordered_map const colorCodeToConsoleMap = { {"§0", "\x1b[38;2;000;000;000m"}, // BLACK diff --git a/LiteLoader/Kernel/MC/ContainerAPI.cpp b/LiteLoader/src/llapi/mc/ContainerAPI.cpp similarity index 88% rename from LiteLoader/Kernel/MC/ContainerAPI.cpp rename to LiteLoader/src/llapi/mc/ContainerAPI.cpp index 8573eca..1ab210b 100644 --- a/LiteLoader/Kernel/MC/ContainerAPI.cpp +++ b/LiteLoader/src/llapi/mc/ContainerAPI.cpp @@ -1,8 +1,9 @@ -#include -#include -#include -#include -#include "third-party/magic_enum/magic_enum.hpp" +#include +#include +#include +#include +#include +#include LIAPI std::string Container::getTypeName() { ContainerType type = dAccess(this, 8); //IDA Container::Container diff --git a/LiteLoader/src/llapi/mc/GameModeAPI.cpp b/LiteLoader/src/llapi/mc/GameModeAPI.cpp new file mode 100644 index 0000000..3172ffd --- /dev/null +++ b/LiteLoader/src/llapi/mc/GameModeAPI.cpp @@ -0,0 +1,7 @@ +#include +#include +#include + +ServerPlayer* GameMode::getPlayer() { + return dAccess(this); +} \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/HitResultAPI.cpp b/LiteLoader/src/llapi/mc/HitResultAPI.cpp similarity index 90% rename from LiteLoader/Kernel/MC/HitResultAPI.cpp rename to LiteLoader/src/llapi/mc/HitResultAPI.cpp index cd819bf..de0ffca 100644 --- a/LiteLoader/Kernel/MC/HitResultAPI.cpp +++ b/LiteLoader/src/llapi/mc/HitResultAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include FaceID HitResult::getFacing() { return dAccess(this, 28); diff --git a/LiteLoader/Kernel/MC/I18nAPI.cpp b/LiteLoader/src/llapi/mc/I18nAPI.cpp similarity index 83% rename from LiteLoader/Kernel/MC/I18nAPI.cpp rename to LiteLoader/src/llapi/mc/I18nAPI.cpp index bc8f60e..dcb1082 100644 --- a/LiteLoader/Kernel/MC/I18nAPI.cpp +++ b/LiteLoader/src/llapi/mc/I18nAPI.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include Localization const* I18n::getLanguage(std::string const& languageCode) { auto loc = _findLocaleFor(languageCode); diff --git a/LiteLoader/Kernel/MC/ItemActorAPI.cpp b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp similarity index 52% rename from LiteLoader/Kernel/MC/ItemActorAPI.cpp rename to LiteLoader/src/llapi/mc/ItemActorAPI.cpp index 1497044..5b1bc5c 100644 --- a/LiteLoader/Kernel/MC/ItemActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp @@ -1,19 +1,20 @@ -#include "Global.h" -#include +#include +#include +#include ItemStack* ItemActor::getItemStack() { return (ItemStack*)((uintptr_t)this + 1568); // IDA Player::take Line127 } int ItemActor::getDespawnTime() { - return dAccess(this); // ItemActor::NormalTick Line258 + return dAccess(this); // ItemActor::NormalTick Line258 } bool ItemActor::setDespawnTime(int a1) { - dAccess(this) = a1; + dAccess(this) = a1; return true; } int ItemActor::getLatestSpawnTime() { - return dAccess(this); + return dAccess(this); } \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/ItemStackAPI.cpp b/LiteLoader/src/llapi/mc/ItemStackAPI.cpp similarity index 87% rename from LiteLoader/Kernel/MC/ItemStackAPI.cpp rename to LiteLoader/src/llapi/mc/ItemStackAPI.cpp index 32eadbe..7d8d437 100644 --- a/LiteLoader/Kernel/MC/ItemStackAPI.cpp +++ b/LiteLoader/src/llapi/mc/ItemStackAPI.cpp @@ -1,12 +1,13 @@ -#include "Global.h" -#include "MC/Item.hpp" -#include "MC/ItemStack.hpp" -#include "MC/Spawner.hpp" -#include "MC/Level.hpp" -#include "MC/ItemInstance.hpp" -#include "MC/I18n.hpp" -#include "MC/PropertiesSettings.hpp" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -32,7 +33,7 @@ ItemStack* ItemStack::create(std::unique_ptr tag) { return item; } -#include +#include ItemStack* ItemStack::create(short itemId, int aux, int count) { auto item = ItemRegistry::getItem(itemId); if (item) diff --git a/LiteLoader/Kernel/MC/JsonHelpers.cpp b/LiteLoader/src/llapi/mc/JsonHelpers.cpp similarity index 90% rename from LiteLoader/Kernel/MC/JsonHelpers.cpp rename to LiteLoader/src/llapi/mc/JsonHelpers.cpp index e22018a..6c93fa1 100644 --- a/LiteLoader/Kernel/MC/JsonHelpers.cpp +++ b/LiteLoader/src/llapi/mc/JsonHelpers.cpp @@ -1,7 +1,7 @@ // // Created by User on 2022/10/29. // -#include "MC/JsonHelpers.hpp" +#include bool JsonHelpers::parseJson(std::string const &str, class Json::Value &value){ auto jsonRead = new Json::Reader(); diff --git a/LiteLoader/Kernel/MC/LevelAPI.cpp b/LiteLoader/src/llapi/mc/LevelAPI.cpp similarity index 93% rename from LiteLoader/Kernel/MC/LevelAPI.cpp rename to LiteLoader/src/llapi/mc/LevelAPI.cpp index 84237a8..94f0b63 100644 --- a/LiteLoader/Kernel/MC/LevelAPI.cpp +++ b/LiteLoader/src/llapi/mc/LevelAPI.cpp @@ -1,29 +1,30 @@ -#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Actor* Level::getEntity(ActorUniqueID uniqueId) { @@ -341,7 +342,7 @@ bool Level::createExplosion(Vec3 pos, int dimId, Actor* source, float radius, bo return true; } -#include +#include ItemStack* Level::getItemStackFromId(short itemId, int aux) { auto item = ItemRegistry::getItem(itemId); if (item) diff --git a/LiteLoader/src/llapi/mc/MobAPI.cpp b/LiteLoader/src/llapi/mc/MobAPI.cpp new file mode 100644 index 0000000..2e281e7 --- /dev/null +++ b/LiteLoader/src/llapi/mc/MobAPI.cpp @@ -0,0 +1,13 @@ +//#include "MobAPI.h" +#include +#include +#include +#include +#include + +bool Mob::refreshInventory() { + sendInventory(true); + std::bitset<4> bits("1111"); + sendArmor(bits); + return true; +} diff --git a/LiteLoader/Kernel/MC/MolangAPI.cpp b/LiteLoader/src/llapi/mc/MolangAPI.cpp similarity index 100% rename from LiteLoader/Kernel/MC/MolangAPI.cpp rename to LiteLoader/src/llapi/mc/MolangAPI.cpp diff --git a/LiteLoader/Kernel/MC/NetworkIdentifierAPI.cpp b/LiteLoader/src/llapi/mc/NetworkIdentifierAPI.cpp similarity index 71% rename from LiteLoader/Kernel/MC/NetworkIdentifierAPI.cpp rename to LiteLoader/src/llapi/mc/NetworkIdentifierAPI.cpp index d61003b..f77b851 100644 --- a/LiteLoader/Kernel/MC/NetworkIdentifierAPI.cpp +++ b/LiteLoader/src/llapi/mc/NetworkIdentifierAPI.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include string NetworkIdentifier::getIP() { string rv =getAddress(); diff --git a/LiteLoader/Kernel/MC/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp similarity index 93% rename from LiteLoader/Kernel/MC/PlayerAPI.cpp rename to LiteLoader/src/llapi/mc/PlayerAPI.cpp index 0cc27cf..682cdd9 100644 --- a/LiteLoader/Kernel/MC/PlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp @@ -1,46 +1,47 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -//#include +#include +#include +#include +#include +//#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include +#include #include -//#include -//#include -//#include +//#include +//#include +//#include extern Logger logger; @@ -71,7 +72,7 @@ string Player::getIP() { return getNetworkIdentifier()->getIP(); } -#include +#include string Player::getLanguageCode() { // auto map = Global->fetchConnectionRequest(*getNetworkIdentifier()).mRawToken.get()->mDataInfo.value_.map_; // for (auto& iter : *map) { @@ -98,7 +99,7 @@ string Player::getServerAddress() { int Player::getPlatform(){ //AddPlayerPacket::AddPlayerPacket Line59 - return dAccess(this, 256); + return dAccess(this, 2104); } Container & Player::getInventory(){ @@ -247,9 +248,9 @@ bool Player::runcmd(const string& cmd) { return sendCommandRequestPacket(cmd); } -// Container* Player::getEnderChestContainer() { -// return dAccess(this, 4032); // IDA Player::Player() Line239 -// } +//Container* Player::getEnderChestContainer() { +// return dAccess(this, 4032); // IDA Player::Player() Line239 +//} bool Player::transferServer(const string& address, unsigned short port) { return sendTransferPacket(address, port); @@ -257,12 +258,12 @@ bool Player::transferServer(const string& address, unsigned short port) { BlockPos const & Player::getSpawnPosition(){ //ServerNetworkHandler::_sendLevelData Line316 - return dAccess(this, 1797); + return dAccess(this, 1797*4); } AutomaticID Player::getSpawnDimension(){ //ServerNetworkHandler::_sendLevelData Line310 - return dAccess>(this, 1800); + return dAccess>(this, 1800*4); } std::pair Player::getRespawnPosition() { @@ -285,10 +286,10 @@ bool Player::setNbt(CompoundTag* nbt) { nbt->setPlayer(this); return true; } -#include -#include -#include -#include +#include +#include +#include +#include bool Player::refreshAttribute(class Attribute const& attribute) { return refreshAttributes({&attribute}); } @@ -619,7 +620,7 @@ bool Player::sendPlaySoundPacket(string SoundName, Vec3 Position, float Volume, return true; } -#include +#include // bool Player::sendAddItemEntityPacket(unsigned long long runtimeID, Item const& item, int stackSize, short aux, Vec3 pos, vector> dataItems) const { // BinaryStream wp; // wp.writeVarInt64(runtimeID); // RuntimeId @@ -757,7 +758,7 @@ bool Player::sendCommandRequestPacket(const string& cmd) { bool Player::sendTextTalkPacket(const string& msg) { return sendTextTalkPacket(msg, nullptr); } -#include +#include bool Player::sendTextTalkPacket(const string& msg, Player* target) { auto packet = TextPacket::createChat(getName(), msg, getXuid(), ""); if (target == nullptr) { diff --git a/LiteLoader/src/llapi/mc/ResourcePackRepositoryAPI.cpp b/LiteLoader/src/llapi/mc/ResourcePackRepositoryAPI.cpp new file mode 100644 index 0000000..aee1a14 --- /dev/null +++ b/LiteLoader/src/llapi/mc/ResourcePackRepositoryAPI.cpp @@ -0,0 +1,14 @@ +#include +#include +#include +#include +#include +#include + + void ResourcePackRepository::setCustomResourcePackPath(PackType type, const std::string& path) { + auto CompositePack = dAccess(this, 48); + auto PackSourceFactory = getPackSourceFactory(); + auto& DirectoryPackSource = PackSourceFactory->createDirectoryPackSource(Core::Path(path), type, PackOrigin::PackOrigin_Dev, 0); + CompositePack->addPackSource((PackSource*)&DirectoryPackSource); + refreshPacks(); + } \ No newline at end of file diff --git a/LiteLoader/Kernel/MC/SpawnerAPI.cpp b/LiteLoader/src/llapi/mc/SpawnerAPI.cpp similarity index 76% rename from LiteLoader/Kernel/MC/SpawnerAPI.cpp rename to LiteLoader/src/llapi/mc/SpawnerAPI.cpp index 55011b1..46446e9 100644 --- a/LiteLoader/Kernel/MC/SpawnerAPI.cpp +++ b/LiteLoader/src/llapi/mc/SpawnerAPI.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include Mob* Spawner::spawnMob(Vec3& pos, int dim, std::string name) { try { diff --git a/LiteLoader/Kernel/MC/StaticVanillaBlocksAPI.cpp b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp similarity index 100% rename from LiteLoader/Kernel/MC/StaticVanillaBlocksAPI.cpp rename to LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp diff --git a/LiteLoader/Kernel/MC/StructureTemplateAPI.cpp b/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp similarity index 86% rename from LiteLoader/Kernel/MC/StructureTemplateAPI.cpp rename to LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp index 0f7f598..ddb4ead 100644 --- a/LiteLoader/Kernel/MC/StructureTemplateAPI.cpp +++ b/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include StructureTemplate StructureTemplate::fromTag(std::string name, CompoundTag const& tag) { StructureTemplate st(name); @@ -39,7 +39,7 @@ return st; } - #include + #include bool StructureTemplate::toWorld(int dimID, BlockPos const& p1, Mirror mirror, Rotation rotation) { auto palette = Global->getBlockPalettePtr(); auto bs = Level::getBlockSource(dimID); diff --git a/LiteLoader/Kernel/MC/Types.cpp b/LiteLoader/src/llapi/mc/Types.cpp similarity index 98% rename from LiteLoader/Kernel/MC/Types.cpp rename to LiteLoader/src/llapi/mc/Types.cpp index 859f9b4..403b368 100644 --- a/LiteLoader/Kernel/MC/Types.cpp +++ b/LiteLoader/src/llapi/mc/Types.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include // ChunkBlockPos::ChunkBlockPos(BlockPos const& pos, short minHeight) //{ diff --git a/LiteLoader/Kernel/NBT/ByteArrayTagAPI.cpp b/LiteLoader/src/llapi/nbt/ByteArrayTagAPI.cpp similarity index 93% rename from LiteLoader/Kernel/NBT/ByteArrayTagAPI.cpp rename to LiteLoader/src/llapi/nbt/ByteArrayTagAPI.cpp index a9eeea4..73a8904 100644 --- a/LiteLoader/Kernel/NBT/ByteArrayTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/ByteArrayTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include TagMemoryChunk& ByteArrayTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/ByteTagAPI.cpp b/LiteLoader/src/llapi/nbt/ByteTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/ByteTagAPI.cpp rename to LiteLoader/src/llapi/nbt/ByteTagAPI.cpp index 8895007..ccf1b4c 100644 --- a/LiteLoader/Kernel/NBT/ByteTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/ByteTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include unsigned char& ByteTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/CompoundTagAPI.cpp b/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp similarity index 98% rename from LiteLoader/Kernel/NBT/CompoundTagAPI.cpp rename to LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp index c0615d3..8192d79 100644 --- a/LiteLoader/Kernel/NBT/CompoundTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp @@ -1,25 +1,25 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -194,7 +194,7 @@ std::unique_ptr CompoundTag::fromBlockActor(BlockActor* blockActor) using namespace nbt; using namespace std; -#include +#include extern Logger logger; inline void OutputNBTError(std::string const& errorMsg, int errorCode, std::string errorWhat, std::string const& functionName) { @@ -336,7 +336,7 @@ std::vector> CompoundTag::nbtListFromBinary(std::st #pragma region To Network NBT //////////////////// To Network //////////////////// -#include +#include std::string CompoundTag::toNetworkNBT() const { BinaryStream bs; bs.writeCompoundTag(*this); @@ -1158,7 +1158,7 @@ string CompoundTag::toSNBT(int indent, SnbtFormat snbtFormat) { #pragma endregion #pragma region To Pretty SNBT -#include +#include void __appendPrettyString(std::ostringstream& oss, std::string const& str, PrettySnbtFormat const& format) { for (auto& c : str) { diff --git a/LiteLoader/Kernel/NBT/DoubleTagAPI.cpp b/LiteLoader/src/llapi/nbt/DoubleTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/DoubleTagAPI.cpp rename to LiteLoader/src/llapi/nbt/DoubleTagAPI.cpp index 18ed171..727c524 100644 --- a/LiteLoader/Kernel/NBT/DoubleTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/DoubleTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include double& DoubleTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/EndTagAPI.cpp b/LiteLoader/src/llapi/nbt/EndTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/EndTagAPI.cpp rename to LiteLoader/src/llapi/nbt/EndTagAPI.cpp index 68a46fd..55a4c88 100644 --- a/LiteLoader/Kernel/NBT/EndTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/EndTagAPI.cpp @@ -1,4 +1,4 @@ -#include +#include nullptr_t EndTag::value() { return nullptr; diff --git a/LiteLoader/Kernel/NBT/FloatTagAPI.cpp b/LiteLoader/src/llapi/nbt/FloatTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/FloatTagAPI.cpp rename to LiteLoader/src/llapi/nbt/FloatTagAPI.cpp index 71cf126..a31185a 100644 --- a/LiteLoader/Kernel/NBT/FloatTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/FloatTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include float& FloatTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/Int64TagAPI.cpp b/LiteLoader/src/llapi/nbt/Int64TagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/Int64TagAPI.cpp rename to LiteLoader/src/llapi/nbt/Int64TagAPI.cpp index 5346f2a..441e023 100644 --- a/LiteLoader/Kernel/NBT/Int64TagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/Int64TagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include int64_t& Int64Tag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/IntArrayTagAPI.cpp b/LiteLoader/src/llapi/nbt/IntArrayTagAPI.cpp similarity index 93% rename from LiteLoader/Kernel/NBT/IntArrayTagAPI.cpp rename to LiteLoader/src/llapi/nbt/IntArrayTagAPI.cpp index 14c764a..bd92c70 100644 --- a/LiteLoader/Kernel/NBT/IntArrayTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/IntArrayTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include TagMemoryChunk& IntArrayTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/IntTagAPI.cpp b/LiteLoader/src/llapi/nbt/IntTagAPI.cpp similarity index 90% rename from LiteLoader/Kernel/NBT/IntTagAPI.cpp rename to LiteLoader/src/llapi/nbt/IntTagAPI.cpp index 8d11ce4..74612ad 100644 --- a/LiteLoader/Kernel/NBT/IntTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/IntTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include int& IntTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/ListTagAPI.cpp b/LiteLoader/src/llapi/nbt/ListTagAPI.cpp similarity index 80% rename from LiteLoader/Kernel/NBT/ListTagAPI.cpp rename to LiteLoader/src/llapi/nbt/ListTagAPI.cpp index b30eb1f..b0cf358 100644 --- a/LiteLoader/Kernel/NBT/ListTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/ListTagAPI.cpp @@ -1,17 +1,18 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include std::unique_ptr ListTag::create() { return std::unique_ptr((ListTag*)Tag::newTag(Tag::Type::List).release()); diff --git a/LiteLoader/Kernel/NBT/PrettySnbtFormatAPI.cpp b/LiteLoader/src/llapi/nbt/PrettySnbtFormatAPI.cpp similarity index 99% rename from LiteLoader/Kernel/NBT/PrettySnbtFormatAPI.cpp rename to LiteLoader/src/llapi/nbt/PrettySnbtFormatAPI.cpp index b2c5ea5..2c53487 100644 --- a/LiteLoader/Kernel/NBT/PrettySnbtFormatAPI.cpp +++ b/LiteLoader/src/llapi/nbt/PrettySnbtFormatAPI.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #define ForEachTagType(op) \ op(Tag::Type::End); \ diff --git a/LiteLoader/Kernel/NBT/ShortTagAPI.cpp b/LiteLoader/src/llapi/nbt/ShortTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/ShortTagAPI.cpp rename to LiteLoader/src/llapi/nbt/ShortTagAPI.cpp index b0ac72b..f824382 100644 --- a/LiteLoader/Kernel/NBT/ShortTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/ShortTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include short& ShortTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/StringTagAPI.cpp b/LiteLoader/src/llapi/nbt/StringTagAPI.cpp similarity index 91% rename from LiteLoader/Kernel/NBT/StringTagAPI.cpp rename to LiteLoader/src/llapi/nbt/StringTagAPI.cpp index 9339005..c107a3b 100644 --- a/LiteLoader/Kernel/NBT/StringTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/StringTagAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include std::string& StringTag::value() { return dAccess(this); diff --git a/LiteLoader/Kernel/NBT/TagAPI.cpp b/LiteLoader/src/llapi/nbt/TagAPI.cpp similarity index 94% rename from LiteLoader/Kernel/NBT/TagAPI.cpp rename to LiteLoader/src/llapi/nbt/TagAPI.cpp index 73ad8f7..83f6004 100644 --- a/LiteLoader/Kernel/NBT/TagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/TagAPI.cpp @@ -1,16 +1,16 @@ -#include "Global.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/LiteLoader/Kernel/NBT/TagMemoryChunk.cpp b/LiteLoader/src/llapi/nbt/TagMemoryChunk.cpp similarity index 94% rename from LiteLoader/Kernel/NBT/TagMemoryChunk.cpp rename to LiteLoader/src/llapi/nbt/TagMemoryChunk.cpp index b185a75..7f4361a 100644 --- a/LiteLoader/Kernel/NBT/TagMemoryChunk.cpp +++ b/LiteLoader/src/llapi/nbt/TagMemoryChunk.cpp @@ -1,4 +1,4 @@ -#include +#include TagMemoryChunk::TagMemoryChunk(char data[], size_t size) : capacity(size) diff --git a/LiteLoader/Kernel/Network/BinaryStreamAPI.cpp b/LiteLoader/src/llapi/network/BinaryStreamAPI.cpp similarity index 93% rename from LiteLoader/Kernel/Network/BinaryStreamAPI.cpp rename to LiteLoader/src/llapi/network/BinaryStreamAPI.cpp index d8598ff..d72a620 100644 --- a/LiteLoader/Kernel/Network/BinaryStreamAPI.cpp +++ b/LiteLoader/src/llapi/network/BinaryStreamAPI.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include void BinaryStream::write(const void* origin, size_t num){ //BatchedNetworkPeer::flush Line24 diff --git a/LiteLoader/Kernel/Network/PacketAPI.cpp b/LiteLoader/src/llapi/network/PacketAPI.cpp similarity index 88% rename from LiteLoader/Kernel/Network/PacketAPI.cpp rename to LiteLoader/src/llapi/network/PacketAPI.cpp index 33cb0bb..d67df1f 100644 --- a/LiteLoader/Kernel/Network/PacketAPI.cpp +++ b/LiteLoader/src/llapi/network/PacketAPI.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define INCLUDE_ALL_PACKET #define SIZE_STATIC_ASSERT_IF_DEFINE @@ -12,191 +12,191 @@ extern Logger logger; #ifdef INCLUDE_ALL_PACKET -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include #endif INCLUDE_ALL_PACKET @@ -480,7 +480,7 @@ inline size_t getPacketSize() { #pragma region Packet Command #include -#include +#include #include #include using Param = DynamicCommand::ParameterData; @@ -533,7 +533,7 @@ void autoGenerate() { // add include oss << std::endl; forEachPacket([&](Packet const& packet, std::string className, size_t size) { - oss << fmt::format("#include \n", className); + oss << fmt::format("#include \n", className); }); oss << std::endl; replaceString(content, "#ifdef INCLUDE_ALL_PACKET\n", "#endif", oss.str()); diff --git a/LiteLoader/Kernel/Network/ReadOnlyBinaryStreamAPI.cpp b/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp similarity index 80% rename from LiteLoader/Kernel/Network/ReadOnlyBinaryStreamAPI.cpp rename to LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp index 6df5652..92248ad 100644 --- a/LiteLoader/Kernel/Network/ReadOnlyBinaryStreamAPI.cpp +++ b/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include std::string const& ReadOnlyBinaryStream::getData() const { return *pBuf; diff --git a/LiteLoader/Kernel/Scoreboard/ObjectiveAPI.cpp b/LiteLoader/src/llapi/scoreboard/ObjectiveAPI.cpp similarity index 83% rename from LiteLoader/Kernel/Scoreboard/ObjectiveAPI.cpp rename to LiteLoader/src/llapi/scoreboard/ObjectiveAPI.cpp index 986b60d..cf6eb24 100644 --- a/LiteLoader/Kernel/Scoreboard/ObjectiveAPI.cpp +++ b/LiteLoader/src/llapi/scoreboard/ObjectiveAPI.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include // helper #define H do_hash diff --git a/LiteLoader/Kernel/Scoreboard/ScoreboardAPI.cpp b/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp similarity index 95% rename from LiteLoader/Kernel/Scoreboard/ScoreboardAPI.cpp rename to LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp index bd9bfd1..c085720 100644 --- a/LiteLoader/Kernel/Scoreboard/ScoreboardAPI.cpp +++ b/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include LIAPI Objective* Scoreboard::newObjective(const std::string& objname, const std::string& displayName) { std::string criteria = "dummy"; diff --git a/LiteLoader/Kernel/Utils/CryptHelper.cpp b/LiteLoader/src/llapi/utils/CryptHelper.cpp similarity index 97% rename from LiteLoader/Kernel/Utils/CryptHelper.cpp rename to LiteLoader/src/llapi/utils/CryptHelper.cpp index 52ca319..56a4716 100644 --- a/LiteLoader/Kernel/Utils/CryptHelper.cpp +++ b/LiteLoader/src/llapi/utils/CryptHelper.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/LiteLoader/Kernel/Utils/CsLock.cpp b/LiteLoader/src/llapi/utils/CsLock.cpp similarity index 94% rename from LiteLoader/Kernel/Utils/CsLock.cpp rename to LiteLoader/src/llapi/utils/CsLock.cpp index ea7b598..9a7dc00 100644 --- a/LiteLoader/Kernel/Utils/CsLock.cpp +++ b/LiteLoader/src/llapi/utils/CsLock.cpp @@ -1,4 +1,4 @@ -#include +#include CsLock::CsLock() { if (!inited) { diff --git a/LiteLoader/Kernel/Utils/DbgHelper.cpp b/LiteLoader/src/llapi/utils/DbgHelper.cpp similarity index 96% rename from LiteLoader/Kernel/Utils/DbgHelper.cpp rename to LiteLoader/src/llapi/utils/DbgHelper.cpp index b9645ee..5632f19 100644 --- a/LiteLoader/Kernel/Utils/DbgHelper.cpp +++ b/LiteLoader/src/llapi/utils/DbgHelper.cpp @@ -1,13 +1,13 @@ -#include -#include +#include +#include #include -#include -#include -#include
+#include +#include +#include #include #include #include -#include +#include #include using namespace std; extern Logger logger; @@ -105,7 +105,7 @@ wstring MapModuleFromAddr(HANDLE hProcess, void* address) { bool PrintCurrentStackTraceback(PEXCEPTION_POINTERS e, Logger* l) { Logger& debugLogger = l ? *l : logger; - if (!LL::globalConfig.enableErrorStackTraceback) { + if (!ll::globalConfig.enableErrorStackTraceback) { logger.error("* Stack traceback is disabled by config file."); return true; } @@ -113,7 +113,7 @@ bool PrintCurrentStackTraceback(PEXCEPTION_POINTERS e, Logger* l) { HANDLE hProcess = GetCurrentProcess(); HANDLE hThread = GetCurrentThread(); DWORD threadId = GetCurrentThreadId(); - bool cacheSymbol = LL::globalConfig.cacheErrorStackTracebackSymbol; + bool cacheSymbol = ll::globalConfig.cacheErrorStackTracebackSymbol; bool res = false; std::thread printThread([e, hProcess, hThread, threadId, cacheSymbol, &res, &debugLogger]() { diff --git a/LiteLoader/Kernel/Utils/FileHelper.cpp b/LiteLoader/src/llapi/utils/FileHelper.cpp similarity index 94% rename from LiteLoader/Kernel/Utils/FileHelper.cpp rename to LiteLoader/src/llapi/utils/FileHelper.cpp index f554b7d..5b2af8d 100644 --- a/LiteLoader/Kernel/Utils/FileHelper.cpp +++ b/LiteLoader/src/llapi/utils/FileHelper.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include
+#include +#include +#include +#include #include #include using namespace std; diff --git a/LiteLoader/Kernel/Utils/GlobalService.cpp b/LiteLoader/src/llapi/utils/GlobalService.cpp similarity index 90% rename from LiteLoader/Kernel/Utils/GlobalService.cpp rename to LiteLoader/src/llapi/utils/GlobalService.cpp index cffd5fd..024273b 100644 --- a/LiteLoader/Kernel/Utils/GlobalService.cpp +++ b/LiteLoader/src/llapi/utils/GlobalService.cpp @@ -1,14 +1,15 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Minecraft TInstanceHook(void, "?initAsDedicatedServer@Minecraft@@QEAAXXZ", Minecraft) { @@ -89,7 +90,7 @@ TInstanceHook(void*, "??0RakPeer@RakNet@@QEAA@XZ", RakNet::RakPeer) { return original(this); } // Scoreboard -#include +#include TInstanceHook(Scoreboard*, "??0ServerScoreboard@@QEAA@VCommandSoftEnumRegistry@@PEAVLevelStorage@@@Z", Scoreboard, void** a2, class LevelStorage* a3) { Scoreboard* sc = original(this, a2, a3); @@ -107,10 +108,10 @@ TInstanceHook(Scoreboard*, "??0ServerScoreboard@@QEAA@VCommandSoftEnumRegistry@@ // } // PropertiesSettings // -> BuiltinBugFix.cpp -#include "MC/PropertiesSettings.hpp" +#include TInstanceHook(size_t, "??0PropertiesSettings@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z", PropertiesSettings, const std::string& file) { auto out = original(this, file); -// if (LL::globalConfig.enableUnoccupyPort19132) { +// if (ll::globalConfig.enableUnoccupyPort19132) { // // logger.warn("If you turn on this feature, your server will not be displayed on the LAN"); // DWORD v4Flag, v6Flag; // VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePort, 4, PAGE_READWRITE, &v4Flag); diff --git a/LiteLoader/Kernel/Utils/NetworkHelper.cpp b/LiteLoader/src/llapi/utils/NetworkHelper.cpp similarity index 94% rename from LiteLoader/Kernel/Utils/NetworkHelper.cpp rename to LiteLoader/src/llapi/utils/NetworkHelper.cpp index c9d43c6..d76bcf7 100644 --- a/LiteLoader/Kernel/Utils/NetworkHelper.cpp +++ b/LiteLoader/src/llapi/utils/NetworkHelper.cpp @@ -1,11 +1,11 @@ -#include -#include -#include
+#include +#include +#include #include -#include +#include #include -#include -#include
+#include +#include using namespace std; @@ -40,7 +40,7 @@ bool HttpGet(const string& url, const httplib::Headers& headers, const function< cli->set_connection_timeout(timeout, 0); std::thread([cli, headers, callback, path{std::move(path)}]() { - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { auto response = cli->Get(path.c_str(), headers); @@ -86,7 +86,7 @@ bool HttpPost(const string& url, const httplib::Headers& headers, const string& cli->set_connection_timeout(timeout, 0); std::thread([cli, headers, data, type, callback, path{std::move(path)}]() { - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { auto response = cli->Post(path.c_str(), headers, data, type.c_str()); diff --git a/LiteLoader/Kernel/Utils/PlayerMap.cpp b/LiteLoader/src/llapi/utils/PlayerMap.cpp similarity index 89% rename from LiteLoader/Kernel/Utils/PlayerMap.cpp rename to LiteLoader/src/llapi/utils/PlayerMap.cpp index b4fcfd6..267122d 100644 --- a/LiteLoader/Kernel/Utils/PlayerMap.cpp +++ b/LiteLoader/src/llapi/utils/PlayerMap.cpp @@ -1,5 +1,7 @@ -#include -#include +#include +#include +#include + // PlayerMap.h // BUG: DON'T USE GLOBAL VAR WITH A CUSTOM CONSTRUCTION!!!! // static std::vector depcbs; diff --git a/LiteLoader/Kernel/Utils/PluginOwnData.cpp b/LiteLoader/src/llapi/utils/PluginOwnData.cpp similarity index 65% rename from LiteLoader/Kernel/Utils/PluginOwnData.cpp rename to LiteLoader/src/llapi/utils/PluginOwnData.cpp index 8a0bc12..b19f299 100644 --- a/LiteLoader/Kernel/Utils/PluginOwnData.cpp +++ b/LiteLoader/src/llapi/utils/PluginOwnData.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/LiteLoader/Kernel/Utils/SRWLock.cpp b/LiteLoader/src/llapi/utils/SRWLock.cpp similarity index 94% rename from LiteLoader/Kernel/Utils/SRWLock.cpp rename to LiteLoader/src/llapi/utils/SRWLock.cpp index f146016..c9443a6 100644 --- a/LiteLoader/Kernel/Utils/SRWLock.cpp +++ b/LiteLoader/src/llapi/utils/SRWLock.cpp @@ -1,5 +1,6 @@ -#include -#include + +#include +#include SRWLock::SRWLock() { if (!inited) { diff --git a/LiteLoader/src/llapi/utils/STLHelper.cpp b/LiteLoader/src/llapi/utils/STLHelper.cpp new file mode 100644 index 0000000..43518d9 --- /dev/null +++ b/LiteLoader/src/llapi/utils/STLHelper.cpp @@ -0,0 +1 @@ +#include \ No newline at end of file diff --git a/LiteLoader/Kernel/Utils/ShellLinkFile.cpp b/LiteLoader/src/llapi/utils/ShellLinkFile.cpp similarity index 99% rename from LiteLoader/Kernel/Utils/ShellLinkFile.cpp rename to LiteLoader/src/llapi/utils/ShellLinkFile.cpp index 749d263..f663eed 100644 --- a/LiteLoader/Kernel/Utils/ShellLinkFile.cpp +++ b/LiteLoader/src/llapi/utils/ShellLinkFile.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include void ShellLinkFile::_Init() { auto res = ::CoInitialize(nullptr); diff --git a/LiteLoader/Kernel/Utils/StringHelper.cpp b/LiteLoader/src/llapi/utils/StringHelper.cpp similarity index 97% rename from LiteLoader/Kernel/Utils/StringHelper.cpp rename to LiteLoader/src/llapi/utils/StringHelper.cpp index 1bb2d5f..5f4a0d9 100644 --- a/LiteLoader/Kernel/Utils/StringHelper.cpp +++ b/LiteLoader/src/llapi/utils/StringHelper.cpp @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include using namespace std; wstring str2wstr(const string& str) { diff --git a/LiteLoader/Kernel/Utils/StringReader.cpp b/LiteLoader/src/llapi/utils/StringReader.cpp similarity index 99% rename from LiteLoader/Kernel/Utils/StringReader.cpp rename to LiteLoader/src/llapi/utils/StringReader.cpp index 9e01863..12c3efc 100644 --- a/LiteLoader/Kernel/Utils/StringReader.cpp +++ b/LiteLoader/src/llapi/utils/StringReader.cpp @@ -1,4 +1,4 @@ -#include +#include #include //////////////////////////////// CONSTRUCTOR //////////////////////////////// diff --git a/LiteLoader/Kernel/Utils/WinHelper.cpp b/LiteLoader/src/llapi/utils/WinHelper.cpp similarity index 95% rename from LiteLoader/Kernel/Utils/WinHelper.cpp rename to LiteLoader/src/llapi/utils/WinHelper.cpp index 6cfe227..cef15af 100644 --- a/LiteLoader/Kernel/Utils/WinHelper.cpp +++ b/LiteLoader/src/llapi/utils/WinHelper.cpp @@ -1,12 +1,12 @@ -#include -#include -#include
-#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include -#include
+#include using namespace std; @@ -73,7 +73,7 @@ bool NewProcess(const std::string& process, std::function #include #include diff --git a/LiteLoader/Header/third-party/Nlohmann/fifo_json.hpp b/LiteLoader/third-party/include/Nlohmann/fifo_json.hpp similarity index 100% rename from LiteLoader/Header/third-party/Nlohmann/fifo_json.hpp rename to LiteLoader/third-party/include/Nlohmann/fifo_json.hpp diff --git a/LiteLoader/Header/third-party/Nlohmann/fifo_map.hpp b/LiteLoader/third-party/include/Nlohmann/fifo_map.hpp similarity index 100% rename from LiteLoader/Header/third-party/Nlohmann/fifo_map.hpp rename to LiteLoader/third-party/include/Nlohmann/fifo_map.hpp diff --git a/LiteLoader/Header/third-party/Nlohmann/json.hpp b/LiteLoader/third-party/include/Nlohmann/json.hpp similarity index 100% rename from LiteLoader/Header/third-party/Nlohmann/json.hpp rename to LiteLoader/third-party/include/Nlohmann/json.hpp diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Assertion.h b/LiteLoader/third-party/include/SQLiteCpp/Assertion.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Assertion.h rename to LiteLoader/third-party/include/SQLiteCpp/Assertion.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Backup.h b/LiteLoader/third-party/include/SQLiteCpp/Backup.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Backup.h rename to LiteLoader/third-party/include/SQLiteCpp/Backup.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Column.h b/LiteLoader/third-party/include/SQLiteCpp/Column.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Column.h rename to LiteLoader/third-party/include/SQLiteCpp/Column.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Database.h b/LiteLoader/third-party/include/SQLiteCpp/Database.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Database.h rename to LiteLoader/third-party/include/SQLiteCpp/Database.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Exception.h b/LiteLoader/third-party/include/SQLiteCpp/Exception.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Exception.h rename to LiteLoader/third-party/include/SQLiteCpp/Exception.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/SQLiteCpp.h b/LiteLoader/third-party/include/SQLiteCpp/SQLiteCpp.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/SQLiteCpp.h rename to LiteLoader/third-party/include/SQLiteCpp/SQLiteCpp.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Statement.h b/LiteLoader/third-party/include/SQLiteCpp/Statement.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Statement.h rename to LiteLoader/third-party/include/SQLiteCpp/Statement.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Transaction.h b/LiteLoader/third-party/include/SQLiteCpp/Transaction.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Transaction.h rename to LiteLoader/third-party/include/SQLiteCpp/Transaction.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/Utils.h b/LiteLoader/third-party/include/SQLiteCpp/Utils.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/Utils.h rename to LiteLoader/third-party/include/SQLiteCpp/Utils.h diff --git a/LiteLoader/Header/third-party/SQLiteCpp/VariadicBind.h b/LiteLoader/third-party/include/SQLiteCpp/VariadicBind.h similarity index 100% rename from LiteLoader/Header/third-party/SQLiteCpp/VariadicBind.h rename to LiteLoader/third-party/include/SQLiteCpp/VariadicBind.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/compact_enc_det.h b/LiteLoader/third-party/include/compact_enc_det/compact_enc_det.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/compact_enc_det.h rename to LiteLoader/third-party/include/compact_enc_det/compact_enc_det.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_generated_tables.h b/LiteLoader/third-party/include/compact_enc_det/compact_enc_det_generated_tables.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_generated_tables.h rename to LiteLoader/third-party/include/compact_enc_det/compact_enc_det_generated_tables.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_generated_tables2.h b/LiteLoader/third-party/include/compact_enc_det/compact_enc_det_generated_tables2.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_generated_tables2.h rename to LiteLoader/third-party/include/compact_enc_det/compact_enc_det_generated_tables2.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_hint_code.h b/LiteLoader/third-party/include/compact_enc_det/compact_enc_det_hint_code.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/compact_enc_det_hint_code.h rename to LiteLoader/third-party/include/compact_enc_det/compact_enc_det_hint_code.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/detail_head_string.inc b/LiteLoader/third-party/include/compact_enc_det/detail_head_string.inc similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/detail_head_string.inc rename to LiteLoader/third-party/include/compact_enc_det/detail_head_string.inc diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/basictypes.h b/LiteLoader/third-party/include/compact_enc_det/util/basictypes.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/basictypes.h rename to LiteLoader/third-party/include/compact_enc_det/util/basictypes.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/case_insensitive_hash.h b/LiteLoader/third-party/include/compact_enc_det/util/case_insensitive_hash.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/case_insensitive_hash.h rename to LiteLoader/third-party/include/compact_enc_det/util/case_insensitive_hash.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/commandlineflags.h b/LiteLoader/third-party/include/compact_enc_det/util/commandlineflags.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/commandlineflags.h rename to LiteLoader/third-party/include/compact_enc_det/util/commandlineflags.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/encodings/encodings.h b/LiteLoader/third-party/include/compact_enc_det/util/encodings/encodings.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/encodings/encodings.h rename to LiteLoader/third-party/include/compact_enc_det/util/encodings/encodings.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/encodings/encodings.pb.h b/LiteLoader/third-party/include/compact_enc_det/util/encodings/encodings.pb.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/encodings/encodings.pb.h rename to LiteLoader/third-party/include/compact_enc_det/util/encodings/encodings.pb.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/languages/languages.h b/LiteLoader/third-party/include/compact_enc_det/util/languages/languages.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/languages/languages.h rename to LiteLoader/third-party/include/compact_enc_det/util/languages/languages.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/languages/languages.pb.h b/LiteLoader/third-party/include/compact_enc_det/util/languages/languages.pb.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/languages/languages.pb.h rename to LiteLoader/third-party/include/compact_enc_det/util/languages/languages.pb.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/logging.h b/LiteLoader/third-party/include/compact_enc_det/util/logging.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/logging.h rename to LiteLoader/third-party/include/compact_enc_det/util/logging.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/port.h b/LiteLoader/third-party/include/compact_enc_det/util/port.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/port.h rename to LiteLoader/third-party/include/compact_enc_det/util/port.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/string_util.h b/LiteLoader/third-party/include/compact_enc_det/util/string_util.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/string_util.h rename to LiteLoader/third-party/include/compact_enc_det/util/string_util.h diff --git a/LiteLoader/Header/third-party/compact_enc_det/util/varsetter.h b/LiteLoader/third-party/include/compact_enc_det/util/varsetter.h similarity index 100% rename from LiteLoader/Header/third-party/compact_enc_det/util/varsetter.h rename to LiteLoader/third-party/include/compact_enc_det/util/varsetter.h diff --git a/LiteLoader/Header/third-party/dbghelp/dbghelp.h b/LiteLoader/third-party/include/dbghelp/dbghelp.h similarity index 100% rename from LiteLoader/Header/third-party/dbghelp/dbghelp.h rename to LiteLoader/third-party/include/dbghelp/dbghelp.h diff --git a/LiteLoader/Header/third-party/detours/detours.h b/LiteLoader/third-party/include/detours/detours.h similarity index 100% rename from LiteLoader/Header/third-party/detours/detours.h rename to LiteLoader/third-party/include/detours/detours.h diff --git a/LiteLoader/Header/third-party/detours/detver.h b/LiteLoader/third-party/include/detours/detver.h similarity index 100% rename from LiteLoader/Header/third-party/detours/detver.h rename to LiteLoader/third-party/include/detours/detver.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall.h b/LiteLoader/third-party/include/dyncall/dyncall.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall.h rename to LiteLoader/third-party/include/dyncall/dyncall.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_alloc.h b/LiteLoader/third-party/include/dyncall/dyncall_alloc.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_alloc.h rename to LiteLoader/third-party/include/dyncall/dyncall_alloc.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_alloc_wx.h b/LiteLoader/third-party/include/dyncall/dyncall_alloc_wx.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_alloc_wx.h rename to LiteLoader/third-party/include/dyncall/dyncall_alloc_wx.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_args.h b/LiteLoader/third-party/include/dyncall/dyncall_args.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_args.h rename to LiteLoader/third-party/include/dyncall/dyncall_args.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_callback.h b/LiteLoader/third-party/include/dyncall/dyncall_callback.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_callback.h rename to LiteLoader/third-party/include/dyncall/dyncall_callback.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_callf.h b/LiteLoader/third-party/include/dyncall/dyncall_callf.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_callf.h rename to LiteLoader/third-party/include/dyncall/dyncall_callf.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_callvm.h b/LiteLoader/third-party/include/dyncall/dyncall_callvm.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_callvm.h rename to LiteLoader/third-party/include/dyncall/dyncall_callvm.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_config.h b/LiteLoader/third-party/include/dyncall/dyncall_config.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_config.h rename to LiteLoader/third-party/include/dyncall/dyncall_config.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_macros.h b/LiteLoader/third-party/include/dyncall/dyncall_macros.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_macros.h rename to LiteLoader/third-party/include/dyncall/dyncall_macros.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_signature.h b/LiteLoader/third-party/include/dyncall/dyncall_signature.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_signature.h rename to LiteLoader/third-party/include/dyncall/dyncall_signature.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_struct.h b/LiteLoader/third-party/include/dyncall/dyncall_struct.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_struct.h rename to LiteLoader/third-party/include/dyncall/dyncall_struct.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_thunk.h b/LiteLoader/third-party/include/dyncall/dyncall_thunk.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_thunk.h rename to LiteLoader/third-party/include/dyncall/dyncall_thunk.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_types.h b/LiteLoader/third-party/include/dyncall/dyncall_types.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_types.h rename to LiteLoader/third-party/include/dyncall/dyncall_types.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_utils.h b/LiteLoader/third-party/include/dyncall/dyncall_utils.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_utils.h rename to LiteLoader/third-party/include/dyncall/dyncall_utils.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_value.h b/LiteLoader/third-party/include/dyncall/dyncall_value.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_value.h rename to LiteLoader/third-party/include/dyncall/dyncall_value.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_vector.h b/LiteLoader/third-party/include/dyncall/dyncall_vector.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_vector.h rename to LiteLoader/third-party/include/dyncall/dyncall_vector.h diff --git a/LiteLoader/Header/third-party/dyncall/dyncall_version.h b/LiteLoader/third-party/include/dyncall/dyncall_version.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dyncall_version.h rename to LiteLoader/third-party/include/dyncall/dyncall_version.h diff --git a/LiteLoader/Header/third-party/dyncall/dynload.h b/LiteLoader/third-party/include/dyncall/dynload.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dynload.h rename to LiteLoader/third-party/include/dyncall/dynload.h diff --git a/LiteLoader/Header/third-party/dyncall/dynload_alloc.h b/LiteLoader/third-party/include/dyncall/dynload_alloc.h similarity index 100% rename from LiteLoader/Header/third-party/dyncall/dynload_alloc.h rename to LiteLoader/third-party/include/dyncall/dynload_alloc.h diff --git a/LiteLoader/third-party/include/entt/config/config.h b/LiteLoader/third-party/include/entt/config/config.h new file mode 100644 index 0000000..06c42e8 --- /dev/null +++ b/LiteLoader/third-party/include/entt/config/config.h @@ -0,0 +1,81 @@ +#ifndef ENTT_CONFIG_CONFIG_H +#define ENTT_CONFIG_CONFIG_H + +#include "version.h" + +#if defined(__cpp_exceptions) && !defined(ENTT_NOEXCEPTION) +# define ENTT_CONSTEXPR +# define ENTT_THROW throw +# define ENTT_TRY try +# define ENTT_CATCH catch(...) +#else +# define ENTT_CONSTEXPR constexpr // use only with throwing functions (waiting for C++20) +# define ENTT_THROW +# define ENTT_TRY if(true) +# define ENTT_CATCH if(false) +#endif + +#ifdef ENTT_USE_ATOMIC +# include +# define ENTT_MAYBE_ATOMIC(Type) std::atomic +#else +# define ENTT_MAYBE_ATOMIC(Type) Type +#endif + +#ifndef ENTT_ID_TYPE +# include +# define ENTT_ID_TYPE std::uint32_t +#endif + +#ifndef ENTT_SPARSE_PAGE +# define ENTT_SPARSE_PAGE 4096 +#endif + +#ifndef ENTT_PACKED_PAGE +# define ENTT_PACKED_PAGE 1024 +#endif + +#ifdef ENTT_DISABLE_ASSERT +# undef ENTT_ASSERT +# define ENTT_ASSERT(condition, msg) (void(0)) +#elif !defined ENTT_ASSERT +# include +# define ENTT_ASSERT(condition, msg) assert(condition) +#endif + +#ifdef ENTT_DISABLE_ASSERT +# undef ENTT_ASSERT_CONSTEXPR +# define ENTT_ASSERT_CONSTEXPR(condition, msg) (void(0)) +#elif !defined ENTT_ASSERT_CONSTEXPR +# define ENTT_ASSERT_CONSTEXPR(condition, msg) ENTT_ASSERT(condition, msg) +#endif + +#ifdef ENTT_NO_ETO +# define ENTT_ETO_TYPE(Type) void +#else +# define ENTT_ETO_TYPE(Type) Type +#endif + +#ifdef ENTT_STANDARD_CPP +# define ENTT_NONSTD false +#else +# define ENTT_NONSTD true +# if defined __clang__ || defined __GNUC__ +# define ENTT_PRETTY_FUNCTION __PRETTY_FUNCTION__ +# define ENTT_PRETTY_FUNCTION_PREFIX '=' +# define ENTT_PRETTY_FUNCTION_SUFFIX ']' +# elif defined _MSC_VER +# define ENTT_PRETTY_FUNCTION __FUNCSIG__ +# define ENTT_PRETTY_FUNCTION_PREFIX '<' +# define ENTT_PRETTY_FUNCTION_SUFFIX '>' +# endif +#endif + +#if defined _MSC_VER +# pragma detect_mismatch("entt.version", ENTT_VERSION) +# pragma detect_mismatch("entt.noexcept", ENTT_XSTR(ENTT_TRY)) +# pragma detect_mismatch("entt.id", ENTT_XSTR(ENTT_ID_TYPE)) +# pragma detect_mismatch("entt.nonstd", ENTT_XSTR(ENTT_NONSTD)) +#endif + +#endif diff --git a/LiteLoader/third-party/include/entt/config/macro.h b/LiteLoader/third-party/include/entt/config/macro.h new file mode 100644 index 0000000..0fec4c7 --- /dev/null +++ b/LiteLoader/third-party/include/entt/config/macro.h @@ -0,0 +1,7 @@ +#ifndef ENTT_CONFIG_MACRO_H +#define ENTT_CONFIG_MACRO_H + +#define ENTT_STR(arg) #arg +#define ENTT_XSTR(arg) ENTT_STR(arg) + +#endif diff --git a/LiteLoader/third-party/include/entt/config/version.h b/LiteLoader/third-party/include/entt/config/version.h new file mode 100644 index 0000000..a07438d --- /dev/null +++ b/LiteLoader/third-party/include/entt/config/version.h @@ -0,0 +1,14 @@ +#ifndef ENTT_CONFIG_VERSION_H +#define ENTT_CONFIG_VERSION_H + +#include "macro.h" + +#define ENTT_VERSION_MAJOR 3 +#define ENTT_VERSION_MINOR 11 +#define ENTT_VERSION_PATCH 0 + +#define ENTT_VERSION \ + ENTT_XSTR(ENTT_VERSION_MAJOR) \ + "." ENTT_XSTR(ENTT_VERSION_MINOR) "." ENTT_XSTR(ENTT_VERSION_PATCH) + +#endif diff --git a/LiteLoader/third-party/include/entt/container/dense_map.hpp b/LiteLoader/third-party/include/entt/container/dense_map.hpp new file mode 100644 index 0000000..df77fa1 --- /dev/null +++ b/LiteLoader/third-party/include/entt/container/dense_map.hpp @@ -0,0 +1,1060 @@ +#ifndef ENTT_CONTAINER_DENSE_MAP_HPP +#define ENTT_CONTAINER_DENSE_MAP_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/compressed_pair.hpp" +#include "../core/iterator.hpp" +#include "../core/memory.hpp" +#include "../core/type_traits.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct dense_map_node final { + using value_type = std::pair; + + template + dense_map_node(const std::size_t pos, Args &&...args) + : next{pos}, + element{std::forward(args)...} {} + + template + dense_map_node(std::allocator_arg_t, const Allocator &allocator, const std::size_t pos, Args &&...args) + : next{pos}, + element{entt::make_obj_using_allocator(allocator, std::forward(args)...)} {} + + template + dense_map_node(std::allocator_arg_t, const Allocator &allocator, const dense_map_node &other) + : next{other.next}, + element{entt::make_obj_using_allocator(allocator, other.element)} {} + + template + dense_map_node(std::allocator_arg_t, const Allocator &allocator, dense_map_node &&other) + : next{other.next}, + element{entt::make_obj_using_allocator(allocator, std::move(other.element))} {} + + std::size_t next; + value_type element; +}; + +template +class dense_map_iterator final { + template + friend class dense_map_iterator; + + using first_type = decltype(std::as_const(std::declval()->element.first)); + using second_type = decltype((std::declval()->element.second)); + +public: + using value_type = std::pair; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr dense_map_iterator() noexcept + : it{} {} + + constexpr dense_map_iterator(const It iter) noexcept + : it{iter} {} + + template && std::is_constructible_v>> + constexpr dense_map_iterator(const dense_map_iterator &other) noexcept + : it{other.it} {} + + constexpr dense_map_iterator &operator++() noexcept { + return ++it, *this; + } + + constexpr dense_map_iterator operator++(int) noexcept { + dense_map_iterator orig = *this; + return ++(*this), orig; + } + + constexpr dense_map_iterator &operator--() noexcept { + return --it, *this; + } + + constexpr dense_map_iterator operator--(int) noexcept { + dense_map_iterator orig = *this; + return operator--(), orig; + } + + constexpr dense_map_iterator &operator+=(const difference_type value) noexcept { + it += value; + return *this; + } + + constexpr dense_map_iterator operator+(const difference_type value) const noexcept { + dense_map_iterator copy = *this; + return (copy += value); + } + + constexpr dense_map_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr dense_map_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return {it[value].element.first, it[value].element.second}; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return {it->element.first, it->element.second}; + } + + template + friend constexpr std::ptrdiff_t operator-(const dense_map_iterator &, const dense_map_iterator &) noexcept; + + template + friend constexpr bool operator==(const dense_map_iterator &, const dense_map_iterator &) noexcept; + + template + friend constexpr bool operator<(const dense_map_iterator &, const dense_map_iterator &) noexcept; + +private: + It it; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return lhs.it - rhs.it; +} + +template +[[nodiscard]] constexpr bool operator==(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return lhs.it < rhs.it; +} + +template +[[nodiscard]] constexpr bool operator>(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return rhs < lhs; +} + +template +[[nodiscard]] constexpr bool operator<=(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const dense_map_iterator &lhs, const dense_map_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +template +class dense_map_local_iterator final { + template + friend class dense_map_local_iterator; + + using first_type = decltype(std::as_const(std::declval()->element.first)); + using second_type = decltype((std::declval()->element.second)); + +public: + using value_type = std::pair; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr dense_map_local_iterator() noexcept + : it{}, + offset{} {} + + constexpr dense_map_local_iterator(It iter, const std::size_t pos) noexcept + : it{iter}, + offset{pos} {} + + template && std::is_constructible_v>> + constexpr dense_map_local_iterator(const dense_map_local_iterator &other) noexcept + : it{other.it}, + offset{other.offset} {} + + constexpr dense_map_local_iterator &operator++() noexcept { + return offset = it[offset].next, *this; + } + + constexpr dense_map_local_iterator operator++(int) noexcept { + dense_map_local_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return {it[offset].element.first, it[offset].element.second}; + } + + [[nodiscard]] constexpr std::size_t index() const noexcept { + return offset; + } + +private: + It it; + std::size_t offset; +}; + +template +[[nodiscard]] constexpr bool operator==(const dense_map_local_iterator &lhs, const dense_map_local_iterator &rhs) noexcept { + return lhs.index() == rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator!=(const dense_map_local_iterator &lhs, const dense_map_local_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Associative container for key-value pairs with unique keys. + * + * Internally, elements are organized into buckets. Which bucket an element is + * placed into depends entirely on the hash of its key. Keys with the same hash + * code appear in the same bucket. + * + * @tparam Key Key type of the associative container. + * @tparam Type Mapped type of the associative container. + * @tparam Hash Type of function to use to hash the keys. + * @tparam KeyEqual Type of function to use to compare the keys for equality. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class dense_map { + static constexpr float default_threshold = 0.875f; + static constexpr std::size_t minimum_capacity = 8u; + + using node_type = internal::dense_map_node; + using alloc_traits = typename std::allocator_traits; + static_assert(std::is_same_v>, "Invalid value type"); + using sparse_container_type = std::vector>; + using packed_container_type = std::vector>; + + template + [[nodiscard]] std::size_t key_to_bucket(const Other &key) const noexcept { + return fast_mod(sparse.second()(key), bucket_count()); + } + + template + [[nodiscard]] auto constrained_find(const Other &key, std::size_t bucket) { + for(auto it = begin(bucket), last = end(bucket); it != last; ++it) { + if(packed.second()(it->first, key)) { + return begin() + static_cast(it.index()); + } + } + + return end(); + } + + template + [[nodiscard]] auto constrained_find(const Other &key, std::size_t bucket) const { + for(auto it = cbegin(bucket), last = cend(bucket); it != last; ++it) { + if(packed.second()(it->first, key)) { + return cbegin() + static_cast(it.index()); + } + } + + return cend(); + } + + template + [[nodiscard]] auto insert_or_do_nothing(Other &&key, Args &&...args) { + const auto index = key_to_bucket(key); + + if(auto it = constrained_find(key, index); it != end()) { + return std::make_pair(it, false); + } + + packed.first().emplace_back(sparse.first()[index], std::piecewise_construct, std::forward_as_tuple(std::forward(key)), std::forward_as_tuple(std::forward(args)...)); + sparse.first()[index] = packed.first().size() - 1u; + rehash_if_required(); + + return std::make_pair(--end(), true); + } + + template + [[nodiscard]] auto insert_or_overwrite(Other &&key, Arg &&value) { + const auto index = key_to_bucket(key); + + if(auto it = constrained_find(key, index); it != end()) { + it->second = std::forward(value); + return std::make_pair(it, false); + } + + packed.first().emplace_back(sparse.first()[index], std::forward(key), std::forward(value)); + sparse.first()[index] = packed.first().size() - 1u; + rehash_if_required(); + + return std::make_pair(--end(), true); + } + + void move_and_pop(const std::size_t pos) { + if(const auto last = size() - 1u; pos != last) { + size_type *curr = sparse.first().data() + key_to_bucket(packed.first().back().element.first); + packed.first()[pos] = std::move(packed.first().back()); + for(; *curr != last; curr = &packed.first()[*curr].next) {} + *curr = pos; + } + + packed.first().pop_back(); + } + + void rehash_if_required() { + if(size() > (bucket_count() * max_load_factor())) { + rehash(bucket_count() * 2u); + } + } + +public: + /*! @brief Key type of the container. */ + using key_type = Key; + /*! @brief Mapped type of the container. */ + using mapped_type = Type; + /*! @brief Key-value type of the container. */ + using value_type = std::pair; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Type of function to use to hash the keys. */ + using hasher = Hash; + /*! @brief Type of function to use to compare the keys for equality. */ + using key_equal = KeyEqual; + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Input iterator type. */ + using iterator = internal::dense_map_iterator; + /*! @brief Constant input iterator type. */ + using const_iterator = internal::dense_map_iterator; + /*! @brief Input iterator type. */ + using local_iterator = internal::dense_map_local_iterator; + /*! @brief Constant input iterator type. */ + using const_local_iterator = internal::dense_map_local_iterator; + + /*! @brief Default constructor. */ + dense_map() + : dense_map{minimum_capacity} {} + + /** + * @brief Constructs an empty container with a given allocator. + * @param allocator The allocator to use. + */ + explicit dense_map(const allocator_type &allocator) + : dense_map{minimum_capacity, hasher{}, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator and user + * supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param allocator The allocator to use. + */ + dense_map(const size_type cnt, const allocator_type &allocator) + : dense_map{cnt, hasher{}, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator, hash + * function and user supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param hash Hash function to use. + * @param allocator The allocator to use. + */ + dense_map(const size_type cnt, const hasher &hash, const allocator_type &allocator) + : dense_map{cnt, hash, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator, hash + * function, compare function and user supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param hash Hash function to use. + * @param equal Compare function to use. + * @param allocator The allocator to use. + */ + explicit dense_map(const size_type cnt, const hasher &hash = hasher{}, const key_equal &equal = key_equal{}, const allocator_type &allocator = allocator_type{}) + : sparse{allocator, hash}, + packed{allocator, equal}, + threshold{default_threshold} { + rehash(cnt); + } + + /*! @brief Default copy constructor. */ + dense_map(const dense_map &) = default; + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + dense_map(const dense_map &other, const allocator_type &allocator) + : sparse{std::piecewise_construct, std::forward_as_tuple(other.sparse.first(), allocator), std::forward_as_tuple(other.sparse.second())}, + packed{std::piecewise_construct, std::forward_as_tuple(other.packed.first(), allocator), std::forward_as_tuple(other.packed.second())}, + threshold{other.threshold} {} + + /*! @brief Default move constructor. */ + dense_map(dense_map &&) noexcept(std::is_nothrow_move_constructible_v> &&std::is_nothrow_move_constructible_v>) = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + dense_map(dense_map &&other, const allocator_type &allocator) + : sparse{std::piecewise_construct, std::forward_as_tuple(std::move(other.sparse.first()), allocator), std::forward_as_tuple(std::move(other.sparse.second()))}, + packed{std::piecewise_construct, std::forward_as_tuple(std::move(other.packed.first()), allocator), std::forward_as_tuple(std::move(other.packed.second()))}, + threshold{other.threshold} {} + + /** + * @brief Default copy assignment operator. + * @return This container. + */ + dense_map &operator=(const dense_map &) = default; + + /** + * @brief Default move assignment operator. + * @return This container. + */ + dense_map &operator=(dense_map &&) noexcept(std::is_nothrow_move_assignable_v> &&std::is_nothrow_move_assignable_v>) = default; + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return sparse.first().get_allocator(); + } + + /** + * @brief Returns an iterator to the beginning. + * + * The returned iterator points to the first instance of the internal array. + * If the array is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first instance of the internal array. + */ + [[nodiscard]] const_iterator cbegin() const noexcept { + return packed.first().begin(); + } + + /*! @copydoc cbegin */ + [[nodiscard]] const_iterator begin() const noexcept { + return cbegin(); + } + + /*! @copydoc begin */ + [[nodiscard]] iterator begin() noexcept { + return packed.first().begin(); + } + + /** + * @brief Returns an iterator to the end. + * + * The returned iterator points to the element following the last instance + * of the internal array. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the element following the last instance of the + * internal array. + */ + [[nodiscard]] const_iterator cend() const noexcept { + return packed.first().end(); + } + + /*! @copydoc cend */ + [[nodiscard]] const_iterator end() const noexcept { + return cend(); + } + + /*! @copydoc end */ + [[nodiscard]] iterator end() noexcept { + return packed.first().end(); + } + + /** + * @brief Checks whether a container is empty. + * @return True if the container is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return packed.first().empty(); + } + + /** + * @brief Returns the number of elements in a container. + * @return Number of elements in a container. + */ + [[nodiscard]] size_type size() const noexcept { + return packed.first().size(); + } + + /** + * @brief Returns the maximum possible number of elements. + * @return Maximum possible number of elements. + */ + [[nodiscard]] size_type max_size() const noexcept { + return packed.first().max_size(); + } + + /*! @brief Clears the container. */ + void clear() noexcept { + sparse.first().clear(); + packed.first().clear(); + rehash(0u); + } + + /** + * @brief Inserts an element into the container, if the key does not exist. + * @param value A key-value pair eventually convertible to the value type. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + std::pair insert(const value_type &value) { + return insert_or_do_nothing(value.first, value.second); + } + + /*! @copydoc insert */ + std::pair insert(value_type &&value) { + return insert_or_do_nothing(std::move(value.first), std::move(value.second)); + } + + /** + * @copydoc insert + * @tparam Arg Type of the key-value pair to insert into the container. + */ + template + std::enable_if_t, std::pair> + insert(Arg &&value) { + return insert_or_do_nothing(std::forward(value).first, std::forward(value).second); + } + + /** + * @brief Inserts elements into the container, if their keys do not exist. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + */ + template + void insert(It first, It last) { + for(; first != last; ++first) { + insert(*first); + } + } + + /** + * @brief Inserts an element into the container or assigns to the current + * element if the key already exists. + * @tparam Arg Type of the value to insert or assign. + * @param key A key used both to look up and to insert if not found. + * @param value A value to insert or assign. + * @return A pair consisting of an iterator to the element and a bool + * denoting whether the insertion took place. + */ + template + std::pair insert_or_assign(const key_type &key, Arg &&value) { + return insert_or_overwrite(key, std::forward(value)); + } + + /*! @copydoc insert_or_assign */ + template + std::pair insert_or_assign(key_type &&key, Arg &&value) { + return insert_or_overwrite(std::move(key), std::forward(value)); + } + + /** + * @brief Constructs an element in-place, if the key does not exist. + * + * The element is also constructed when the container already has the key, + * in which case the newly constructed object is destroyed immediately. + * + * @tparam Args Types of arguments to forward to the constructor of the + * element. + * @param args Arguments to forward to the constructor of the element. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + template + std::pair emplace([[maybe_unused]] Args &&...args) { + if constexpr(sizeof...(Args) == 0u) { + return insert_or_do_nothing(key_type{}); + } else if constexpr(sizeof...(Args) == 1u) { + return insert_or_do_nothing(std::forward(args).first..., std::forward(args).second...); + } else if constexpr(sizeof...(Args) == 2u) { + return insert_or_do_nothing(std::forward(args)...); + } else { + auto &node = packed.first().emplace_back(packed.first().size(), std::forward(args)...); + const auto index = key_to_bucket(node.element.first); + + if(auto it = constrained_find(node.element.first, index); it != end()) { + packed.first().pop_back(); + return std::make_pair(it, false); + } + + std::swap(node.next, sparse.first()[index]); + rehash_if_required(); + + return std::make_pair(--end(), true); + } + } + + /** + * @brief Inserts in-place if the key does not exist, does nothing if the + * key exists. + * @tparam Args Types of arguments to forward to the constructor of the + * element. + * @param key A key used both to look up and to insert if not found. + * @param args Arguments to forward to the constructor of the element. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + template + std::pair try_emplace(const key_type &key, Args &&...args) { + return insert_or_do_nothing(key, std::forward(args)...); + } + + /*! @copydoc try_emplace */ + template + std::pair try_emplace(key_type &&key, Args &&...args) { + return insert_or_do_nothing(std::move(key), std::forward(args)...); + } + + /** + * @brief Removes an element from a given position. + * @param pos An iterator to the element to remove. + * @return An iterator following the removed element. + */ + iterator erase(const_iterator pos) { + const auto diff = pos - cbegin(); + erase(pos->first); + return begin() + diff; + } + + /** + * @brief Removes the given elements from a container. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + * @return An iterator following the last removed element. + */ + iterator erase(const_iterator first, const_iterator last) { + const auto dist = first - cbegin(); + + for(auto from = last - cbegin(); from != dist; --from) { + erase(packed.first()[from - 1u].element.first); + } + + return (begin() + dist); + } + + /** + * @brief Removes the element associated with a given key. + * @param key A key value of an element to remove. + * @return Number of elements removed (either 0 or 1). + */ + size_type erase(const key_type &key) { + for(size_type *curr = sparse.first().data() + key_to_bucket(key); *curr != (std::numeric_limits::max)(); curr = &packed.first()[*curr].next) { + if(packed.second()(packed.first()[*curr].element.first, key)) { + const auto index = *curr; + *curr = packed.first()[*curr].next; + move_and_pop(index); + return 1u; + } + } + + return 0u; + } + + /** + * @brief Exchanges the contents with those of a given container. + * @param other Container to exchange the content with. + */ + void swap(dense_map &other) { + using std::swap; + swap(sparse, other.sparse); + swap(packed, other.packed); + swap(threshold, other.threshold); + } + + /** + * @brief Accesses a given element with bounds checking. + * @param key A key of an element to find. + * @return A reference to the mapped value of the requested element. + */ + [[nodiscard]] mapped_type &at(const key_type &key) { + auto it = find(key); + ENTT_ASSERT(it != end(), "Invalid key"); + return it->second; + } + + /*! @copydoc at */ + [[nodiscard]] const mapped_type &at(const key_type &key) const { + auto it = find(key); + ENTT_ASSERT(it != cend(), "Invalid key"); + return it->second; + } + + /** + * @brief Accesses or inserts a given element. + * @param key A key of an element to find or insert. + * @return A reference to the mapped value of the requested element. + */ + [[nodiscard]] mapped_type &operator[](const key_type &key) { + return insert_or_do_nothing(key).first->second; + } + + /** + * @brief Accesses or inserts a given element. + * @param key A key of an element to find or insert. + * @return A reference to the mapped value of the requested element. + */ + [[nodiscard]] mapped_type &operator[](key_type &&key) { + return insert_or_do_nothing(std::move(key)).first->second; + } + + /** + * @brief Returns the number of elements matching a key (either 1 or 0). + * @param key Key value of an element to search for. + * @return Number of elements matching the key (either 1 or 0). + */ + [[nodiscard]] size_type count(const key_type &key) const { + return find(key) != end(); + } + + /** + * @brief Returns the number of elements matching a key (either 1 or 0). + * @tparam Other Type of the key value of an element to search for. + * @param key Key value of an element to search for. + * @return Number of elements matching the key (either 1 or 0). + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + count(const Other &key) const { + return find(key) != end(); + } + + /** + * @brief Finds an element with a given key. + * @param key Key value of an element to search for. + * @return An iterator to an element with the given key. If no such element + * is found, a past-the-end iterator is returned. + */ + [[nodiscard]] iterator find(const key_type &key) { + return constrained_find(key, key_to_bucket(key)); + } + + /*! @copydoc find */ + [[nodiscard]] const_iterator find(const key_type &key) const { + return constrained_find(key, key_to_bucket(key)); + } + + /** + * @brief Finds an element with a key that compares _equivalent_ to a given + * key. + * @tparam Other Type of the key value of an element to search for. + * @param key Key value of an element to search for. + * @return An iterator to an element with the given key. If no such element + * is found, a past-the-end iterator is returned. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + find(const Other &key) { + return constrained_find(key, key_to_bucket(key)); + } + + /*! @copydoc find */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + find(const Other &key) const { + return constrained_find(key, key_to_bucket(key)); + } + + /** + * @brief Returns a range containing all elements with a given key. + * @param key Key value of an element to search for. + * @return A pair of iterators pointing to the first element and past the + * last element of the range. + */ + [[nodiscard]] std::pair equal_range(const key_type &key) { + const auto it = find(key); + return {it, it + !(it == end())}; + } + + /*! @copydoc equal_range */ + [[nodiscard]] std::pair equal_range(const key_type &key) const { + const auto it = find(key); + return {it, it + !(it == cend())}; + } + + /** + * @brief Returns a range containing all elements that compare _equivalent_ + * to a given key. + * @tparam Other Type of an element to search for. + * @param key Key value of an element to search for. + * @return A pair of iterators pointing to the first element and past the + * last element of the range. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t>> + equal_range(const Other &key) { + const auto it = find(key); + return {it, it + !(it == end())}; + } + + /*! @copydoc equal_range */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t>> + equal_range(const Other &key) const { + const auto it = find(key); + return {it, it + !(it == cend())}; + } + + /** + * @brief Checks if the container contains an element with a given key. + * @param key Key value of an element to search for. + * @return True if there is such an element, false otherwise. + */ + [[nodiscard]] bool contains(const key_type &key) const { + return (find(key) != cend()); + } + + /** + * @brief Checks if the container contains an element with a key that + * compares _equivalent_ to a given value. + * @tparam Other Type of the key value of an element to search for. + * @param key Key value of an element to search for. + * @return True if there is such an element, false otherwise. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + contains(const Other &key) const { + return (find(key) != cend()); + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] const_local_iterator cbegin(const size_type index) const { + return {packed.first().begin(), sparse.first()[index]}; + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] const_local_iterator begin(const size_type index) const { + return cbegin(index); + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] local_iterator begin(const size_type index) { + return {packed.first().begin(), sparse.first()[index]}; + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] const_local_iterator cend([[maybe_unused]] const size_type index) const { + return {packed.first().begin(), (std::numeric_limits::max)()}; + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] const_local_iterator end(const size_type index) const { + return cend(index); + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] local_iterator end([[maybe_unused]] const size_type index) { + return {packed.first().begin(), (std::numeric_limits::max)()}; + } + + /** + * @brief Returns the number of buckets. + * @return The number of buckets. + */ + [[nodiscard]] size_type bucket_count() const { + return sparse.first().size(); + } + + /** + * @brief Returns the maximum number of buckets. + * @return The maximum number of buckets. + */ + [[nodiscard]] size_type max_bucket_count() const { + return sparse.first().max_size(); + } + + /** + * @brief Returns the number of elements in a given bucket. + * @param index The index of the bucket to examine. + * @return The number of elements in the given bucket. + */ + [[nodiscard]] size_type bucket_size(const size_type index) const { + return static_cast(std::distance(begin(index), end(index))); + } + + /** + * @brief Returns the bucket for a given key. + * @param key The value of the key to examine. + * @return The bucket for the given key. + */ + [[nodiscard]] size_type bucket(const key_type &key) const { + return key_to_bucket(key); + } + + /** + * @brief Returns the average number of elements per bucket. + * @return The average number of elements per bucket. + */ + [[nodiscard]] float load_factor() const { + return size() / static_cast(bucket_count()); + } + + /** + * @brief Returns the maximum average number of elements per bucket. + * @return The maximum average number of elements per bucket. + */ + [[nodiscard]] float max_load_factor() const { + return threshold; + } + + /** + * @brief Sets the desired maximum average number of elements per bucket. + * @param value A desired maximum average number of elements per bucket. + */ + void max_load_factor(const float value) { + ENTT_ASSERT(value > 0.f, "Invalid load factor"); + threshold = value; + rehash(0u); + } + + /** + * @brief Reserves at least the specified number of buckets and regenerates + * the hash table. + * @param cnt New number of buckets. + */ + void rehash(const size_type cnt) { + auto value = cnt > minimum_capacity ? cnt : minimum_capacity; + const auto cap = static_cast(size() / max_load_factor()); + value = value > cap ? value : cap; + + if(const auto sz = next_power_of_two(value); sz != bucket_count()) { + sparse.first().resize(sz); + + for(auto &&elem: sparse.first()) { + elem = std::numeric_limits::max(); + } + + for(size_type pos{}, last = size(); pos < last; ++pos) { + const auto index = key_to_bucket(packed.first()[pos].element.first); + packed.first()[pos].next = std::exchange(sparse.first()[index], pos); + } + } + } + + /** + * @brief Reserves space for at least the specified number of elements and + * regenerates the hash table. + * @param cnt New number of elements. + */ + void reserve(const size_type cnt) { + packed.first().reserve(cnt); + rehash(static_cast(std::ceil(cnt / max_load_factor()))); + } + + /** + * @brief Returns the function used to hash the keys. + * @return The function used to hash the keys. + */ + [[nodiscard]] hasher hash_function() const { + return sparse.second(); + } + + /** + * @brief Returns the function used to compare keys for equality. + * @return The function used to compare keys for equality. + */ + [[nodiscard]] key_equal key_eq() const { + return packed.second(); + } + +private: + compressed_pair sparse; + compressed_pair packed; + float threshold; +}; + +} // namespace entt + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace std { + +template +struct uses_allocator, Allocator> + : std::true_type {}; + +} // namespace std + +/** + * Internal details not to be documented. + * @endcond + */ + +#endif diff --git a/LiteLoader/third-party/include/entt/container/dense_set.hpp b/LiteLoader/third-party/include/entt/container/dense_set.hpp new file mode 100644 index 0000000..ab5c1bb --- /dev/null +++ b/LiteLoader/third-party/include/entt/container/dense_set.hpp @@ -0,0 +1,895 @@ +#ifndef ENTT_CONTAINER_DENSE_SET_HPP +#define ENTT_CONTAINER_DENSE_SET_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/compressed_pair.hpp" +#include "../core/memory.hpp" +#include "../core/type_traits.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class dense_set_iterator final { + template + friend class dense_set_iterator; + +public: + using value_type = typename It::value_type::second_type; + using pointer = const value_type *; + using reference = const value_type &; + using difference_type = std::ptrdiff_t; + using iterator_category = std::random_access_iterator_tag; + + constexpr dense_set_iterator() noexcept + : it{} {} + + constexpr dense_set_iterator(const It iter) noexcept + : it{iter} {} + + template && std::is_constructible_v>> + constexpr dense_set_iterator(const dense_set_iterator &other) noexcept + : it{other.it} {} + + constexpr dense_set_iterator &operator++() noexcept { + return ++it, *this; + } + + constexpr dense_set_iterator operator++(int) noexcept { + dense_set_iterator orig = *this; + return ++(*this), orig; + } + + constexpr dense_set_iterator &operator--() noexcept { + return --it, *this; + } + + constexpr dense_set_iterator operator--(int) noexcept { + dense_set_iterator orig = *this; + return operator--(), orig; + } + + constexpr dense_set_iterator &operator+=(const difference_type value) noexcept { + it += value; + return *this; + } + + constexpr dense_set_iterator operator+(const difference_type value) const noexcept { + dense_set_iterator copy = *this; + return (copy += value); + } + + constexpr dense_set_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr dense_set_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return it[value].second; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return std::addressof(it->second); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *operator->(); + } + + template + friend constexpr std::ptrdiff_t operator-(const dense_set_iterator &, const dense_set_iterator &) noexcept; + + template + friend constexpr bool operator==(const dense_set_iterator &, const dense_set_iterator &) noexcept; + + template + friend constexpr bool operator<(const dense_set_iterator &, const dense_set_iterator &) noexcept; + +private: + It it; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return lhs.it - rhs.it; +} + +template +[[nodiscard]] constexpr bool operator==(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return lhs.it < rhs.it; +} + +template +[[nodiscard]] constexpr bool operator>(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return rhs < lhs; +} + +template +[[nodiscard]] constexpr bool operator<=(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const dense_set_iterator &lhs, const dense_set_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +template +class dense_set_local_iterator final { + template + friend class dense_set_local_iterator; + +public: + using value_type = typename It::value_type::second_type; + using pointer = const value_type *; + using reference = const value_type &; + using difference_type = std::ptrdiff_t; + using iterator_category = std::forward_iterator_tag; + + constexpr dense_set_local_iterator() noexcept + : it{}, + offset{} {} + + constexpr dense_set_local_iterator(It iter, const std::size_t pos) noexcept + : it{iter}, + offset{pos} {} + + template && std::is_constructible_v>> + constexpr dense_set_local_iterator(const dense_set_local_iterator &other) noexcept + : it{other.it}, + offset{other.offset} {} + + constexpr dense_set_local_iterator &operator++() noexcept { + return offset = it[offset].first, *this; + } + + constexpr dense_set_local_iterator operator++(int) noexcept { + dense_set_local_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return std::addressof(it[offset].second); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *operator->(); + } + + [[nodiscard]] constexpr std::size_t index() const noexcept { + return offset; + } + +private: + It it; + std::size_t offset; +}; + +template +[[nodiscard]] constexpr bool operator==(const dense_set_local_iterator &lhs, const dense_set_local_iterator &rhs) noexcept { + return lhs.index() == rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator!=(const dense_set_local_iterator &lhs, const dense_set_local_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Associative container for unique objects of a given type. + * + * Internally, elements are organized into buckets. Which bucket an element is + * placed into depends entirely on its hash. Elements with the same hash code + * appear in the same bucket. + * + * @tparam Type Value type of the associative container. + * @tparam Hash Type of function to use to hash the values. + * @tparam KeyEqual Type of function to use to compare the values for equality. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class dense_set { + static constexpr float default_threshold = 0.875f; + static constexpr std::size_t minimum_capacity = 8u; + + using node_type = std::pair; + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using sparse_container_type = std::vector>; + using packed_container_type = std::vector>; + + template + [[nodiscard]] std::size_t value_to_bucket(const Other &value) const noexcept { + return fast_mod(sparse.second()(value), bucket_count()); + } + + template + [[nodiscard]] auto constrained_find(const Other &value, std::size_t bucket) { + for(auto it = begin(bucket), last = end(bucket); it != last; ++it) { + if(packed.second()(*it, value)) { + return begin() + static_cast(it.index()); + } + } + + return end(); + } + + template + [[nodiscard]] auto constrained_find(const Other &value, std::size_t bucket) const { + for(auto it = cbegin(bucket), last = cend(bucket); it != last; ++it) { + if(packed.second()(*it, value)) { + return cbegin() + static_cast(it.index()); + } + } + + return cend(); + } + + template + [[nodiscard]] auto insert_or_do_nothing(Other &&value) { + const auto index = value_to_bucket(value); + + if(auto it = constrained_find(value, index); it != end()) { + return std::make_pair(it, false); + } + + packed.first().emplace_back(sparse.first()[index], std::forward(value)); + sparse.first()[index] = packed.first().size() - 1u; + rehash_if_required(); + + return std::make_pair(--end(), true); + } + + void move_and_pop(const std::size_t pos) { + if(const auto last = size() - 1u; pos != last) { + size_type *curr = sparse.first().data() + value_to_bucket(packed.first().back().second); + packed.first()[pos] = std::move(packed.first().back()); + for(; *curr != last; curr = &packed.first()[*curr].first) {} + *curr = pos; + } + + packed.first().pop_back(); + } + + void rehash_if_required() { + if(size() > (bucket_count() * max_load_factor())) { + rehash(bucket_count() * 2u); + } + } + +public: + /*! @brief Key type of the container. */ + using key_type = Type; + /*! @brief Value type of the container. */ + using value_type = Type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Type of function to use to hash the elements. */ + using hasher = Hash; + /*! @brief Type of function to use to compare the elements for equality. */ + using key_equal = KeyEqual; + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Random access iterator type. */ + using iterator = internal::dense_set_iterator; + /*! @brief Constant random access iterator type. */ + using const_iterator = internal::dense_set_iterator; + /*! @brief Forward iterator type. */ + using local_iterator = internal::dense_set_local_iterator; + /*! @brief Constant forward iterator type. */ + using const_local_iterator = internal::dense_set_local_iterator; + + /*! @brief Default constructor. */ + dense_set() + : dense_set{minimum_capacity} {} + + /** + * @brief Constructs an empty container with a given allocator. + * @param allocator The allocator to use. + */ + explicit dense_set(const allocator_type &allocator) + : dense_set{minimum_capacity, hasher{}, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator and user + * supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param allocator The allocator to use. + */ + dense_set(const size_type cnt, const allocator_type &allocator) + : dense_set{cnt, hasher{}, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator, hash + * function and user supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param hash Hash function to use. + * @param allocator The allocator to use. + */ + dense_set(const size_type cnt, const hasher &hash, const allocator_type &allocator) + : dense_set{cnt, hash, key_equal{}, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator, hash + * function, compare function and user supplied minimal number of buckets. + * @param cnt Minimal number of buckets. + * @param hash Hash function to use. + * @param equal Compare function to use. + * @param allocator The allocator to use. + */ + explicit dense_set(const size_type cnt, const hasher &hash = hasher{}, const key_equal &equal = key_equal{}, const allocator_type &allocator = allocator_type{}) + : sparse{allocator, hash}, + packed{allocator, equal}, + threshold{default_threshold} { + rehash(cnt); + } + + /*! @brief Default copy constructor. */ + dense_set(const dense_set &) = default; + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + dense_set(const dense_set &other, const allocator_type &allocator) + : sparse{std::piecewise_construct, std::forward_as_tuple(other.sparse.first(), allocator), std::forward_as_tuple(other.sparse.second())}, + packed{std::piecewise_construct, std::forward_as_tuple(other.packed.first(), allocator), std::forward_as_tuple(other.packed.second())}, + threshold{other.threshold} {} + + /*! @brief Default move constructor. */ + dense_set(dense_set &&) noexcept(std::is_nothrow_move_constructible_v> &&std::is_nothrow_move_constructible_v>) = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + dense_set(dense_set &&other, const allocator_type &allocator) + : sparse{std::piecewise_construct, std::forward_as_tuple(std::move(other.sparse.first()), allocator), std::forward_as_tuple(std::move(other.sparse.second()))}, + packed{std::piecewise_construct, std::forward_as_tuple(std::move(other.packed.first()), allocator), std::forward_as_tuple(std::move(other.packed.second()))}, + threshold{other.threshold} {} + + /** + * @brief Default copy assignment operator. + * @return This container. + */ + dense_set &operator=(const dense_set &) = default; + + /** + * @brief Default move assignment operator. + * @return This container. + */ + dense_set &operator=(dense_set &&) noexcept(std::is_nothrow_move_assignable_v> &&std::is_nothrow_move_assignable_v>) = default; + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return sparse.first().get_allocator(); + } + + /** + * @brief Returns an iterator to the beginning. + * + * The returned iterator points to the first instance of the internal array. + * If the array is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first instance of the internal array. + */ + [[nodiscard]] const_iterator cbegin() const noexcept { + return packed.first().begin(); + } + + /*! @copydoc cbegin */ + [[nodiscard]] const_iterator begin() const noexcept { + return cbegin(); + } + + /*! @copydoc begin */ + [[nodiscard]] iterator begin() noexcept { + return packed.first().begin(); + } + + /** + * @brief Returns an iterator to the end. + * + * The returned iterator points to the element following the last instance + * of the internal array. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the element following the last instance of the + * internal array. + */ + [[nodiscard]] const_iterator cend() const noexcept { + return packed.first().end(); + } + + /*! @copydoc cend */ + [[nodiscard]] const_iterator end() const noexcept { + return cend(); + } + + /*! @copydoc end */ + [[nodiscard]] iterator end() noexcept { + return packed.first().end(); + } + + /** + * @brief Checks whether a container is empty. + * @return True if the container is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return packed.first().empty(); + } + + /** + * @brief Returns the number of elements in a container. + * @return Number of elements in a container. + */ + [[nodiscard]] size_type size() const noexcept { + return packed.first().size(); + } + + /** + * @brief Returns the maximum possible number of elements. + * @return Maximum possible number of elements. + */ + [[nodiscard]] size_type max_size() const noexcept { + return packed.first().max_size(); + } + + /*! @brief Clears the container. */ + void clear() noexcept { + sparse.first().clear(); + packed.first().clear(); + rehash(0u); + } + + /** + * @brief Inserts an element into the container, if it does not exist. + * @param value An element to insert into the container. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + std::pair insert(const value_type &value) { + return insert_or_do_nothing(value); + } + + /*! @copydoc insert */ + std::pair insert(value_type &&value) { + return insert_or_do_nothing(std::move(value)); + } + + /** + * @brief Inserts elements into the container, if they do not exist. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + */ + template + void insert(It first, It last) { + for(; first != last; ++first) { + insert(*first); + } + } + + /** + * @brief Constructs an element in-place, if it does not exist. + * + * The element is also constructed when the container already has the key, + * in which case the newly constructed object is destroyed immediately. + * + * @tparam Args Types of arguments to forward to the constructor of the + * element. + * @param args Arguments to forward to the constructor of the element. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + template + std::pair emplace(Args &&...args) { + if constexpr(((sizeof...(Args) == 1u) && ... && std::is_same_v, value_type>)) { + return insert_or_do_nothing(std::forward(args)...); + } else { + auto &node = packed.first().emplace_back(std::piecewise_construct, std::make_tuple(packed.first().size()), std::forward_as_tuple(std::forward(args)...)); + const auto index = value_to_bucket(node.second); + + if(auto it = constrained_find(node.second, index); it != end()) { + packed.first().pop_back(); + return std::make_pair(it, false); + } + + std::swap(node.first, sparse.first()[index]); + rehash_if_required(); + + return std::make_pair(--end(), true); + } + } + + /** + * @brief Removes an element from a given position. + * @param pos An iterator to the element to remove. + * @return An iterator following the removed element. + */ + iterator erase(const_iterator pos) { + const auto diff = pos - cbegin(); + erase(*pos); + return begin() + diff; + } + + /** + * @brief Removes the given elements from a container. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + * @return An iterator following the last removed element. + */ + iterator erase(const_iterator first, const_iterator last) { + const auto dist = first - cbegin(); + + for(auto from = last - cbegin(); from != dist; --from) { + erase(packed.first()[from - 1u].second); + } + + return (begin() + dist); + } + + /** + * @brief Removes the element associated with a given value. + * @param value Value of an element to remove. + * @return Number of elements removed (either 0 or 1). + */ + size_type erase(const value_type &value) { + for(size_type *curr = sparse.first().data() + value_to_bucket(value); *curr != (std::numeric_limits::max)(); curr = &packed.first()[*curr].first) { + if(packed.second()(packed.first()[*curr].second, value)) { + const auto index = *curr; + *curr = packed.first()[*curr].first; + move_and_pop(index); + return 1u; + } + } + + return 0u; + } + + /** + * @brief Exchanges the contents with those of a given container. + * @param other Container to exchange the content with. + */ + void swap(dense_set &other) { + using std::swap; + swap(sparse, other.sparse); + swap(packed, other.packed); + swap(threshold, other.threshold); + } + + /** + * @brief Returns the number of elements matching a value (either 1 or 0). + * @param key Key value of an element to search for. + * @return Number of elements matching the key (either 1 or 0). + */ + [[nodiscard]] size_type count(const value_type &key) const { + return find(key) != end(); + } + + /** + * @brief Returns the number of elements matching a key (either 1 or 0). + * @tparam Other Type of the key value of an element to search for. + * @param key Key value of an element to search for. + * @return Number of elements matching the key (either 1 or 0). + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + count(const Other &key) const { + return find(key) != end(); + } + + /** + * @brief Finds an element with a given value. + * @param value Value of an element to search for. + * @return An iterator to an element with the given value. If no such + * element is found, a past-the-end iterator is returned. + */ + [[nodiscard]] iterator find(const value_type &value) { + return constrained_find(value, value_to_bucket(value)); + } + + /*! @copydoc find */ + [[nodiscard]] const_iterator find(const value_type &value) const { + return constrained_find(value, value_to_bucket(value)); + } + + /** + * @brief Finds an element that compares _equivalent_ to a given value. + * @tparam Other Type of an element to search for. + * @param value Value of an element to search for. + * @return An iterator to an element with the given value. If no such + * element is found, a past-the-end iterator is returned. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + find(const Other &value) { + return constrained_find(value, value_to_bucket(value)); + } + + /*! @copydoc find */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + find(const Other &value) const { + return constrained_find(value, value_to_bucket(value)); + } + + /** + * @brief Returns a range containing all elements with a given value. + * @param value Value of an element to search for. + * @return A pair of iterators pointing to the first element and past the + * last element of the range. + */ + [[nodiscard]] std::pair equal_range(const value_type &value) { + const auto it = find(value); + return {it, it + !(it == end())}; + } + + /*! @copydoc equal_range */ + [[nodiscard]] std::pair equal_range(const value_type &value) const { + const auto it = find(value); + return {it, it + !(it == cend())}; + } + + /** + * @brief Returns a range containing all elements that compare _equivalent_ + * to a given value. + * @tparam Other Type of an element to search for. + * @param value Value of an element to search for. + * @return A pair of iterators pointing to the first element and past the + * last element of the range. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t>> + equal_range(const Other &value) { + const auto it = find(value); + return {it, it + !(it == end())}; + } + + /*! @copydoc equal_range */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t>> + equal_range(const Other &value) const { + const auto it = find(value); + return {it, it + !(it == cend())}; + } + + /** + * @brief Checks if the container contains an element with a given value. + * @param value Value of an element to search for. + * @return True if there is such an element, false otherwise. + */ + [[nodiscard]] bool contains(const value_type &value) const { + return (find(value) != cend()); + } + + /** + * @brief Checks if the container contains an element that compares + * _equivalent_ to a given value. + * @tparam Other Type of an element to search for. + * @param value Value of an element to search for. + * @return True if there is such an element, false otherwise. + */ + template + [[nodiscard]] std::enable_if_t && is_transparent_v, std::conditional_t> + contains(const Other &value) const { + return (find(value) != cend()); + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] const_local_iterator cbegin(const size_type index) const { + return {packed.first().begin(), sparse.first()[index]}; + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] const_local_iterator begin(const size_type index) const { + return cbegin(index); + } + + /** + * @brief Returns an iterator to the beginning of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the beginning of the given bucket. + */ + [[nodiscard]] local_iterator begin(const size_type index) { + return {packed.first().begin(), sparse.first()[index]}; + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] const_local_iterator cend([[maybe_unused]] const size_type index) const { + return {packed.first().begin(), (std::numeric_limits::max)()}; + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] const_local_iterator end(const size_type index) const { + return cend(index); + } + + /** + * @brief Returns an iterator to the end of a given bucket. + * @param index An index of a bucket to access. + * @return An iterator to the end of the given bucket. + */ + [[nodiscard]] local_iterator end([[maybe_unused]] const size_type index) { + return {packed.first().begin(), (std::numeric_limits::max)()}; + } + + /** + * @brief Returns the number of buckets. + * @return The number of buckets. + */ + [[nodiscard]] size_type bucket_count() const { + return sparse.first().size(); + } + + /** + * @brief Returns the maximum number of buckets. + * @return The maximum number of buckets. + */ + [[nodiscard]] size_type max_bucket_count() const { + return sparse.first().max_size(); + } + + /** + * @brief Returns the number of elements in a given bucket. + * @param index The index of the bucket to examine. + * @return The number of elements in the given bucket. + */ + [[nodiscard]] size_type bucket_size(const size_type index) const { + return static_cast(std::distance(begin(index), end(index))); + } + + /** + * @brief Returns the bucket for a given element. + * @param value The value of the element to examine. + * @return The bucket for the given element. + */ + [[nodiscard]] size_type bucket(const value_type &value) const { + return value_to_bucket(value); + } + + /** + * @brief Returns the average number of elements per bucket. + * @return The average number of elements per bucket. + */ + [[nodiscard]] float load_factor() const { + return size() / static_cast(bucket_count()); + } + + /** + * @brief Returns the maximum average number of elements per bucket. + * @return The maximum average number of elements per bucket. + */ + [[nodiscard]] float max_load_factor() const { + return threshold; + } + + /** + * @brief Sets the desired maximum average number of elements per bucket. + * @param value A desired maximum average number of elements per bucket. + */ + void max_load_factor(const float value) { + ENTT_ASSERT(value > 0.f, "Invalid load factor"); + threshold = value; + rehash(0u); + } + + /** + * @brief Reserves at least the specified number of buckets and regenerates + * the hash table. + * @param cnt New number of buckets. + */ + void rehash(const size_type cnt) { + auto value = cnt > minimum_capacity ? cnt : minimum_capacity; + const auto cap = static_cast(size() / max_load_factor()); + value = value > cap ? value : cap; + + if(const auto sz = next_power_of_two(value); sz != bucket_count()) { + sparse.first().resize(sz); + + for(auto &&elem: sparse.first()) { + elem = std::numeric_limits::max(); + } + + for(size_type pos{}, last = size(); pos < last; ++pos) { + const auto index = value_to_bucket(packed.first()[pos].second); + packed.first()[pos].first = std::exchange(sparse.first()[index], pos); + } + } + } + + /** + * @brief Reserves space for at least the specified number of elements and + * regenerates the hash table. + * @param cnt New number of elements. + */ + void reserve(const size_type cnt) { + packed.first().reserve(cnt); + rehash(static_cast(std::ceil(cnt / max_load_factor()))); + } + + /** + * @brief Returns the function used to hash the elements. + * @return The function used to hash the elements. + */ + [[nodiscard]] hasher hash_function() const { + return sparse.second(); + } + + /** + * @brief Returns the function used to compare elements for equality. + * @return The function used to compare elements for equality. + */ + [[nodiscard]] key_equal key_eq() const { + return packed.second(); + } + +private: + compressed_pair sparse; + compressed_pair packed; + float threshold; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/container/fwd.hpp b/LiteLoader/third-party/include/entt/container/fwd.hpp new file mode 100644 index 0000000..eb8098d --- /dev/null +++ b/LiteLoader/third-party/include/entt/container/fwd.hpp @@ -0,0 +1,26 @@ +#ifndef ENTT_CONTAINER_FWD_HPP +#define ENTT_CONTAINER_FWD_HPP + +#include +#include + +namespace entt { + +template< + typename Key, + typename Type, + typename = std::hash, + typename = std::equal_to, + typename = std::allocator>> +class dense_map; + +template< + typename Type, + typename = std::hash, + typename = std::equal_to, + typename = std::allocator> +class dense_set; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/core/algorithm.hpp b/LiteLoader/third-party/include/entt/core/algorithm.hpp similarity index 96% rename from LiteLoader/Header/third-party/entt/core/algorithm.hpp rename to LiteLoader/third-party/include/entt/core/algorithm.hpp index eda7e8d..44c47ef 100644 --- a/LiteLoader/Header/third-party/entt/core/algorithm.hpp +++ b/LiteLoader/third-party/include/entt/core/algorithm.hpp @@ -1,18 +1,15 @@ #ifndef ENTT_CORE_ALGORITHM_HPP #define ENTT_CORE_ALGORITHM_HPP - -#include -#include -#include #include #include +#include +#include +#include #include "utility.hpp" - namespace entt { - /** * @brief Function object to wrap `std::sort` in a class type. * @@ -36,12 +33,11 @@ struct std_sort { * @param args Arguments to forward to the sort function, if any. */ template, typename... Args> - void operator()(It first, It last, Compare compare = Compare{}, Args &&... args) const { + void operator()(It first, It last, Compare compare = Compare{}, Args &&...args) const { std::sort(std::forward(args)..., std::move(first), std::move(last), std::move(compare)); } }; - /*! @brief Function object for performing insertion sort. */ struct insertion_sort { /** @@ -62,8 +58,8 @@ struct insertion_sort { auto value = std::move(*it); auto pre = it; - for(; pre > first && compare(value, *(pre-1)); --pre) { - *pre = std::move(*(pre-1)); + for(; pre > first && compare(value, *(pre - 1)); --pre) { + *pre = std::move(*(pre - 1)); } *pre = std::move(value); @@ -72,7 +68,6 @@ struct insertion_sort { } }; - /** * @brief Function object for performing LSD radix sort. * @tparam Bit Number of bits processed per pass. @@ -137,8 +132,6 @@ struct radix_sort { } }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/core/any.hpp b/LiteLoader/third-party/include/entt/core/any.hpp new file mode 100644 index 0000000..0095a40 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/any.hpp @@ -0,0 +1,510 @@ +#ifndef ENTT_CORE_ANY_HPP +#define ENTT_CORE_ANY_HPP + +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/utility.hpp" +#include "fwd.hpp" +#include "type_info.hpp" +#include "type_traits.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +enum class any_operation : std::uint8_t { + copy, + move, + transfer, + assign, + destroy, + compare, + get +}; + +enum class any_policy : std::uint8_t { + owner, + ref, + cref +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief A SBO friendly, type-safe container for single values of any type. + * @tparam Len Size of the storage reserved for the small buffer optimization. + * @tparam Align Optional alignment requirement. + */ +template +class basic_any { + using operation = internal::any_operation; + using policy = internal::any_policy; + using vtable_type = const void *(const operation, const basic_any &, const void *); + + struct storage_type { + alignas(Align) std::byte data[Len + !Len]; + }; + + template + static constexpr bool in_situ = Len && alignof(Type) <= Align && sizeof(Type) <= Len &&std::is_nothrow_move_constructible_v; + + template + static const void *basic_vtable(const operation op, const basic_any &value, const void *other) { + static_assert(!std::is_same_v && std::is_same_v>, Type>, "Invalid type"); + const Type *element = nullptr; + + if constexpr(in_situ) { + element = value.owner() ? reinterpret_cast(&value.storage) : static_cast(value.instance); + } else { + element = static_cast(value.instance); + } + + switch(op) { + case operation::copy: + if constexpr(std::is_copy_constructible_v) { + static_cast(const_cast(other))->initialize(*element); + } + break; + case operation::move: + if constexpr(in_situ) { + if(value.owner()) { + return new(&static_cast(const_cast(other))->storage) Type{std::move(*const_cast(element))}; + } + } + + return (static_cast(const_cast(other))->instance = std::exchange(const_cast(value).instance, nullptr)); + case operation::transfer: + if constexpr(std::is_move_assignable_v) { + *const_cast(element) = std::move(*static_cast(const_cast(other))); + return other; + } + [[fallthrough]]; + case operation::assign: + if constexpr(std::is_copy_assignable_v) { + *const_cast(element) = *static_cast(other); + return other; + } + break; + case operation::destroy: + if constexpr(in_situ) { + element->~Type(); + } else if constexpr(std::is_array_v) { + delete[] element; + } else { + delete element; + } + break; + case operation::compare: + if constexpr(!std::is_function_v && !std::is_array_v && is_equality_comparable_v) { + return *element == *static_cast(other) ? other : nullptr; + } else { + return (element == other) ? other : nullptr; + } + case operation::get: + return element; + } + + return nullptr; + } + + template + void initialize([[maybe_unused]] Args &&...args) { + info = &type_id>>(); + + if constexpr(!std::is_void_v) { + vtable = basic_vtable>>; + + if constexpr(std::is_lvalue_reference_v) { + static_assert(sizeof...(Args) == 1u && (std::is_lvalue_reference_v && ...), "Invalid arguments"); + mode = std::is_const_v> ? policy::cref : policy::ref; + instance = (std::addressof(args), ...); + } else if constexpr(in_situ>>) { + if constexpr(sizeof...(Args) != 0u && std::is_aggregate_v>>) { + new(&storage) std::remove_cv_t>{std::forward(args)...}; + } else { + new(&storage) std::remove_cv_t>(std::forward(args)...); + } + } else { + if constexpr(sizeof...(Args) != 0u && std::is_aggregate_v>>) { + instance = new std::remove_cv_t>{std::forward(args)...}; + } else { + instance = new std::remove_cv_t>(std::forward(args)...); + } + } + } + } + + basic_any(const basic_any &other, const policy pol) noexcept + : instance{other.data()}, + info{other.info}, + vtable{other.vtable}, + mode{pol} {} + +public: + /*! @brief Size of the internal storage. */ + static constexpr auto length = Len; + /*! @brief Alignment requirement. */ + static constexpr auto alignment = Align; + + /*! @brief Default constructor. */ + constexpr basic_any() noexcept + : basic_any{std::in_place_type} {} + + /** + * @brief Constructs a wrapper by directly initializing the new object. + * @tparam Type Type of object to use to initialize the wrapper. + * @tparam Args Types of arguments to use to construct the new instance. + * @param args Parameters to use to construct the instance. + */ + template + explicit basic_any(std::in_place_type_t, Args &&...args) + : instance{}, + info{}, + vtable{}, + mode{policy::owner} { + initialize(std::forward(args)...); + } + + /** + * @brief Constructs a wrapper from a given value. + * @tparam Type Type of object to use to initialize the wrapper. + * @param value An instance of an object to use to initialize the wrapper. + */ + template, basic_any>>> + basic_any(Type &&value) + : basic_any{std::in_place_type>, std::forward(value)} {} + + /** + * @brief Copy constructor. + * @param other The instance to copy from. + */ + basic_any(const basic_any &other) + : basic_any{} { + if(other.vtable) { + other.vtable(operation::copy, other, this); + } + } + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_any(basic_any &&other) noexcept + : instance{}, + info{other.info}, + vtable{other.vtable}, + mode{other.mode} { + if(other.vtable) { + other.vtable(operation::move, other, this); + } + } + + /*! @brief Frees the internal storage, whatever it means. */ + ~basic_any() { + if(vtable && owner()) { + vtable(operation::destroy, *this, nullptr); + } + } + + /** + * @brief Copy assignment operator. + * @param other The instance to copy from. + * @return This any object. + */ + basic_any &operator=(const basic_any &other) { + reset(); + + if(other.vtable) { + other.vtable(operation::copy, other, this); + } + + return *this; + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This any object. + */ + basic_any &operator=(basic_any &&other) noexcept { + reset(); + + if(other.vtable) { + other.vtable(operation::move, other, this); + info = other.info; + vtable = other.vtable; + mode = other.mode; + } + + return *this; + } + + /** + * @brief Value assignment operator. + * @tparam Type Type of object to use to initialize the wrapper. + * @param value An instance of an object to use to initialize the wrapper. + * @return This any object. + */ + template + std::enable_if_t, basic_any>, basic_any &> + operator=(Type &&value) { + emplace>(std::forward(value)); + return *this; + } + + /** + * @brief Returns the object type if any, `type_id()` otherwise. + * @return The object type if any, `type_id()` otherwise. + */ + [[nodiscard]] const type_info &type() const noexcept { + return *info; + } + + /** + * @brief Returns an opaque pointer to the contained instance. + * @return An opaque pointer the contained instance, if any. + */ + [[nodiscard]] const void *data() const noexcept { + return vtable ? vtable(operation::get, *this, nullptr) : nullptr; + } + + /** + * @brief Returns an opaque pointer to the contained instance. + * @param req Expected type. + * @return An opaque pointer the contained instance, if any. + */ + [[nodiscard]] const void *data(const type_info &req) const noexcept { + return *info == req ? data() : nullptr; + } + + /** + * @brief Returns an opaque pointer to the contained instance. + * @return An opaque pointer the contained instance, if any. + */ + [[nodiscard]] void *data() noexcept { + return mode == policy::cref ? nullptr : const_cast(std::as_const(*this).data()); + } + + /** + * @brief Returns an opaque pointer to the contained instance. + * @param req Expected type. + * @return An opaque pointer the contained instance, if any. + */ + [[nodiscard]] void *data(const type_info &req) noexcept { + return mode == policy::cref ? nullptr : const_cast(std::as_const(*this).data(req)); + } + + /** + * @brief Replaces the contained object by creating a new instance directly. + * @tparam Type Type of object to use to initialize the wrapper. + * @tparam Args Types of arguments to use to construct the new instance. + * @param args Parameters to use to construct the instance. + */ + template + void emplace(Args &&...args) { + reset(); + initialize(std::forward(args)...); + } + + /** + * @brief Assigns a value to the contained object without replacing it. + * @param other The value to assign to the contained object. + * @return True in case of success, false otherwise. + */ + bool assign(const basic_any &other) { + if(vtable && mode != policy::cref && *info == *other.info) { + return (vtable(operation::assign, *this, other.data()) != nullptr); + } + + return false; + } + + /*! @copydoc assign */ + bool assign(basic_any &&other) { + if(vtable && mode != policy::cref && *info == *other.info) { + if(auto *val = other.data(); val) { + return (vtable(operation::transfer, *this, val) != nullptr); + } else { + return (vtable(operation::assign, *this, std::as_const(other).data()) != nullptr); + } + } + + return false; + } + + /*! @brief Destroys contained object */ + void reset() { + if(vtable && owner()) { + vtable(operation::destroy, *this, nullptr); + } + + // unnecessary but it helps to detect nasty bugs + ENTT_ASSERT((instance = nullptr) == nullptr, ""); + info = &type_id(); + vtable = nullptr; + mode = policy::owner; + } + + /** + * @brief Returns false if a wrapper is empty, true otherwise. + * @return False if the wrapper is empty, true otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return vtable != nullptr; + } + + /** + * @brief Checks if two wrappers differ in their content. + * @param other Wrapper with which to compare. + * @return False if the two objects differ in their content, true otherwise. + */ + [[nodiscard]] bool operator==(const basic_any &other) const noexcept { + if(vtable && *info == *other.info) { + return (vtable(operation::compare, *this, other.data()) != nullptr); + } + + return (!vtable && !other.vtable); + } + + /** + * @brief Checks if two wrappers differ in their content. + * @param other Wrapper with which to compare. + * @return True if the two objects differ in their content, false otherwise. + */ + [[nodiscard]] bool operator!=(const basic_any &other) const noexcept { + return !(*this == other); + } + + /** + * @brief Aliasing constructor. + * @return A wrapper that shares a reference to an unmanaged object. + */ + [[nodiscard]] basic_any as_ref() noexcept { + return basic_any{*this, (mode == policy::cref ? policy::cref : policy::ref)}; + } + + /*! @copydoc as_ref */ + [[nodiscard]] basic_any as_ref() const noexcept { + return basic_any{*this, policy::cref}; + } + + /** + * @brief Returns true if a wrapper owns its object, false otherwise. + * @return True if the wrapper owns its object, false otherwise. + */ + [[nodiscard]] bool owner() const noexcept { + return (mode == policy::owner); + } + +private: + union { + const void *instance; + storage_type storage; + }; + const type_info *info; + vtable_type *vtable; + policy mode; +}; + +/** + * @brief Performs type-safe access to the contained object. + * @tparam Type Type to which conversion is required. + * @tparam Len Size of the storage reserved for the small buffer optimization. + * @tparam Align Alignment requirement. + * @param data Target any object. + * @return The element converted to the requested type. + */ +template +Type any_cast(const basic_any &data) noexcept { + const auto *const instance = any_cast>(&data); + ENTT_ASSERT(instance, "Invalid instance"); + return static_cast(*instance); +} + +/*! @copydoc any_cast */ +template +Type any_cast(basic_any &data) noexcept { + // forces const on non-reference types to make them work also with wrappers for const references + auto *const instance = any_cast>(&data); + ENTT_ASSERT(instance, "Invalid instance"); + return static_cast(*instance); +} + +/*! @copydoc any_cast */ +template +Type any_cast(basic_any &&data) noexcept { + if constexpr(std::is_copy_constructible_v>>) { + if(auto *const instance = any_cast>(&data); instance) { + return static_cast(std::move(*instance)); + } else { + return any_cast(data); + } + } else { + auto *const instance = any_cast>(&data); + ENTT_ASSERT(instance, "Invalid instance"); + return static_cast(std::move(*instance)); + } +} + +/*! @copydoc any_cast */ +template +const Type *any_cast(const basic_any *data) noexcept { + const auto &info = type_id>(); + return static_cast(data->data(info)); +} + +/*! @copydoc any_cast */ +template +Type *any_cast(basic_any *data) noexcept { + if constexpr(std::is_const_v) { + // last attempt to make wrappers for const references return their values + return any_cast(&std::as_const(*data)); + } else { + const auto &info = type_id>(); + return static_cast(data->data(info)); + } +} + +/** + * @brief Constructs a wrapper from a given type, passing it all arguments. + * @tparam Type Type of object to use to initialize the wrapper. + * @tparam Len Size of the storage reserved for the small buffer optimization. + * @tparam Align Optional alignment requirement. + * @tparam Args Types of arguments to use to construct the new instance. + * @param args Parameters to use to construct the instance. + * @return A properly initialized wrapper for an object of the given type. + */ +template::length, std::size_t Align = basic_any::alignment, typename... Args> +basic_any make_any(Args &&...args) { + return basic_any{std::in_place_type, std::forward(args)...}; +} + +/** + * @brief Forwards its argument and avoids copies for lvalue references. + * @tparam Len Size of the storage reserved for the small buffer optimization. + * @tparam Align Optional alignment requirement. + * @tparam Type Type of argument to use to construct the new instance. + * @param value Parameter to use to construct the instance. + * @return A properly initialized and not necessarily owning wrapper. + */ +template::length, std::size_t Align = basic_any::alignment, typename Type> +basic_any forward_as_any(Type &&value) { + return basic_any{std::in_place_type, std::forward(value)}; +} + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/core/attribute.h b/LiteLoader/third-party/include/entt/core/attribute.h new file mode 100644 index 0000000..b1d0503 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/attribute.h @@ -0,0 +1,30 @@ +#ifndef ENTT_CORE_ATTRIBUTE_H +#define ENTT_CORE_ATTRIBUTE_H + +#ifndef ENTT_EXPORT +# if defined _WIN32 || defined __CYGWIN__ || defined _MSC_VER +# define ENTT_EXPORT __declspec(dllexport) +# define ENTT_IMPORT __declspec(dllimport) +# define ENTT_HIDDEN +# elif defined __GNUC__ && __GNUC__ >= 4 +# define ENTT_EXPORT __attribute__((visibility("default"))) +# define ENTT_IMPORT __attribute__((visibility("default"))) +# define ENTT_HIDDEN __attribute__((visibility("hidden"))) +# else /* Unsupported compiler */ +# define ENTT_EXPORT +# define ENTT_IMPORT +# define ENTT_HIDDEN +# endif +#endif + +#ifndef ENTT_API +# if defined ENTT_API_EXPORT +# define ENTT_API ENTT_EXPORT +# elif defined ENTT_API_IMPORT +# define ENTT_API ENTT_IMPORT +# else /* No API */ +# define ENTT_API +# endif +#endif + +#endif diff --git a/LiteLoader/third-party/include/entt/core/compressed_pair.hpp b/LiteLoader/third-party/include/entt/core/compressed_pair.hpp new file mode 100644 index 0000000..4971388 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/compressed_pair.hpp @@ -0,0 +1,279 @@ +#ifndef ENTT_CORE_COMPRESSED_PAIR_HPP +#define ENTT_CORE_COMPRESSED_PAIR_HPP + +#include +#include +#include +#include +#include "type_traits.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct compressed_pair_element { + using reference = Type &; + using const_reference = const Type &; + + template>> + constexpr compressed_pair_element() noexcept(std::is_nothrow_default_constructible_v) + : value{} {} + + template>, compressed_pair_element>>> + constexpr compressed_pair_element(Arg &&arg) noexcept(std::is_nothrow_constructible_v) + : value{std::forward(arg)} {} + + template + constexpr compressed_pair_element(std::tuple args, std::index_sequence) noexcept(std::is_nothrow_constructible_v) + : value{std::forward(std::get(args))...} {} + + [[nodiscard]] constexpr reference get() noexcept { + return value; + } + + [[nodiscard]] constexpr const_reference get() const noexcept { + return value; + } + +private: + Type value; +}; + +template +struct compressed_pair_element>>: Type { + using reference = Type &; + using const_reference = const Type &; + using base_type = Type; + + template>> + constexpr compressed_pair_element() noexcept(std::is_nothrow_default_constructible_v) + : base_type{} {} + + template>, compressed_pair_element>>> + constexpr compressed_pair_element(Arg &&arg) noexcept(std::is_nothrow_constructible_v) + : base_type{std::forward(arg)} {} + + template + constexpr compressed_pair_element(std::tuple args, std::index_sequence) noexcept(std::is_nothrow_constructible_v) + : base_type{std::forward(std::get(args))...} {} + + [[nodiscard]] constexpr reference get() noexcept { + return *this; + } + + [[nodiscard]] constexpr const_reference get() const noexcept { + return *this; + } +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief A compressed pair. + * + * A pair that exploits the _Empty Base Class Optimization_ (or _EBCO_) to + * reduce its final size to a minimum. + * + * @tparam First The type of the first element that the pair stores. + * @tparam Second The type of the second element that the pair stores. + */ +template +class compressed_pair final + : internal::compressed_pair_element, + internal::compressed_pair_element { + using first_base = internal::compressed_pair_element; + using second_base = internal::compressed_pair_element; + +public: + /*! @brief The type of the first element that the pair stores. */ + using first_type = First; + /*! @brief The type of the second element that the pair stores. */ + using second_type = Second; + + /** + * @brief Default constructor, conditionally enabled. + * + * This constructor is only available when the types that the pair stores + * are both at least default constructible. + * + * @tparam Dummy Dummy template parameter used for internal purposes. + */ + template && std::is_default_constructible_v>> + constexpr compressed_pair() noexcept(std::is_nothrow_default_constructible_v &&std::is_nothrow_default_constructible_v) + : first_base{}, + second_base{} {} + + /** + * @brief Copy constructor. + * @param other The instance to copy from. + */ + constexpr compressed_pair(const compressed_pair &other) noexcept(std::is_nothrow_copy_constructible_v &&std::is_nothrow_copy_constructible_v) = default; + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + constexpr compressed_pair(compressed_pair &&other) noexcept(std::is_nothrow_move_constructible_v &&std::is_nothrow_move_constructible_v) = default; + + /** + * @brief Constructs a pair from its values. + * @tparam Arg Type of value to use to initialize the first element. + * @tparam Other Type of value to use to initialize the second element. + * @param arg Value to use to initialize the first element. + * @param other Value to use to initialize the second element. + */ + template + constexpr compressed_pair(Arg &&arg, Other &&other) noexcept(std::is_nothrow_constructible_v &&std::is_nothrow_constructible_v) + : first_base{std::forward(arg)}, + second_base{std::forward(other)} {} + + /** + * @brief Constructs a pair by forwarding the arguments to its parts. + * @tparam Args Types of arguments to use to initialize the first element. + * @tparam Other Types of arguments to use to initialize the second element. + * @param args Arguments to use to initialize the first element. + * @param other Arguments to use to initialize the second element. + */ + template + constexpr compressed_pair(std::piecewise_construct_t, std::tuple args, std::tuple other) noexcept(std::is_nothrow_constructible_v &&std::is_nothrow_constructible_v) + : first_base{std::move(args), std::index_sequence_for{}}, + second_base{std::move(other), std::index_sequence_for{}} {} + + /** + * @brief Copy assignment operator. + * @param other The instance to copy from. + * @return This compressed pair object. + */ + constexpr compressed_pair &operator=(const compressed_pair &other) noexcept(std::is_nothrow_copy_assignable_v &&std::is_nothrow_copy_assignable_v) = default; + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This compressed pair object. + */ + constexpr compressed_pair &operator=(compressed_pair &&other) noexcept(std::is_nothrow_move_assignable_v &&std::is_nothrow_move_assignable_v) = default; + + /** + * @brief Returns the first element that a pair stores. + * @return The first element that a pair stores. + */ + [[nodiscard]] constexpr first_type &first() noexcept { + return static_cast(*this).get(); + } + + /*! @copydoc first */ + [[nodiscard]] constexpr const first_type &first() const noexcept { + return static_cast(*this).get(); + } + + /** + * @brief Returns the second element that a pair stores. + * @return The second element that a pair stores. + */ + [[nodiscard]] constexpr second_type &second() noexcept { + return static_cast(*this).get(); + } + + /*! @copydoc second */ + [[nodiscard]] constexpr const second_type &second() const noexcept { + return static_cast(*this).get(); + } + + /** + * @brief Swaps two compressed pair objects. + * @param other The compressed pair to swap with. + */ + constexpr void swap(compressed_pair &other) noexcept(std::is_nothrow_swappable_v &&std::is_nothrow_swappable_v) { + using std::swap; + swap(first(), other.first()); + swap(second(), other.second()); + } + + /** + * @brief Extracts an element from the compressed pair. + * @tparam Index An integer value that is either 0 or 1. + * @return Returns a reference to the first element if `Index` is 0 and a + * reference to the second element if `Index` is 1. + */ + template + constexpr decltype(auto) get() noexcept { + if constexpr(Index == 0u) { + return first(); + } else { + static_assert(Index == 1u, "Index out of bounds"); + return second(); + } + } + + /*! @copydoc get */ + template + constexpr decltype(auto) get() const noexcept { + if constexpr(Index == 0u) { + return first(); + } else { + static_assert(Index == 1u, "Index out of bounds"); + return second(); + } + } +}; + +/** + * @brief Deduction guide. + * @tparam Type Type of value to use to initialize the first element. + * @tparam Other Type of value to use to initialize the second element. + */ +template +compressed_pair(Type &&, Other &&) -> compressed_pair, std::decay_t>; + +/** + * @brief Swaps two compressed pair objects. + * @tparam First The type of the first element that the pairs store. + * @tparam Second The type of the second element that the pairs store. + * @param lhs A valid compressed pair object. + * @param rhs A valid compressed pair object. + */ +template +inline constexpr void swap(compressed_pair &lhs, compressed_pair &rhs) { + lhs.swap(rhs); +} + +} // namespace entt + +// disable structured binding support for clang 6, it messes when specializing tuple_size +#if !defined __clang_major__ || __clang_major__ > 6 +namespace std { + +/** + * @brief `std::tuple_size` specialization for `compressed_pair`s. + * @tparam First The type of the first element that the pair stores. + * @tparam Second The type of the second element that the pair stores. + */ +template +struct tuple_size>: integral_constant {}; + +/** + * @brief `std::tuple_element` specialization for `compressed_pair`s. + * @tparam Index The index of the type to return. + * @tparam First The type of the first element that the pair stores. + * @tparam Second The type of the second element that the pair stores. + */ +template +struct tuple_element>: conditional { + static_assert(Index < 2u, "Index out of bounds"); +}; + +} // namespace std +#endif + +#endif diff --git a/LiteLoader/third-party/include/entt/core/enum.hpp b/LiteLoader/third-party/include/entt/core/enum.hpp new file mode 100644 index 0000000..5922c2f --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/enum.hpp @@ -0,0 +1,97 @@ +#ifndef ENTT_CORE_ENUM_HPP +#define ENTT_CORE_ENUM_HPP + +#include + +namespace entt { + +/** + * @brief Enable bitmask support for enum classes. + * @tparam Type The enum type for which to enable bitmask support. + */ +template +struct enum_as_bitmask: std::false_type {}; + +/*! @copydoc enum_as_bitmask */ +template +struct enum_as_bitmask>: std::is_enum {}; + +/** + * @brief Helper variable template. + * @tparam Type The enum class type for which to enable bitmask support. + */ +template +inline constexpr bool enum_as_bitmask_v = enum_as_bitmask::value; + +} // namespace entt + +/** + * @brief Operator available for enums for which bitmask support is enabled. + * @tparam Type Enum class type. + * @param lhs The first value to use. + * @param rhs The second value to use. + * @return The result of invoking the operator on the underlying types of the + * two values provided. + */ +template +[[nodiscard]] constexpr std::enable_if_t, Type> +operator|(const Type lhs, const Type rhs) noexcept { + return static_cast(static_cast>(lhs) | static_cast>(rhs)); +} + +/*! @copydoc operator| */ +template +[[nodiscard]] constexpr std::enable_if_t, Type> +operator&(const Type lhs, const Type rhs) noexcept { + return static_cast(static_cast>(lhs) & static_cast>(rhs)); +} + +/*! @copydoc operator| */ +template +[[nodiscard]] constexpr std::enable_if_t, Type> +operator^(const Type lhs, const Type rhs) noexcept { + return static_cast(static_cast>(lhs) ^ static_cast>(rhs)); +} + +/** + * @brief Operator available for enums for which bitmask support is enabled. + * @tparam Type Enum class type. + * @param value The value to use. + * @return The result of invoking the operator on the underlying types of the + * value provided. + */ +template +[[nodiscard]] constexpr std::enable_if_t, Type> +operator~(const Type value) noexcept { + return static_cast(~static_cast>(value)); +} + +/*! @copydoc operator~ */ +template +[[nodiscard]] constexpr std::enable_if_t, bool> +operator!(const Type value) noexcept { + return !static_cast>(value); +} + +/*! @copydoc operator| */ +template +constexpr std::enable_if_t, Type &> +operator|=(Type &lhs, const Type rhs) noexcept { + return (lhs = (lhs | rhs)); +} + +/*! @copydoc operator| */ +template +constexpr std::enable_if_t, Type &> +operator&=(Type &lhs, const Type rhs) noexcept { + return (lhs = (lhs & rhs)); +} + +/*! @copydoc operator| */ +template +constexpr std::enable_if_t, Type &> +operator^=(Type &lhs, const Type rhs) noexcept { + return (lhs = (lhs ^ rhs)); +} + +#endif diff --git a/LiteLoader/Header/third-party/entt/core/family.hpp b/LiteLoader/third-party/include/entt/core/family.hpp similarity index 86% rename from LiteLoader/Header/third-party/entt/core/family.hpp rename to LiteLoader/third-party/include/entt/core/family.hpp index de0a8ce..642ae2f 100644 --- a/LiteLoader/Header/third-party/entt/core/family.hpp +++ b/LiteLoader/third-party/include/entt/core/family.hpp @@ -1,14 +1,11 @@ #ifndef ENTT_CORE_FAMILY_HPP #define ENTT_CORE_FAMILY_HPP - #include "../config/config.h" #include "fwd.hpp" - namespace entt { - /** * @brief Dynamic identifier generator. * @@ -22,16 +19,14 @@ class family { public: /*! @brief Unsigned integer type. */ - using family_type = id_type; + using value_type = id_type; /*! @brief Statically generated unique identifier for the given type. */ template // at the time I'm writing, clang crashes during compilation if auto is used instead of family_type - inline static const family_type type = identifier++; + inline static const value_type value = identifier++; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/core/fwd.hpp b/LiteLoader/third-party/include/entt/core/fwd.hpp similarity index 81% rename from LiteLoader/Header/third-party/entt/core/fwd.hpp rename to LiteLoader/third-party/include/entt/core/fwd.hpp index 193aad8..472ed12 100644 --- a/LiteLoader/Header/third-party/entt/core/fwd.hpp +++ b/LiteLoader/third-party/include/entt/core/fwd.hpp @@ -1,27 +1,20 @@ #ifndef ENTT_CORE_FWD_HPP #define ENTT_CORE_FWD_HPP - -#include +#include #include "../config/config.h" - namespace entt { - -template)> +template class basic_any; - /*! @brief Alias declaration for type identifiers. */ using id_type = ENTT_ID_TYPE; - /*! @brief Alias declaration for the most common use case. */ using any = basic_any<>; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/core/hashed_string.hpp b/LiteLoader/third-party/include/entt/core/hashed_string.hpp new file mode 100644 index 0000000..02a50a9 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/hashed_string.hpp @@ -0,0 +1,334 @@ +#ifndef ENTT_CORE_HASHED_STRING_HPP +#define ENTT_CORE_HASHED_STRING_HPP + +#include +#include +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct fnv1a_traits; + +template<> +struct fnv1a_traits { + using type = std::uint32_t; + static constexpr std::uint32_t offset = 2166136261; + static constexpr std::uint32_t prime = 16777619; +}; + +template<> +struct fnv1a_traits { + using type = std::uint64_t; + static constexpr std::uint64_t offset = 14695981039346656037ull; + static constexpr std::uint64_t prime = 1099511628211ull; +}; + +template +struct basic_hashed_string { + using value_type = Char; + using size_type = std::size_t; + using hash_type = id_type; + + const value_type *repr; + size_type length; + hash_type hash; +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Zero overhead unique identifier. + * + * A hashed string is a compile-time tool that allows users to use + * human-readable identifiers in the codebase while using their numeric + * counterparts at runtime.
+ * Because of that, a hashed string can also be used in constant expressions if + * required. + * + * @warning + * This class doesn't take ownership of user-supplied strings nor does it make a + * copy of them. + * + * @tparam Char Character type. + */ +template +class basic_hashed_string: internal::basic_hashed_string { + using base_type = internal::basic_hashed_string; + using hs_traits = internal::fnv1a_traits; + + struct const_wrapper { + // non-explicit constructor on purpose + constexpr const_wrapper(const Char *str) noexcept + : repr{str} {} + + const Char *repr; + }; + + // Fowler–Noll–Vo hash function v. 1a - the good + [[nodiscard]] static constexpr auto helper(const Char *str) noexcept { + base_type base{str, 0u, hs_traits::offset}; + + for(; str[base.length]; ++base.length) { + base.hash = (base.hash ^ static_cast(str[base.length])) * hs_traits::prime; + } + + return base; + } + + // Fowler–Noll–Vo hash function v. 1a - the good + [[nodiscard]] static constexpr auto helper(const Char *str, const std::size_t len) noexcept { + base_type base{str, len, hs_traits::offset}; + + for(size_type pos{}; pos < len; ++pos) { + base.hash = (base.hash ^ static_cast(str[pos])) * hs_traits::prime; + } + + return base; + } + +public: + /*! @brief Character type. */ + using value_type = typename base_type::value_type; + /*! @brief Unsigned integer type. */ + using size_type = typename base_type::size_type; + /*! @brief Unsigned integer type. */ + using hash_type = typename base_type::hash_type; + + /** + * @brief Returns directly the numeric representation of a string view. + * @param str Human-readable identifier. + * @param len Length of the string to hash. + * @return The numeric representation of the string. + */ + [[nodiscard]] static constexpr hash_type value(const value_type *str, const size_type len) noexcept { + return basic_hashed_string{str, len}; + } + + /** + * @brief Returns directly the numeric representation of a string. + * @tparam N Number of characters of the identifier. + * @param str Human-readable identifier. + * @return The numeric representation of the string. + */ + template + [[nodiscard]] static constexpr hash_type value(const value_type (&str)[N]) noexcept { + return basic_hashed_string{str}; + } + + /** + * @brief Returns directly the numeric representation of a string. + * @param wrapper Helps achieving the purpose by relying on overloading. + * @return The numeric representation of the string. + */ + [[nodiscard]] static constexpr hash_type value(const_wrapper wrapper) noexcept { + return basic_hashed_string{wrapper}; + } + + /*! @brief Constructs an empty hashed string. */ + constexpr basic_hashed_string() noexcept + : base_type{} {} + + /** + * @brief Constructs a hashed string from a string view. + * @param str Human-readable identifier. + * @param len Length of the string to hash. + */ + constexpr basic_hashed_string(const value_type *str, const size_type len) noexcept + : base_type{helper(str, len)} {} + + /** + * @brief Constructs a hashed string from an array of const characters. + * @tparam N Number of characters of the identifier. + * @param str Human-readable identifier. + */ + template + constexpr basic_hashed_string(const value_type (&str)[N]) noexcept + : base_type{helper(str)} {} + + /** + * @brief Explicit constructor on purpose to avoid constructing a hashed + * string directly from a `const value_type *`. + * + * @warning + * The lifetime of the string is not extended nor is it copied. + * + * @param wrapper Helps achieving the purpose by relying on overloading. + */ + explicit constexpr basic_hashed_string(const_wrapper wrapper) noexcept + : base_type{helper(wrapper.repr)} {} + + /** + * @brief Returns the size a hashed string. + * @return The size of the hashed string. + */ + [[nodiscard]] constexpr size_type size() const noexcept { + return base_type::length; + } + + /** + * @brief Returns the human-readable representation of a hashed string. + * @return The string used to initialize the hashed string. + */ + [[nodiscard]] constexpr const value_type *data() const noexcept { + return base_type::repr; + } + + /** + * @brief Returns the numeric representation of a hashed string. + * @return The numeric representation of the hashed string. + */ + [[nodiscard]] constexpr hash_type value() const noexcept { + return base_type::hash; + } + + /*! @copydoc data */ + [[nodiscard]] constexpr operator const value_type *() const noexcept { + return data(); + } + + /** + * @brief Returns the numeric representation of a hashed string. + * @return The numeric representation of the hashed string. + */ + [[nodiscard]] constexpr operator hash_type() const noexcept { + return value(); + } +}; + +/** + * @brief Deduction guide. + * @tparam Char Character type. + * @param str Human-readable identifier. + * @param len Length of the string to hash. + */ +template +basic_hashed_string(const Char *str, const std::size_t len) -> basic_hashed_string; + +/** + * @brief Deduction guide. + * @tparam Char Character type. + * @tparam N Number of characters of the identifier. + * @param str Human-readable identifier. + */ +template +basic_hashed_string(const Char (&str)[N]) -> basic_hashed_string; + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the two hashed strings are identical, false otherwise. + */ +template +[[nodiscard]] constexpr bool operator==(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return lhs.value() == rhs.value(); +} + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the two hashed strings differ, false otherwise. + */ +template +[[nodiscard]] constexpr bool operator!=(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return !(lhs == rhs); +} + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the first element is less than the second, false otherwise. + */ +template +[[nodiscard]] constexpr bool operator<(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return lhs.value() < rhs.value(); +} + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the first element is less than or equal to the second, false + * otherwise. + */ +template +[[nodiscard]] constexpr bool operator<=(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return !(rhs < lhs); +} + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the first element is greater than the second, false + * otherwise. + */ +template +[[nodiscard]] constexpr bool operator>(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return rhs < lhs; +} + +/** + * @brief Compares two hashed strings. + * @tparam Char Character type. + * @param lhs A valid hashed string. + * @param rhs A valid hashed string. + * @return True if the first element is greater than or equal to the second, + * false otherwise. + */ +template +[[nodiscard]] constexpr bool operator>=(const basic_hashed_string &lhs, const basic_hashed_string &rhs) noexcept { + return !(lhs < rhs); +} + +/*! @brief Aliases for common character types. */ +using hashed_string = basic_hashed_string; + +/*! @brief Aliases for common character types. */ +using hashed_wstring = basic_hashed_string; + +inline namespace literals { + +/** + * @brief User defined literal for hashed strings. + * @param str The literal without its suffix. + * @return A properly initialized hashed string. + */ +[[nodiscard]] constexpr hashed_string operator"" _hs(const char *str, std::size_t) noexcept { + return hashed_string{str}; +} + +/** + * @brief User defined literal for hashed wstrings. + * @param str The literal without its suffix. + * @return A properly initialized hashed wstring. + */ +[[nodiscard]] constexpr hashed_wstring operator"" _hws(const wchar_t *str, std::size_t) noexcept { + return hashed_wstring{str}; +} + +} // namespace literals + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/core/ident.hpp b/LiteLoader/third-party/include/entt/core/ident.hpp new file mode 100644 index 0000000..2ff6026 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/ident.hpp @@ -0,0 +1,35 @@ +#ifndef ENTT_CORE_IDENT_HPP +#define ENTT_CORE_IDENT_HPP + +#include +#include +#include +#include "fwd.hpp" +#include "type_traits.hpp" + +namespace entt { + +/** + * @brief Type integral identifiers. + * @tparam Type List of types for which to generate identifiers. + */ +template +class ident { + template + [[nodiscard]] static constexpr id_type get(std::index_sequence) noexcept { + static_assert((std::is_same_v || ...), "Invalid type"); + return (0 + ... + (std::is_same_v...>>> ? id_type{Index} : id_type{})); + } + +public: + /*! @brief Unsigned integer type. */ + using value_type = id_type; + + /*! @brief Statically generated unique identifier for the given type. */ + template + static constexpr value_type value = get>(std::index_sequence_for{}); +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/core/iterator.hpp b/LiteLoader/third-party/include/entt/core/iterator.hpp new file mode 100644 index 0000000..42db97e --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/iterator.hpp @@ -0,0 +1,197 @@ +#ifndef ENTT_CORE_ITERATOR_HPP +#define ENTT_CORE_ITERATOR_HPP + +#include +#include +#include +#include + +namespace entt { + +/** + * @brief Helper type to use as pointer with input iterators. + * @tparam Type of wrapped value. + */ +template +struct input_iterator_pointer final { + /*! @brief Value type. */ + using value_type = Type; + /*! @brief Pointer type. */ + using pointer = Type *; + /*! @brief Reference type. */ + using reference = Type &; + + /** + * @brief Constructs a proxy object by move. + * @param val Value to use to initialize the proxy object. + */ + constexpr input_iterator_pointer(value_type &&val) noexcept(std::is_nothrow_move_constructible_v) + : value{std::move(val)} {} + + /** + * @brief Access operator for accessing wrapped values. + * @return A pointer to the wrapped value. + */ + [[nodiscard]] constexpr pointer operator->() noexcept { + return std::addressof(value); + } + + /** + * @brief Dereference operator for accessing wrapped values. + * @return A reference to the wrapped value. + */ + [[nodiscard]] constexpr reference operator*() noexcept { + return value; + } + +private: + Type value; +}; + +/** + * @brief Plain iota iterator (waiting for C++20). + * @tparam Type Value type. + */ +template +class iota_iterator final { + static_assert(std::is_integral_v, "Not an integral type"); + +public: + /*! @brief Value type, likely an integral one. */ + using value_type = Type; + /*! @brief Invalid pointer type. */ + using pointer = void; + /*! @brief Non-reference type, same as value type. */ + using reference = value_type; + /*! @brief Difference type. */ + using difference_type = std::ptrdiff_t; + /*! @brief Iterator category. */ + using iterator_category = std::input_iterator_tag; + + /*! @brief Default constructor. */ + constexpr iota_iterator() noexcept + : current{} {} + + /** + * @brief Constructs an iota iterator from a given value. + * @param init The initial value assigned to the iota iterator. + */ + constexpr iota_iterator(const value_type init) noexcept + : current{init} {} + + /** + * @brief Pre-increment operator. + * @return This iota iterator. + */ + constexpr iota_iterator &operator++() noexcept { + return ++current, *this; + } + + /** + * @brief Post-increment operator. + * @return This iota iterator. + */ + constexpr iota_iterator operator++(int) noexcept { + iota_iterator orig = *this; + return ++(*this), orig; + } + + /** + * @brief Dereference operator. + * @return The underlying value. + */ + [[nodiscard]] constexpr reference operator*() const noexcept { + return current; + } + +private: + value_type current; +}; + +/** + * @brief Comparison operator. + * @tparam Type Value type of the iota iterator. + * @param lhs A properly initialized iota iterator. + * @param rhs A properly initialized iota iterator. + * @return True if the two iterators are identical, false otherwise. + */ +template +[[nodiscard]] constexpr bool operator==(const iota_iterator &lhs, const iota_iterator &rhs) noexcept { + return *lhs == *rhs; +} + +/** + * @brief Comparison operator. + * @tparam Type Value type of the iota iterator. + * @param lhs A properly initialized iota iterator. + * @param rhs A properly initialized iota iterator. + * @return True if the two iterators differ, false otherwise. + */ +template +[[nodiscard]] constexpr bool operator!=(const iota_iterator &lhs, const iota_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +/** + * @brief Utility class to create an iterable object from a pair of iterators. + * @tparam It Type of iterator. + * @tparam Sentinel Type of sentinel. + */ +template +struct iterable_adaptor final { + /*! @brief Value type. */ + using value_type = typename std::iterator_traits::value_type; + /*! @brief Iterator type. */ + using iterator = It; + /*! @brief Sentinel type. */ + using sentinel = Sentinel; + + /*! @brief Default constructor. */ + constexpr iterable_adaptor() noexcept(std::is_nothrow_default_constructible_v &&std::is_nothrow_default_constructible_v) + : first{}, + last{} {} + + /** + * @brief Creates an iterable object from a pair of iterators. + * @param from Begin iterator. + * @param to End iterator. + */ + constexpr iterable_adaptor(iterator from, sentinel to) noexcept(std::is_nothrow_move_constructible_v &&std::is_nothrow_move_constructible_v) + : first{std::move(from)}, + last{std::move(to)} {} + + /** + * @brief Returns an iterator to the beginning. + * @return An iterator to the first element of the range. + */ + [[nodiscard]] constexpr iterator begin() const noexcept { + return first; + } + + /** + * @brief Returns an iterator to the end. + * @return An iterator to the element following the last element of the + * range. + */ + [[nodiscard]] constexpr sentinel end() const noexcept { + return last; + } + + /*! @copydoc begin */ + [[nodiscard]] constexpr iterator cbegin() const noexcept { + return begin(); + } + + /*! @copydoc end */ + [[nodiscard]] constexpr sentinel cend() const noexcept { + return end(); + } + +private: + It first; + Sentinel last; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/core/memory.hpp b/LiteLoader/third-party/include/entt/core/memory.hpp new file mode 100644 index 0000000..d4e44f4 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/memory.hpp @@ -0,0 +1,289 @@ +#ifndef ENTT_CORE_MEMORY_HPP +#define ENTT_CORE_MEMORY_HPP + +#include +#include +#include +#include +#include +#include +#include "../config/config.h" + +namespace entt { + +/** + * @brief Checks whether a value is a power of two or not. + * @param value A value that may or may not be a power of two. + * @return True if the value is a power of two, false otherwise. + */ +[[nodiscard]] inline constexpr bool is_power_of_two(const std::size_t value) noexcept { + return value && ((value & (value - 1)) == 0); +} + +/** + * @brief Computes the smallest power of two greater than or equal to a value. + * @param value The value to use. + * @return The smallest power of two greater than or equal to the given value. + */ +[[nodiscard]] inline constexpr std::size_t next_power_of_two(const std::size_t value) noexcept { + ENTT_ASSERT_CONSTEXPR(value < (std::size_t{1u} << (std::numeric_limits::digits - 1)), "Numeric limits exceeded"); + std::size_t curr = value - (value != 0u); + + for(int next = 1; next < std::numeric_limits::digits; next = next * 2) { + curr |= curr >> next; + } + + return ++curr; +} + +/** + * @brief Fast module utility function (powers of two only). + * @param value A value for which to calculate the modulus. + * @param mod _Modulus_, it must be a power of two. + * @return The common remainder. + */ +[[nodiscard]] inline constexpr std::size_t fast_mod(const std::size_t value, const std::size_t mod) noexcept { + ENTT_ASSERT_CONSTEXPR(is_power_of_two(mod), "Value must be a power of two"); + return value & (mod - 1u); +} + +/** + * @brief Unwraps fancy pointers, does nothing otherwise (waiting for C++20). + * @tparam Type Pointer type. + * @param ptr Fancy or raw pointer. + * @return A raw pointer that represents the address of the original pointer. + */ +template +[[nodiscard]] constexpr auto to_address(Type &&ptr) noexcept { + if constexpr(std::is_pointer_v>) { + return ptr; + } else { + return to_address(std::forward(ptr).operator->()); + } +} + +/** + * @brief Utility function to design allocation-aware containers. + * @tparam Allocator Type of allocator. + * @param lhs A valid allocator. + * @param rhs Another valid allocator. + */ +template +constexpr void propagate_on_container_copy_assignment([[maybe_unused]] Allocator &lhs, [[maybe_unused]] Allocator &rhs) noexcept { + if constexpr(std::allocator_traits::propagate_on_container_copy_assignment::value) { + lhs = rhs; + } +} + +/** + * @brief Utility function to design allocation-aware containers. + * @tparam Allocator Type of allocator. + * @param lhs A valid allocator. + * @param rhs Another valid allocator. + */ +template +constexpr void propagate_on_container_move_assignment([[maybe_unused]] Allocator &lhs, [[maybe_unused]] Allocator &rhs) noexcept { + if constexpr(std::allocator_traits::propagate_on_container_move_assignment::value) { + lhs = std::move(rhs); + } +} + +/** + * @brief Utility function to design allocation-aware containers. + * @tparam Allocator Type of allocator. + * @param lhs A valid allocator. + * @param rhs Another valid allocator. + */ +template +constexpr void propagate_on_container_swap([[maybe_unused]] Allocator &lhs, [[maybe_unused]] Allocator &rhs) noexcept { + if constexpr(std::allocator_traits::propagate_on_container_swap::value) { + using std::swap; + swap(lhs, rhs); + } else { + ENTT_ASSERT_CONSTEXPR(lhs == rhs, "Cannot swap the containers"); + } +} + +/** + * @brief Deleter for allocator-aware unique pointers (waiting for C++20). + * @tparam Args Types of arguments to use to construct the object. + */ +template +struct allocation_deleter: private Allocator { + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Pointer type. */ + using pointer = typename std::allocator_traits::pointer; + + /** + * @brief Inherited constructors. + * @param alloc The allocator to use. + */ + constexpr allocation_deleter(const allocator_type &alloc) noexcept(std::is_nothrow_copy_constructible_v) + : Allocator{alloc} {} + + /** + * @brief Destroys the pointed object and deallocates its memory. + * @param ptr A valid pointer to an object of the given type. + */ + constexpr void operator()(pointer ptr) noexcept(std::is_nothrow_destructible_v) { + using alloc_traits = typename std::allocator_traits; + alloc_traits::destroy(*this, to_address(ptr)); + alloc_traits::deallocate(*this, ptr, 1u); + } +}; + +/** + * @brief Allows `std::unique_ptr` to use allocators (waiting for C++20). + * @tparam Type Type of object to allocate for and to construct. + * @tparam Allocator Type of allocator used to manage memory and elements. + * @tparam Args Types of arguments to use to construct the object. + * @param allocator The allocator to use. + * @param args Parameters to use to construct the object. + * @return A properly initialized unique pointer with a custom deleter. + */ +template +ENTT_CONSTEXPR auto allocate_unique(Allocator &allocator, Args &&...args) { + static_assert(!std::is_array_v, "Array types are not supported"); + + using alloc_traits = typename std::allocator_traits::template rebind_traits; + using allocator_type = typename alloc_traits::allocator_type; + + allocator_type alloc{allocator}; + auto ptr = alloc_traits::allocate(alloc, 1u); + + ENTT_TRY { + alloc_traits::construct(alloc, to_address(ptr), std::forward(args)...); + } + ENTT_CATCH { + alloc_traits::deallocate(alloc, ptr, 1u); + ENTT_THROW; + } + + return std::unique_ptr>{ptr, alloc}; +} + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct uses_allocator_construction { + template + static constexpr auto args([[maybe_unused]] const Allocator &allocator, Params &&...params) noexcept { + if constexpr(!std::uses_allocator_v && std::is_constructible_v) { + return std::forward_as_tuple(std::forward(params)...); + } else { + static_assert(std::uses_allocator_v, "Ill-formed request"); + + if constexpr(std::is_constructible_v) { + return std::tuple{std::allocator_arg, allocator, std::forward(params)...}; + } else { + static_assert(std::is_constructible_v, "Ill-formed request"); + return std::forward_as_tuple(std::forward(params)..., allocator); + } + } + } +}; + +template +struct uses_allocator_construction> { + using type = std::pair; + + template + static constexpr auto args(const Allocator &allocator, std::piecewise_construct_t, First &&first, Second &&second) noexcept { + return std::make_tuple( + std::piecewise_construct, + std::apply([&allocator](auto &&...curr) { return uses_allocator_construction::args(allocator, std::forward(curr)...); }, std::forward(first)), + std::apply([&allocator](auto &&...curr) { return uses_allocator_construction::args(allocator, std::forward(curr)...); }, std::forward(second))); + } + + template + static constexpr auto args(const Allocator &allocator) noexcept { + return uses_allocator_construction::args(allocator, std::piecewise_construct, std::tuple<>{}, std::tuple<>{}); + } + + template + static constexpr auto args(const Allocator &allocator, First &&first, Second &&second) noexcept { + return uses_allocator_construction::args(allocator, std::piecewise_construct, std::forward_as_tuple(std::forward(first)), std::forward_as_tuple(std::forward(second))); + } + + template + static constexpr auto args(const Allocator &allocator, const std::pair &value) noexcept { + return uses_allocator_construction::args(allocator, std::piecewise_construct, std::forward_as_tuple(value.first), std::forward_as_tuple(value.second)); + } + + template + static constexpr auto args(const Allocator &allocator, std::pair &&value) noexcept { + return uses_allocator_construction::args(allocator, std::piecewise_construct, std::forward_as_tuple(std::move(value.first)), std::forward_as_tuple(std::move(value.second))); + } +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Uses-allocator construction utility (waiting for C++20). + * + * Primarily intended for internal use. Prepares the argument list needed to + * create an object of a given type by means of uses-allocator construction. + * + * @tparam Type Type to return arguments for. + * @tparam Allocator Type of allocator used to manage memory and elements. + * @tparam Args Types of arguments to use to construct the object. + * @param allocator The allocator to use. + * @param args Parameters to use to construct the object. + * @return The arguments needed to create an object of the given type. + */ +template +constexpr auto uses_allocator_construction_args(const Allocator &allocator, Args &&...args) noexcept { + return internal::uses_allocator_construction::args(allocator, std::forward(args)...); +} + +/** + * @brief Uses-allocator construction utility (waiting for C++20). + * + * Primarily intended for internal use. Creates an object of a given type by + * means of uses-allocator construction. + * + * @tparam Type Type of object to create. + * @tparam Allocator Type of allocator used to manage memory and elements. + * @tparam Args Types of arguments to use to construct the object. + * @param allocator The allocator to use. + * @param args Parameters to use to construct the object. + * @return A newly created object of the given type. + */ +template +constexpr Type make_obj_using_allocator(const Allocator &allocator, Args &&...args) { + return std::make_from_tuple(internal::uses_allocator_construction::args(allocator, std::forward(args)...)); +} + +/** + * @brief Uses-allocator construction utility (waiting for C++20). + * + * Primarily intended for internal use. Creates an object of a given type by + * means of uses-allocator construction at an uninitialized memory location. + * + * @tparam Type Type of object to create. + * @tparam Allocator Type of allocator used to manage memory and elements. + * @tparam Args Types of arguments to use to construct the object. + * @param value Memory location in which to place the object. + * @param allocator The allocator to use. + * @param args Parameters to use to construct the object. + * @return A pointer to the newly created object of the given type. + */ +template +constexpr Type *uninitialized_construct_using_allocator(Type *value, const Allocator &allocator, Args &&...args) { + return std::apply([value](auto &&...curr) { return new(value) Type(std::forward(curr)...); }, internal::uses_allocator_construction::args(allocator, std::forward(args)...)); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/core/monostate.hpp b/LiteLoader/third-party/include/entt/core/monostate.hpp similarity index 93% rename from LiteLoader/Header/third-party/entt/core/monostate.hpp rename to LiteLoader/third-party/include/entt/core/monostate.hpp index e25dd53..88225db 100644 --- a/LiteLoader/Header/third-party/entt/core/monostate.hpp +++ b/LiteLoader/third-party/include/entt/core/monostate.hpp @@ -1,14 +1,11 @@ #ifndef ENTT_CORE_MONOSTATE_HPP #define ENTT_CORE_MONOSTATE_HPP - #include "../config/config.h" #include "fwd.hpp" - namespace entt { - /** * @brief Minimal implementation of the monostate pattern. * @@ -28,7 +25,7 @@ struct monostate { * @param val User data to assign to the given key. */ template - void operator=(Type val) const ENTT_NOEXCEPT { + void operator=(Type val) const noexcept { value = val; } @@ -38,7 +35,7 @@ struct monostate { * @return Stored value, if any. */ template - operator Type() const ENTT_NOEXCEPT { + operator Type() const noexcept { return value; } @@ -47,7 +44,6 @@ private: inline static ENTT_MAYBE_ATOMIC(Type) value{}; }; - /** * @brief Helper variable template. * @tparam Value Value used to differentiate between different variables. @@ -55,8 +51,6 @@ private: template inline monostate monostate_v = {}; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/core/tuple.hpp b/LiteLoader/third-party/include/entt/core/tuple.hpp new file mode 100644 index 0000000..fa2147c --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/tuple.hpp @@ -0,0 +1,103 @@ +#ifndef ENTT_CORE_TUPLE_HPP +#define ENTT_CORE_TUPLE_HPP + +#include +#include +#include + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct is_tuple_impl: std::false_type {}; + +template +struct is_tuple_impl>: std::true_type {}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Provides the member constant `value` to true if a given type is a + * tuple, false otherwise. + * @tparam Type The type to test. + */ +template +struct is_tuple: internal::is_tuple_impl> {}; + +/** + * @brief Helper variable template. + * @tparam Type The type to test. + */ +template +inline constexpr bool is_tuple_v = is_tuple::value; + +/** + * @brief Utility function to unwrap tuples of a single element. + * @tparam Type Tuple type of any sizes. + * @param value A tuple object of the given type. + * @return The tuple itself if it contains more than one element, the first + * element otherwise. + */ +template +constexpr decltype(auto) unwrap_tuple(Type &&value) noexcept { + if constexpr(std::tuple_size_v> == 1u) { + return std::get<0>(std::forward(value)); + } else { + return std::forward(value); + } +} + +/** + * @brief Utility class to forward-and-apply tuple objects. + * @tparam Func Type of underlying invocable object. + */ +template +struct forward_apply: private Func { + /** + * @brief Constructs a forward-and-apply object. + * @tparam Args Types of arguments to use to construct the new instance. + * @param args Parameters to use to construct the instance. + */ + template + constexpr forward_apply(Args &&...args) noexcept(std::is_nothrow_constructible_v) + : Func{std::forward(args)...} {} + + /** + * @brief Forwards and applies the arguments with the underlying function. + * @tparam Type Tuple-like type to forward to the underlying function. + * @param args Parameters to forward to the underlying function. + * @return Return value of the underlying function, if any. + */ + template + constexpr decltype(auto) operator()(Type &&args) noexcept(noexcept(std::apply(std::declval(), args))) { + return std::apply(static_cast(*this), std::forward(args)); + } + + /*! @copydoc operator()() */ + template + constexpr decltype(auto) operator()(Type &&args) const noexcept(noexcept(std::apply(std::declval(), args))) { + return std::apply(static_cast(*this), std::forward(args)); + } +}; + +/** + * @brief Deduction guide. + * @tparam Func Type of underlying invocable object. + */ +template +forward_apply(Func) -> forward_apply>>; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/core/type_info.hpp b/LiteLoader/third-party/include/entt/core/type_info.hpp new file mode 100644 index 0000000..bcf4977 --- /dev/null +++ b/LiteLoader/third-party/include/entt/core/type_info.hpp @@ -0,0 +1,274 @@ +#ifndef ENTT_CORE_TYPE_INFO_HPP +#define ENTT_CORE_TYPE_INFO_HPP + +#include +#include +#include +#include "../config/config.h" +#include "../core/attribute.h" +#include "fwd.hpp" +#include "hashed_string.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +struct ENTT_API type_index final { + [[nodiscard]] static id_type next() noexcept { + static ENTT_MAYBE_ATOMIC(id_type) value{}; + return value++; + } +}; + +template +[[nodiscard]] constexpr auto stripped_type_name() noexcept { +#if defined ENTT_PRETTY_FUNCTION + std::string_view pretty_function{ENTT_PRETTY_FUNCTION}; + auto first = pretty_function.find_first_not_of(' ', pretty_function.find_first_of(ENTT_PRETTY_FUNCTION_PREFIX) + 1); + auto value = pretty_function.substr(first, pretty_function.find_last_of(ENTT_PRETTY_FUNCTION_SUFFIX) - first); + return value; +#else + return std::string_view{""}; +#endif +} + +template().find_first_of('.')> +[[nodiscard]] static constexpr std::string_view type_name(int) noexcept { + constexpr auto value = stripped_type_name(); + return value; +} + +template +[[nodiscard]] static std::string_view type_name(char) noexcept { + static const auto value = stripped_type_name(); + return value; +} + +template().find_first_of('.')> +[[nodiscard]] static constexpr id_type type_hash(int) noexcept { + constexpr auto stripped = stripped_type_name(); + constexpr auto value = hashed_string::value(stripped.data(), stripped.size()); + return value; +} + +template +[[nodiscard]] static id_type type_hash(char) noexcept { + static const auto value = [](const auto stripped) { + return hashed_string::value(stripped.data(), stripped.size()); + }(stripped_type_name()); + return value; +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Type sequential identifier. + * @tparam Type Type for which to generate a sequential identifier. + */ +template +struct ENTT_API type_index final { + /** + * @brief Returns the sequential identifier of a given type. + * @return The sequential identifier of a given type. + */ + [[nodiscard]] static id_type value() noexcept { + static const id_type value = internal::type_index::next(); + return value; + } + + /*! @copydoc value */ + [[nodiscard]] constexpr operator id_type() const noexcept { + return value(); + } +}; + +/** + * @brief Type hash. + * @tparam Type Type for which to generate a hash value. + */ +template +struct type_hash final { + /** + * @brief Returns the numeric representation of a given type. + * @return The numeric representation of the given type. + */ +#if defined ENTT_PRETTY_FUNCTION + [[nodiscard]] static constexpr id_type value() noexcept { + return internal::type_hash(0); +#else + [[nodiscard]] static constexpr id_type value() noexcept { + return type_index::value(); +#endif + } + + /*! @copydoc value */ + [[nodiscard]] constexpr operator id_type() const noexcept { + return value(); + } +}; + +/** + * @brief Type name. + * @tparam Type Type for which to generate a name. + */ +template +struct type_name final { + /** + * @brief Returns the name of a given type. + * @return The name of the given type. + */ + [[nodiscard]] static constexpr std::string_view value() noexcept { + return internal::type_name(0); + } + + /*! @copydoc value */ + [[nodiscard]] constexpr operator std::string_view() const noexcept { + return value(); + } +}; + +/*! @brief Implementation specific information about a type. */ +struct type_info final { + /** + * @brief Constructs a type info object for a given type. + * @tparam Type Type for which to construct a type info object. + */ + template + constexpr type_info(std::in_place_type_t) noexcept + : seq{type_index>>::value()}, + identifier{type_hash>>::value()}, + alias{type_name>>::value()} {} + + /** + * @brief Type index. + * @return Type index. + */ + [[nodiscard]] constexpr id_type index() const noexcept { + return seq; + } + + /** + * @brief Type hash. + * @return Type hash. + */ + [[nodiscard]] constexpr id_type hash() const noexcept { + return identifier; + } + + /** + * @brief Type name. + * @return Type name. + */ + [[nodiscard]] constexpr std::string_view name() const noexcept { + return alias; + } + +private: + id_type seq; + id_type identifier; + std::string_view alias; +}; + +/** + * @brief Compares the contents of two type info objects. + * @param lhs A type info object. + * @param rhs A type info object. + * @return True if the two type info objects are identical, false otherwise. + */ +[[nodiscard]] inline constexpr bool operator==(const type_info &lhs, const type_info &rhs) noexcept { + return lhs.hash() == rhs.hash(); +} + +/** + * @brief Compares the contents of two type info objects. + * @param lhs A type info object. + * @param rhs A type info object. + * @return True if the two type info objects differ, false otherwise. + */ +[[nodiscard]] inline constexpr bool operator!=(const type_info &lhs, const type_info &rhs) noexcept { + return !(lhs == rhs); +} + +/** + * @brief Compares two type info objects. + * @param lhs A valid type info object. + * @param rhs A valid type info object. + * @return True if the first element is less than the second, false otherwise. + */ +[[nodiscard]] constexpr bool operator<(const type_info &lhs, const type_info &rhs) noexcept { + return lhs.index() < rhs.index(); +} + +/** + * @brief Compares two type info objects. + * @param lhs A valid type info object. + * @param rhs A valid type info object. + * @return True if the first element is less than or equal to the second, false + * otherwise. + */ +[[nodiscard]] constexpr bool operator<=(const type_info &lhs, const type_info &rhs) noexcept { + return !(rhs < lhs); +} + +/** + * @brief Compares two type info objects. + * @param lhs A valid type info object. + * @param rhs A valid type info object. + * @return True if the first element is greater than the second, false + * otherwise. + */ +[[nodiscard]] constexpr bool operator>(const type_info &lhs, const type_info &rhs) noexcept { + return rhs < lhs; +} + +/** + * @brief Compares two type info objects. + * @param lhs A valid type info object. + * @param rhs A valid type info object. + * @return True if the first element is greater than or equal to the second, + * false otherwise. + */ +[[nodiscard]] constexpr bool operator>=(const type_info &lhs, const type_info &rhs) noexcept { + return !(lhs < rhs); +} + +/** + * @brief Returns the type info object associated to a given type. + * + * The returned element refers to an object with static storage duration.
+ * The type doesn't need to be a complete type. If the type is a reference, the + * result refers to the referenced type. In all cases, top-level cv-qualifiers + * are ignored. + * + * @tparam Type Type for which to generate a type info object. + * @return A reference to a properly initialized type info object. + */ +template +[[nodiscard]] const type_info &type_id() noexcept { + if constexpr(std::is_same_v>>) { + static type_info instance{std::in_place_type}; + return instance; + } else { + return type_id>>(); + } +} + +/*! @copydoc type_id */ +template +[[nodiscard]] const type_info &type_id(Type &&) noexcept { + return type_id>>(); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/core/type_traits.hpp b/LiteLoader/third-party/include/entt/core/type_traits.hpp similarity index 67% rename from LiteLoader/Header/third-party/entt/core/type_traits.hpp rename to LiteLoader/third-party/include/entt/core/type_traits.hpp index 2edcf5d..4352e2f 100644 --- a/LiteLoader/Header/third-party/entt/core/type_traits.hpp +++ b/LiteLoader/third-party/include/entt/core/type_traits.hpp @@ -1,7 +1,6 @@ #ifndef ENTT_CORE_TYPE_TRAITS_HPP #define ENTT_CORE_TYPE_TRAITS_HPP - #include #include #include @@ -9,10 +8,8 @@ #include "../config/config.h" #include "fwd.hpp" - namespace entt { - /** * @brief Utility class to disambiguate overloaded functions. * @tparam N Number of choices available. @@ -20,17 +17,13 @@ namespace entt { template struct choice_t // Unfortunately, doxygen cannot parse such a construct. - /*! @cond TURN_OFF_DOXYGEN */ - : choice_t - /*! @endcond */ + : /*! @cond TURN_OFF_DOXYGEN */ choice_t /*! @endcond */ {}; - /*! @copybrief choice_t */ template<> struct choice_t<0> {}; - /** * @brief Variable template for the choice trick. * @tparam N Number of choices available. @@ -38,7 +31,6 @@ struct choice_t<0> {}; template inline constexpr choice_t choice{}; - /** * @brief Identity type trait. * @@ -53,7 +45,6 @@ struct type_identity { using type = Type; }; - /** * @brief Helper type. * @tparam Type A type. @@ -61,7 +52,6 @@ struct type_identity { template using type_identity_t = typename type_identity::type; - /** * @brief A type-only `sizeof` wrapper that returns 0 where `sizeof` complains. * @tparam Type The type of which to return the size. @@ -70,30 +60,25 @@ using type_identity_t = typename type_identity::type; template struct size_of: std::integral_constant {}; - /*! @copydoc size_of */ template struct size_of> - : std::integral_constant -{}; - + : std::integral_constant {}; /** * @brief Helper variable template. * @tparam Type The type of which to return the size. */ -template +template inline constexpr std::size_t size_of_v = size_of::value; - /** * @brief Using declaration to be used to _repeat_ the same type a number of * times equal to the size of a given parameter pack. * @tparam Type A type to repeat. */ template -using unpack_as_t = Type; - +using unpack_as_type = Type; /** * @brief Helper variable template to be used to _repeat_ the same value a @@ -101,8 +86,7 @@ using unpack_as_t = Type; * @tparam Value A value to repeat. */ template -inline constexpr auto unpack_as_v = Value; - +inline constexpr auto unpack_as_value = Value; /** * @brief Wraps a static constant. @@ -111,7 +95,6 @@ inline constexpr auto unpack_as_v = Value; template using integral_constant = std::integral_constant; - /** * @brief Alias template to facilitate the creation of named values. * @tparam Value A constant value at least convertible to `id_type`. @@ -119,7 +102,6 @@ using integral_constant = std::integral_constant; template using tag = integral_constant; - /** * @brief A class to use to push around lists of types, nothing more. * @tparam Type Types provided by the type list. @@ -132,36 +114,31 @@ struct type_list { static constexpr auto size = sizeof...(Type); }; - /*! @brief Primary template isn't defined on purpose. */ template struct type_list_element; - /** * @brief Provides compile-time indexed access to the types of a type list. * @tparam Index Index of the type to return. - * @tparam Type First type provided by the type list. + * @tparam First First type provided by the type list. * @tparam Other Other types provided by the type list. */ -template -struct type_list_element> - : type_list_element> -{}; - +template +struct type_list_element> + : type_list_element> {}; /** * @brief Provides compile-time indexed access to the types of a type list. - * @tparam Type First type provided by the type list. + * @tparam First First type provided by the type list. * @tparam Other Other types provided by the type list. */ -template -struct type_list_element<0u, type_list> { +template +struct type_list_element<0u, type_list> { /*! @brief Searched type. */ - using type = Type; + using type = First; }; - /** * @brief Helper type. * @tparam Index Index of the type to return. @@ -170,6 +147,57 @@ struct type_list_element<0u, type_list> { template using type_list_element_t = typename type_list_element::type; +/*! @brief Primary template isn't defined on purpose. */ +template +struct type_list_index; + +/** + * @brief Provides compile-time type access to the types of a type list. + * @tparam Type Type to look for and for which to return the index. + * @tparam First First type provided by the type list. + * @tparam Other Other types provided by the type list. + */ +template +struct type_list_index> { + /*! @brief Unsigned integer type. */ + using value_type = std::size_t; + /*! @brief Compile-time position of the given type in the sublist. */ + static constexpr value_type value = 1u + type_list_index>::value; +}; + +/** + * @brief Provides compile-time type access to the types of a type list. + * @tparam Type Type to look for and for which to return the index. + * @tparam Other Other types provided by the type list. + */ +template +struct type_list_index> { + static_assert(type_list_index>::value == sizeof...(Other), "Non-unique type"); + /*! @brief Unsigned integer type. */ + using value_type = std::size_t; + /*! @brief Compile-time position of the given type in the sublist. */ + static constexpr value_type value = 0u; +}; + +/** + * @brief Provides compile-time type access to the types of a type list. + * @tparam Type Type to look for and for which to return the index. + */ +template +struct type_list_index> { + /*! @brief Unsigned integer type. */ + using value_type = std::size_t; + /*! @brief Compile-time position of the given type in the sublist. */ + static constexpr value_type value = 0u; +}; + +/** + * @brief Helper variable template. + * @tparam List Type list. + * @tparam Type Type to look for and for which to return the index. + */ +template +inline constexpr std::size_t type_list_index_v = type_list_index::value; /** * @brief Concatenates multiple type lists. @@ -178,14 +206,14 @@ using type_list_element_t = typename type_list_element::type; * @return A type list composed by the types of both the type lists. */ template -constexpr type_list operator+(type_list, type_list) { return {}; } - +constexpr type_list operator+(type_list, type_list) { + return {}; +} /*! @brief Primary template isn't defined on purpose. */ template struct type_list_cat; - /*! @brief Concatenates multiple type lists. */ template<> struct type_list_cat<> { @@ -193,7 +221,6 @@ struct type_list_cat<> { using type = type_list<>; }; - /** * @brief Concatenates multiple type lists. * @tparam Type Types provided by the first type list. @@ -206,7 +233,6 @@ struct type_list_cat, type_list, List...> { using type = typename type_list_cat, List...>::type; }; - /** * @brief Concatenates multiple type lists. * @tparam Type Types provided by the type list. @@ -217,7 +243,6 @@ struct type_list_cat> { using type = type_list; }; - /** * @brief Helper type. * @tparam List Type lists to concatenate. @@ -225,12 +250,10 @@ struct type_list_cat> { template using type_list_cat_t = typename type_list_cat::type; - /*! @brief Primary template isn't defined on purpose. */ template struct type_list_unique; - /** * @brief Removes duplicates types from a type list. * @tparam Type One of the types provided by the given type list. @@ -240,13 +263,11 @@ template struct type_list_unique> { /*! @brief A type list without duplicate types. */ using type = std::conditional_t< - std::disjunction_v...>, + (std::is_same_v || ...), typename type_list_unique>::type, - type_list_cat_t, typename type_list_unique>::type> - >; + type_list_cat_t, typename type_list_unique>::type>>; }; - /*! @brief Removes duplicates types from a type list. */ template<> struct type_list_unique> { @@ -254,7 +275,6 @@ struct type_list_unique> { using type = type_list<>; }; - /** * @brief Helper type. * @tparam Type A type list. @@ -262,7 +282,6 @@ struct type_list_unique> { template using type_list_unique_t = typename type_list_unique::type; - /** * @brief Provides the member constant `value` to true if a type list contains a * given type, false otherwise. @@ -272,7 +291,6 @@ using type_list_unique_t = typename type_list_unique::type; template struct type_list_contains; - /** * @copybrief type_list_contains * @tparam Type Types provided by the type list. @@ -281,21 +299,18 @@ struct type_list_contains; template struct type_list_contains, Other>: std::disjunction...> {}; - /** * @brief Helper variable template. * @tparam List Type list. * @tparam Type Type to look for. */ -template +template inline constexpr bool type_list_contains_v = type_list_contains::value; - /*! @brief Primary template isn't defined on purpose. */ template struct type_list_diff; - /** * @brief Computes the difference between two type lists. * @tparam Type Types provided by the first type list. @@ -307,7 +322,6 @@ struct type_list_diff, type_list> { using type = type_list_cat_t, Type>, type_list<>, type_list>...>; }; - /** * @brief Helper type. * @tparam List Type lists between which to compute the difference. @@ -315,6 +329,28 @@ struct type_list_diff, type_list> { template using type_list_diff_t = typename type_list_diff::type; +/*! @brief Primary template isn't defined on purpose. */ +template class> +struct type_list_transform; + +/** + * @brief Applies a given _function_ to a type list and generate a new list. + * @tparam Type Types provided by the type list. + * @tparam Op Unary operation as template class with a type member named `type`. + */ +template class Op> +struct type_list_transform, Op> { + /*! @brief Resulting type list after applying the transform function. */ + using type = type_list::type...>; +}; + +/** + * @brief Helper type. + * @tparam List Type list. + * @tparam Op Unary operation as template class with a type member named `type`. + */ +template class Op> +using type_list_transform_t = typename type_list_transform::type; /** * @brief A class to use to push around lists of constant values, nothing more. @@ -328,12 +364,10 @@ struct value_list { static constexpr auto size = sizeof...(Value); }; - /*! @brief Primary template isn't defined on purpose. */ template struct value_list_element; - /** * @brief Provides compile-time indexed access to the values of a value list. * @tparam Index Index of the value to return. @@ -342,9 +376,7 @@ struct value_list_element; */ template struct value_list_element> - : value_list_element> -{}; - + : value_list_element> {}; /** * @brief Provides compile-time indexed access to the types of a type list. @@ -357,7 +389,6 @@ struct value_list_element<0u, value_list> { static constexpr auto value = Value; }; - /** * @brief Helper type. * @tparam Index Index of the value to return. @@ -366,7 +397,6 @@ struct value_list_element<0u, value_list> { template inline constexpr auto value_list_element_v = value_list_element::value; - /** * @brief Concatenates multiple value lists. * @tparam Value Values provided by the first value list. @@ -374,14 +404,14 @@ inline constexpr auto value_list_element_v = value_list_element::va * @return A value list composed by the values of both the value lists. */ template -constexpr value_list operator+(value_list, value_list) { return {}; } - +constexpr value_list operator+(value_list, value_list) { + return {}; +} /*! @brief Primary template isn't defined on purpose. */ template struct value_list_cat; - /*! @brief Concatenates multiple value lists. */ template<> struct value_list_cat<> { @@ -389,7 +419,6 @@ struct value_list_cat<> { using type = value_list<>; }; - /** * @brief Concatenates multiple value lists. * @tparam Value Values provided by the first value list. @@ -402,7 +431,6 @@ struct value_list_cat, value_list, List...> { using type = typename value_list_cat, List...>::type; }; - /** * @brief Concatenates multiple value lists. * @tparam Value Values provided by the value list. @@ -413,7 +441,6 @@ struct value_list_cat> { using type = value_list; }; - /** * @brief Helper type. * @tparam List Value lists to concatenate. @@ -421,12 +448,10 @@ struct value_list_cat> { template using value_list_cat_t = typename value_list_cat::type; - /*! @brief Same as std::is_invocable, but with tuples. */ template struct is_applicable: std::false_type {}; - /** * @copybrief is_applicable * @tparam Func A valid function type. @@ -436,7 +461,6 @@ struct is_applicable: std::false_type {}; template class Tuple, typename... Args> struct is_applicable>: std::is_invocable {}; - /** * @copybrief is_applicable * @tparam Func A valid function type. @@ -446,7 +470,6 @@ struct is_applicable>: std::is_invocable {}; template class Tuple, typename... Args> struct is_applicable>: std::is_invocable {}; - /** * @brief Helper variable template. * @tparam Func A valid function type. @@ -455,12 +478,10 @@ struct is_applicable>: std::is_invocable inline constexpr bool is_applicable_v = is_applicable::value; - /*! @brief Same as std::is_invocable_r, but with tuples for arguments. */ template struct is_applicable_r: std::false_type {}; - /** * @copybrief is_applicable_r * @tparam Ret The type to which the return type of the function should be @@ -471,7 +492,6 @@ struct is_applicable_r: std::false_type {}; template struct is_applicable_r>: std::is_invocable_r {}; - /** * @brief Helper variable template. * @tparam Ret The type to which the return type of the function should be @@ -482,7 +502,6 @@ struct is_applicable_r>: std::is_invocable_r inline constexpr bool is_applicable_r_v = is_applicable_r::value; - /** * @brief Provides the member constant `value` to true if a given type is * complete, false otherwise. @@ -491,12 +510,10 @@ inline constexpr bool is_applicable_r_v = is_applicable_r::valu template struct is_complete: std::false_type {}; - /*! @copydoc is_complete */ template struct is_complete>: std::true_type {}; - /** * @brief Helper variable template. * @tparam Type The type to test. @@ -504,7 +521,6 @@ struct is_complete>: std::true_type {} template inline constexpr bool is_complete_v = is_complete::value; - /** * @brief Provides the member constant `value` to true if a given type is an * iterator, false otherwise. @@ -513,13 +529,30 @@ inline constexpr bool is_complete_v = is_complete::value; template struct is_iterator: std::false_type {}; +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct has_iterator_category: std::false_type {}; + +template +struct has_iterator_category::iterator_category>>: std::true_type {}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ /*! @copydoc is_iterator */ template -struct is_iterator::iterator_category>> - : std::true_type -{}; - +struct is_iterator>, void>>> + : internal::has_iterator_category {}; /** * @brief Helper variable template. @@ -528,86 +561,40 @@ struct is_iterator::iterat template inline constexpr bool is_iterator_v = is_iterator::value; - /** - * @brief Provides the member constant `value` to true if a given type is of the - * required iterator type, false otherwise. - * @tparam Type The type to test. - * @tparam It Required iterator type. + * @brief Provides the member constant `value` to true if a given type is both + * an empty and non-final class, false otherwise. + * @tparam Type The type to test */ -template -struct is_iterator_type: std::false_type {}; - - -/*! @copydoc is_iterator_type */ -template -struct is_iterator_type && std::is_same_v>> - : std::true_type -{}; - - -/*! @copydoc is_iterator_type */ -template -struct is_iterator_type, std::void_t>> - : is_iterator_type -{}; - +template +struct is_ebco_eligible + : std::conjunction, std::negation>> {}; /** * @brief Helper variable template. * @tparam Type The type to test. - * @tparam It Required iterator type. */ -template -inline constexpr bool is_iterator_type_v = is_iterator_type::value; - +template +inline constexpr bool is_ebco_eligible_v = is_ebco_eligible::value; /** - * @cond TURN_OFF_DOXYGEN - * Internal details not to be documented. + * @brief Provides the member constant `value` to true if `Type::is_transparent` + * is valid and denotes a type, false otherwise. + * @tparam Type The type to test. */ +template +struct is_transparent: std::false_type {}; - -namespace internal { - - -template -[[nodiscard]] constexpr bool is_equality_comparable(...) { return false; } - - +/*! @copydoc is_transparent */ template -[[nodiscard]] constexpr auto is_equality_comparable(choice_t<0>) --> decltype(std::declval() == std::declval()) { return true; } - - -template -[[nodiscard]] constexpr auto is_equality_comparable(choice_t<1>) --> decltype(std::declval(), std::declval() == std::declval()) { - if constexpr(is_iterator_v) { - return true; - } else if constexpr(std::is_same_v) { - return is_equality_comparable(choice<0>); - } else { - return is_equality_comparable(choice<2>); - } -} - - -template -[[nodiscard]] constexpr auto is_equality_comparable(choice_t<2>) --> decltype(std::declval(), std::declval() == std::declval()) { - return is_equality_comparable(choice<2>) && is_equality_comparable(choice<2>); -} - - -} - +struct is_transparent>: std::true_type {}; /** - * Internal details not to be documented. - * @endcond + * @brief Helper variable template. + * @tparam Type The type to test. */ - +template +inline constexpr bool is_transparent_v = is_transparent::value; /** * @brief Provides the member constant `value` to true if a given type is @@ -615,17 +602,70 @@ template * @tparam Type The type to test. */ template -struct is_equality_comparable: std::bool_constant(choice<2>)> {}; +struct is_equality_comparable: std::false_type {}; +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct has_tuple_size_value: std::false_type {}; + +template +struct has_tuple_size_value::value)>>: std::true_type {}; + +template +[[nodiscard]] constexpr bool unpack_maybe_equality_comparable(std::index_sequence) { + return (is_equality_comparable>::value && ...); +} + +template +[[nodiscard]] constexpr bool maybe_equality_comparable(choice_t<0>) { + return true; +} + +template +[[nodiscard]] constexpr auto maybe_equality_comparable(choice_t<1>) -> decltype(std::declval(), bool{}) { + if constexpr(is_iterator_v) { + return true; + } else if constexpr(std::is_same_v) { + return maybe_equality_comparable(choice<0>); + } else { + return is_equality_comparable::value; + } +} + +template +[[nodiscard]] constexpr std::enable_if_t>>, bool> maybe_equality_comparable(choice_t<2>) { + if constexpr(has_tuple_size_value::value) { + return unpack_maybe_equality_comparable(std::make_index_sequence::value>{}); + } else { + return maybe_equality_comparable(choice<1>); + } +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/*! @copydoc is_equality_comparable */ +template +struct is_equality_comparable() == std::declval())>> + : std::bool_constant(choice<2>)> {}; /** * @brief Helper variable template. * @tparam Type The type to test. */ -template +template inline constexpr bool is_equality_comparable_v = is_equality_comparable::value; - /** * @brief Transcribes the constness of a type to another type. * @tparam To The type to which to transcribe the constness. @@ -637,15 +677,13 @@ struct constness_as { using type = std::remove_const_t; }; - /*! @copydoc constness_as */ template struct constness_as { /*! @brief The type resulting from the transcription of the constness. */ - using type = std::add_const_t; + using type = const To; }; - /** * @brief Alias template to facilitate the transcription of the constness. * @tparam To The type to which to transcribe the constness. @@ -654,7 +692,6 @@ struct constness_as { template using constness_as_t = typename constness_as::type; - /** * @brief Extracts the class of a non-static member object or function. * @tparam Member A pointer to a non-static member object or function. @@ -664,20 +701,19 @@ class member_class { static_assert(std::is_member_pointer_v, "Invalid pointer type to non-static member object or function"); template - static Class * clazz(Ret(Class:: *)(Args...)); + static Class *clazz(Ret (Class::*)(Args...)); template - static Class * clazz(Ret(Class:: *)(Args...) const); + static Class *clazz(Ret (Class::*)(Args...) const); template - static Class * clazz(Type Class:: *); + static Class *clazz(Type Class::*); public: /*! @brief The class of the given non-static member object or function. */ using type = std::remove_pointer_t()))>; }; - /** * @brief Helper type. * @tparam Member A pointer to a non-static member object or function. @@ -685,8 +721,38 @@ public: template using member_class_t = typename member_class::type; +/** + * @brief Extracts the n-th argument of a given function or member function. + * @tparam Index The index of the argument to extract. + * @tparam Candidate A valid function, member function or data member. + */ +template +class nth_argument { + template + static constexpr type_list pick_up(Ret (*)(Args...)); -} + template + static constexpr type_list pick_up(Ret (Class ::*)(Args...)); + template + static constexpr type_list pick_up(Ret (Class ::*)(Args...) const); + + template + static constexpr type_list pick_up(Type Class ::*); + +public: + /*! @brief N-th argument of the given function or member function. */ + using type = type_list_element_t; +}; + +/** + * @brief Helper type. + * @tparam Index The index of the argument to extract. + * @tparam Candidate A valid function, member function or data member. + */ +template +using nth_argument_t = typename nth_argument::type; + +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/core/utility.hpp b/LiteLoader/third-party/include/entt/core/utility.hpp similarity index 69% rename from LiteLoader/Header/third-party/entt/core/utility.hpp rename to LiteLoader/third-party/include/entt/core/utility.hpp index 4e081b7..e38f689 100644 --- a/LiteLoader/Header/third-party/entt/core/utility.hpp +++ b/LiteLoader/third-party/include/entt/core/utility.hpp @@ -1,16 +1,16 @@ #ifndef ENTT_CORE_UTILITY_HPP #define ENTT_CORE_UTILITY_HPP - +#include #include -#include "../config/config.h" - namespace entt { - /*! @brief Identity function object (waiting for C++20). */ struct identity { + /*! @brief Indicates that this is a transparent function object. */ + using is_transparent = void; + /** * @brief Returns its argument unchanged. * @tparam Type Type of the argument. @@ -18,12 +18,11 @@ struct identity { * @return The submitted value as-is. */ template - [[nodiscard]] constexpr Type && operator()(Type &&value) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr Type &&operator()(Type &&value) const noexcept { return std::forward(value); } }; - /** * @brief Constant utility to disambiguate overloaded members of a class. * @tparam Type Type of the desired overload. @@ -32,8 +31,9 @@ struct identity { * @return Pointer to the member. */ template -[[nodiscard]] constexpr auto overload(Type Class:: *member) ENTT_NOEXCEPT { return member; } - +[[nodiscard]] constexpr auto overload(Type Class::*member) noexcept { + return member; +} /** * @brief Constant utility to disambiguate overloaded functions. @@ -42,8 +42,9 @@ template * @return Pointer to the function. */ template -[[nodiscard]] constexpr auto overload(Func *func) ENTT_NOEXCEPT { return func; } - +[[nodiscard]] constexpr auto overload(Func *func) noexcept { + return func; +} /** * @brief Helper type for visitors. @@ -54,15 +55,12 @@ struct overloaded: Func... { using Func::operator()...; }; - /** * @brief Deduction guide. * @tparam Func Types of function objects. */ template -overloaded(Func...) --> overloaded; - +overloaded(Func...) -> overloaded; /** * @brief Basic implementation of a y-combinator. @@ -74,9 +72,8 @@ struct y_combinator { * @brief Constructs a y-combinator from a given function. * @param recursive A potentially recursive function. */ - y_combinator(Func recursive): - func{std::move(recursive)} - {} + constexpr y_combinator(Func recursive) noexcept(std::is_nothrow_move_constructible_v) + : func{std::move(recursive)} {} /** * @brief Invokes a y-combinator and therefore its underlying function. @@ -84,14 +81,14 @@ struct y_combinator { * @param args Parameters to use to invoke the underlying function. * @return Return value of the underlying function, if any. */ - template - decltype(auto) operator()(Args &&... args) const { + template + constexpr decltype(auto) operator()(Args &&...args) const noexcept(std::is_nothrow_invocable_v) { return func(*this, std::forward(args)...); } /*! @copydoc operator()() */ - template - decltype(auto) operator()(Args &&... args) { + template + constexpr decltype(auto) operator()(Args &&...args) noexcept(std::is_nothrow_invocable_v) { return func(*this, std::forward(args)...); } @@ -99,8 +96,6 @@ private: Func func; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/entity/component.hpp b/LiteLoader/third-party/include/entt/entity/component.hpp new file mode 100644 index 0000000..07fc9f4 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/component.hpp @@ -0,0 +1,64 @@ +#ifndef ENTT_ENTITY_COMPONENT_HPP +#define ENTT_ENTITY_COMPONENT_HPP + +#include +#include +#include "../config/config.h" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct in_place_delete: std::bool_constant && std::is_move_assignable_v)> {}; + +template +struct in_place_delete> + : std::true_type {}; + +template +struct page_size: std::integral_constant * ENTT_PACKED_PAGE> {}; + +template +struct page_size>> + : std::integral_constant {}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Common way to access various properties of components. + * @tparam Type Type of component. + */ +template +struct component_traits { + static_assert(std::is_same_v, Type>, "Unsupported type"); + + /*! @brief Component type. */ + using type = Type; + + /*! @brief Pointer stability, default is `false`. */ + static constexpr bool in_place_delete = internal::in_place_delete::value; + /*! @brief Page size, default is `ENTT_PACKED_PAGE` for non-empty types. */ + static constexpr std::size_t page_size = internal::page_size::value; +}; + +/** + * @brief Helper variable template. + * @tparam Type Type of component. + */ +template +inline constexpr bool ignore_as_empty_v = (std::is_void_v || component_traits::page_size == 0u); + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/entity/entity.hpp b/LiteLoader/third-party/include/entt/entity/entity.hpp similarity index 53% rename from LiteLoader/Header/third-party/entt/entity/entity.hpp rename to LiteLoader/third-party/include/entt/entity/entity.hpp index 318c2ac..fd7c96b 100644 --- a/LiteLoader/Header/third-party/entt/entity/entity.hpp +++ b/LiteLoader/third-party/include/entt/entity/entity.hpp @@ -1,98 +1,85 @@ #ifndef ENTT_ENTITY_ENTITY_HPP #define ENTT_ENTITY_ENTITY_HPP - #include #include #include #include "../config/config.h" - +#include "fwd.hpp" namespace entt { - /** * @cond TURN_OFF_DOXYGEN * Internal details not to be documented. */ - namespace internal { - template struct entt_traits; - template struct entt_traits>> - : entt_traits> -{}; - + : entt_traits> {}; template struct entt_traits>> - : entt_traits -{}; - + : entt_traits {}; template<> struct entt_traits { using entity_type = std::uint32_t; using version_type = std::uint16_t; - using difference_type = std::int64_t; static constexpr entity_type entity_mask = 0xFFFFF; static constexpr entity_type version_mask = 0xFFF; static constexpr std::size_t entity_shift = 20u; }; - template<> struct entt_traits { using entity_type = std::uint64_t; using version_type = std::uint32_t; - using difference_type = std::int64_t; static constexpr entity_type entity_mask = 0xFFFFFFFF; static constexpr entity_type version_mask = 0xFFFFFFFF; static constexpr std::size_t entity_shift = 32u; }; - -} - +} // namespace internal /** * Internal details not to be documented. * @endcond */ - /** * @brief Entity traits. * @tparam Type Type of identifier. */ template -class entt_traits: private internal::entt_traits { - using traits_type = internal::entt_traits; +class entt_traits: internal::entt_traits { + using base_type = internal::entt_traits; public: /*! @brief Value type. */ using value_type = Type; /*! @brief Underlying entity type. */ - using entity_type = typename traits_type::entity_type; + using entity_type = typename base_type::entity_type; /*! @brief Underlying version type. */ - using version_type = typename traits_type::version_type; - /*! @brief Difference type. */ - using difference_type = typename traits_type::difference_type; + using version_type = typename base_type::version_type; + /*! @brief Reserved identifier. */ + static constexpr entity_type reserved = base_type::entity_mask | (base_type::version_mask << base_type::entity_shift); + /*! @brief Page size, default is `ENTT_SPARSE_PAGE`. */ + static constexpr auto page_size = ENTT_SPARSE_PAGE; /** * @brief Converts an entity to its underlying type. * @param value The value to convert. * @return The integral representation of the given value. */ - [[nodiscard]] static constexpr entity_type to_integral(const value_type value) ENTT_NOEXCEPT { + [[nodiscard]] static constexpr entity_type to_integral(const value_type value) noexcept { return static_cast(value); } @@ -101,8 +88,8 @@ public: * @param value The value to convert. * @return The integral representation of the entity part. */ - [[nodiscard]] static constexpr entity_type to_entity(const value_type value) ENTT_NOEXCEPT { - return (to_integral(value) & traits_type::entity_mask); + [[nodiscard]] static constexpr entity_type to_entity(const value_type value) noexcept { + return (to_integral(value) & base_type::entity_mask); } /** @@ -110,9 +97,8 @@ public: * @param value The value to convert. * @return The integral representation of the version part. */ - [[nodiscard]] static constexpr version_type to_version(const value_type value) ENTT_NOEXCEPT { - constexpr auto mask = (traits_type::version_mask << traits_type::entity_shift); - return ((to_integral(value) & mask) >> traits_type::entity_shift); + [[nodiscard]] static constexpr version_type to_version(const value_type value) noexcept { + return (to_integral(value) >> base_type::entity_shift); } /** @@ -125,34 +111,64 @@ public: * @param version The version part of the identifier. * @return A properly constructed identifier. */ - [[nodiscard]] static constexpr value_type construct(const entity_type entity = traits_type::entity_mask, const version_type version = traits_type::version_mask) ENTT_NOEXCEPT { - return value_type{(entity & traits_type::entity_mask) | (static_cast(version) << traits_type::entity_shift)}; + [[nodiscard]] static constexpr value_type construct(const entity_type entity, const version_type version) noexcept { + return value_type{(entity & base_type::entity_mask) | (static_cast(version) << base_type::entity_shift)}; + } + + /** + * @brief Combines two identifiers in a single one. + * + * The returned identifier is a copy of the first element except for its + * version, which is taken from the second element. + * + * @param lhs The identifier from which to take the entity part. + * @param rhs The identifier from which to take the version part. + * @return A properly constructed identifier. + */ + [[nodiscard]] static constexpr value_type combine(const entity_type lhs, const entity_type rhs) noexcept { + constexpr auto mask = (base_type::version_mask << base_type::entity_shift); + return value_type{(lhs & base_type::entity_mask) | (rhs & mask)}; } }; - /** - * @brief Converts an entity to its underlying type. + * @copydoc entt_traits::to_integral * @tparam Entity The value type. - * @param entity The value to convert. - * @return The integral representation of the given value. */ template -[[nodiscard]] constexpr auto to_integral(const Entity entity) ENTT_NOEXCEPT { - return entt_traits::to_integral(entity); +[[nodiscard]] constexpr typename entt_traits::entity_type to_integral(const Entity value) noexcept { + return entt_traits::to_integral(value); } +/** + * @copydoc entt_traits::to_entity + * @tparam Entity The value type. + */ +template +[[nodiscard]] constexpr typename entt_traits::entity_type to_entity(const Entity value) noexcept { + return entt_traits::to_entity(value); +} -/*! @brief Null object for all entity identifiers. */ +/** + * @copydoc entt_traits::to_version + * @tparam Entity The value type. + */ +template +[[nodiscard]] constexpr typename entt_traits::version_type to_version(const Entity value) noexcept { + return entt_traits::to_version(value); +} + +/*! @brief Null object for all identifiers. */ struct null_t { /** * @brief Converts the null object to identifiers of any type. - * @tparam Entity Type of entity identifier. + * @tparam Entity Type of identifier. * @return The null representation for the given type. */ template - [[nodiscard]] constexpr operator Entity() const ENTT_NOEXCEPT { - return entt_traits::construct(); + [[nodiscard]] constexpr operator Entity() const noexcept { + using entity_traits = entt_traits; + return entity_traits::combine(entity_traits::reserved, entity_traits::reserved); } /** @@ -160,7 +176,7 @@ struct null_t { * @param other A null object. * @return True in all cases. */ - [[nodiscard]] constexpr bool operator==([[maybe_unused]] const null_t other) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator==([[maybe_unused]] const null_t other) const noexcept { return true; } @@ -169,81 +185,69 @@ struct null_t { * @param other A null object. * @return False in all cases. */ - [[nodiscard]] constexpr bool operator!=([[maybe_unused]] const null_t other) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator!=([[maybe_unused]] const null_t other) const noexcept { return false; } /** - * @brief Compares a null object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a null object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @return False if the two elements differ, true otherwise. */ template - [[nodiscard]] constexpr bool operator==(const Entity entity) const ENTT_NOEXCEPT { - return entt_traits::to_entity(entity) == entt_traits::to_entity(*this); + [[nodiscard]] constexpr bool operator==(const Entity entity) const noexcept { + using entity_traits = entt_traits; + return entity_traits::to_entity(entity) == entity_traits::to_entity(*this); } /** - * @brief Compares a null object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a null object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @return True if the two elements differ, false otherwise. */ template - [[nodiscard]] constexpr bool operator!=(const Entity entity) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator!=(const Entity entity) const noexcept { return !(entity == *this); } - - /** - * @brief Creates a null object from an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier to turn into a null object. - * @return The null representation for the given identifier. - */ - template - [[nodiscard]] constexpr Entity operator|(const Entity entity) const ENTT_NOEXCEPT { - return entt_traits::construct(entt_traits::to_entity(*this), entt_traits::to_version(entity)); - } }; - /** - * @brief Compares a null object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a null object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @param other A null object yet to be converted. * @return False if the two elements differ, true otherwise. */ template -[[nodiscard]] constexpr bool operator==(const Entity entity, const null_t other) ENTT_NOEXCEPT { +[[nodiscard]] constexpr bool operator==(const Entity entity, const null_t other) noexcept { return other.operator==(entity); } - /** - * @brief Compares a null object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a null object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @param other A null object yet to be converted. * @return True if the two elements differ, false otherwise. */ template -[[nodiscard]] constexpr bool operator!=(const Entity entity, const null_t other) ENTT_NOEXCEPT { +[[nodiscard]] constexpr bool operator!=(const Entity entity, const null_t other) noexcept { return !(other == entity); } - -/*! @brief Tombstone object for all entity identifiers. */ +/*! @brief Tombstone object for all identifiers. */ struct tombstone_t { /** * @brief Converts the tombstone object to identifiers of any type. - * @tparam Entity Type of entity identifier. + * @tparam Entity Type of identifier. * @return The tombstone representation for the given type. */ template - [[nodiscard]] constexpr operator Entity() const ENTT_NOEXCEPT { - return entt_traits::construct(); + [[nodiscard]] constexpr operator Entity() const noexcept { + using entity_traits = entt_traits; + return entity_traits::combine(entity_traits::reserved, entity_traits::reserved); } /** @@ -251,7 +255,7 @@ struct tombstone_t { * @param other A tombstone object. * @return True in all cases. */ - [[nodiscard]] constexpr bool operator==([[maybe_unused]] const tombstone_t other) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator==([[maybe_unused]] const tombstone_t other) const noexcept { return true; } @@ -260,92 +264,76 @@ struct tombstone_t { * @param other A tombstone object. * @return False in all cases. */ - [[nodiscard]] constexpr bool operator!=([[maybe_unused]] const tombstone_t other) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator!=([[maybe_unused]] const tombstone_t other) const noexcept { return false; } /** - * @brief Compares a tombstone object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a tombstone object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @return False if the two elements differ, true otherwise. */ template - [[nodiscard]] constexpr bool operator==(const Entity entity) const ENTT_NOEXCEPT { - return entt_traits::to_version(entity) == entt_traits::to_version(*this); + [[nodiscard]] constexpr bool operator==(const Entity entity) const noexcept { + using entity_traits = entt_traits; + return entity_traits::to_version(entity) == entity_traits::to_version(*this); } /** - * @brief Compares a tombstone object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a tombstone object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @return True if the two elements differ, false otherwise. */ template - [[nodiscard]] constexpr bool operator!=(const Entity entity) const ENTT_NOEXCEPT { + [[nodiscard]] constexpr bool operator!=(const Entity entity) const noexcept { return !(entity == *this); } - - /** - * @brief Creates a tombstone object from an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier to turn into a tombstone object. - * @return The tombstone representation for the given identifier. - */ - template - [[nodiscard]] constexpr Entity operator|(const Entity entity) const ENTT_NOEXCEPT { - return entt_traits::construct(entt_traits::to_entity(entity)); - } }; - /** - * @brief Compares a tombstone object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a tombstone object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @param other A tombstone object yet to be converted. * @return False if the two elements differ, true otherwise. */ template -[[nodiscard]] constexpr bool operator==(const Entity entity, const tombstone_t other) ENTT_NOEXCEPT { +[[nodiscard]] constexpr bool operator==(const Entity entity, const tombstone_t other) noexcept { return other.operator==(entity); } - /** - * @brief Compares a tombstone object and an entity identifier of any type. - * @tparam Entity Type of entity identifier. - * @param entity Entity identifier with which to compare. + * @brief Compares a tombstone object and an identifier of any type. + * @tparam Entity Type of identifier. + * @param entity Identifier with which to compare. * @param other A tombstone object yet to be converted. * @return True if the two elements differ, false otherwise. */ template -[[nodiscard]] constexpr bool operator!=(const Entity entity, const tombstone_t other) ENTT_NOEXCEPT { +[[nodiscard]] constexpr bool operator!=(const Entity entity, const tombstone_t other) noexcept { return !(other == entity); } - /** * @brief Compile-time constant for null entities. * - * There exist implicit conversions from this variable to entity identifiers of - * any allowed type. Similarly, there exist comparision operators between the - * null entity and any other entity identifier. + * There exist implicit conversions from this variable to identifiers of any + * allowed type. Similarly, there exist comparison operators between the null + * entity and any other identifier. */ inline constexpr null_t null{}; - /** * @brief Compile-time constant for tombstone entities. * - * There exist implicit conversions from this variable to entity identifiers of - * any allowed type. Similarly, there exist comparision operators between the - * tombstone entity and any other entity identifier. + * There exist implicit conversions from this variable to identifiers of any + * allowed type. Similarly, there exist comparison operators between the + * tombstone entity and any other identifier. */ inline constexpr tombstone_t tombstone{}; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/entity/fwd.hpp b/LiteLoader/third-party/include/entt/entity/fwd.hpp new file mode 100644 index 0000000..8cc49aa --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/fwd.hpp @@ -0,0 +1,174 @@ +#ifndef ENTT_ENTITY_FWD_HPP +#define ENTT_ENTITY_FWD_HPP + +#include +#include +#include "../core/fwd.hpp" +#include "../core/type_traits.hpp" + +namespace entt { + +/*! @brief Default entity identifier. */ +enum class entity : id_type {}; + +template> +class basic_sparse_set; + +template, typename = void> +class basic_storage; + +template, typename = void> +struct storage_type; + +template>> +struct storage_for; + +template +class sigh_storage_mixin; + +template> +class basic_registry; + +template +class basic_view; + +template> +class basic_runtime_view; + +template +class basic_group; + +template +class basic_observer; + +template +class basic_organizer; + +template +struct basic_handle; + +template +class basic_snapshot; + +template +class basic_snapshot_loader; + +template +class basic_continuous_loader; + +/** + * @brief Alias for exclusion lists. + * @tparam Type List of types. + */ +template +using exclude_t = type_list; + +/** + * @brief Variable template for exclusion lists. + * @tparam Type List of types. + */ +template +inline constexpr exclude_t exclude{}; + +/** + * @brief Alias for lists of observed components. + * @tparam Type List of types. + */ +template +using get_t = type_list; + +/** + * @brief Variable template for lists of observed components. + * @tparam Type List of types. + */ +template +inline constexpr get_t get{}; + +/** + * @brief Alias for lists of owned components. + * @tparam Type List of types. + */ +template +using owned_t = type_list; + +/** + * @brief Variable template for lists of owned components. + * @tparam Type List of types. + */ +template +inline constexpr owned_t owned{}; + +/*! @brief Alias declaration for the most common use case. */ +using sparse_set = basic_sparse_set<>; + +/** + * @brief Alias declaration for the most common use case. + * @tparam Type Type of objects assigned to the entities. + */ +template +using storage = basic_storage; + +/*! @brief Alias declaration for the most common use case. */ +using registry = basic_registry<>; + +/*! @brief Alias declaration for the most common use case. */ +using observer = basic_observer; + +/*! @brief Alias declaration for the most common use case. */ +using organizer = basic_organizer; + +/*! @brief Alias declaration for the most common use case. */ +using handle = basic_handle; + +/*! @brief Alias declaration for the most common use case. */ +using const_handle = basic_handle; + +/** + * @brief Alias declaration for the most common use case. + * @tparam Args Other template parameters. + */ +template +using handle_view = basic_handle; + +/** + * @brief Alias declaration for the most common use case. + * @tparam Args Other template parameters. + */ +template +using const_handle_view = basic_handle; + +/*! @brief Alias declaration for the most common use case. */ +using snapshot = basic_snapshot; + +/*! @brief Alias declaration for the most common use case. */ +using snapshot_loader = basic_snapshot_loader; + +/*! @brief Alias declaration for the most common use case. */ +using continuous_loader = basic_continuous_loader; + +/** + * @brief Alias declaration for the most common use case. + * @tparam Get Types of storage iterated by the view. + * @tparam Exclude Types of storage used to filter the view. + */ +template> +using view = basic_view, type_list_transform_t>; + +/*! @brief Alias declaration for the most common use case. */ +using runtime_view = basic_runtime_view; + +/*! @brief Alias declaration for the most common use case. */ +using const_runtime_view = basic_runtime_view; + +/** + * @brief Alias declaration for the most common use case. + * @tparam Owned Types of storage _owned_ by the group. + * @tparam Get Types of storage _observed_ by the group. + * @tparam Exclude Types of storage used to filter the group. + */ +template +using group = basic_group, type_list_transform_t, type_list_transform_t>; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/entity/group.hpp b/LiteLoader/third-party/include/entt/entity/group.hpp new file mode 100644 index 0000000..f385986 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/group.hpp @@ -0,0 +1,852 @@ +#ifndef ENTT_ENTITY_GROUP_HPP +#define ENTT_ENTITY_GROUP_HPP + +#include +#include +#include +#include "../config/config.h" +#include "../core/iterator.hpp" +#include "../core/type_traits.hpp" +#include "component.hpp" +#include "entity.hpp" +#include "fwd.hpp" +#include "sparse_set.hpp" +#include "storage.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class extended_group_iterator; + +template +class extended_group_iterator, get_t> { + template + auto index_to_element(Type &cpool) const { + if constexpr(ignore_as_empty_v) { + return std::make_tuple(); + } else { + return std::forward_as_tuple(cpool.rbegin()[it.index()]); + } + } + +public: + using difference_type = std::ptrdiff_t; + using value_type = decltype(std::tuple_cat(std::make_tuple(*std::declval()), std::declval().get_as_tuple({})..., std::declval().get_as_tuple({})...)); + using pointer = input_iterator_pointer; + using reference = value_type; + using iterator_category = std::input_iterator_tag; + + constexpr extended_group_iterator() + : it{}, + pools{} {} + + extended_group_iterator(It from, const std::tuple &cpools) + : it{from}, + pools{cpools} {} + + extended_group_iterator &operator++() noexcept { + return ++it, *this; + } + + extended_group_iterator operator++(int) noexcept { + extended_group_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] reference operator*() const noexcept { + return std::tuple_cat(std::make_tuple(*it), index_to_element(*std::get(pools))..., std::get(pools)->get_as_tuple(*it)...); + } + + [[nodiscard]] pointer operator->() const noexcept { + return operator*(); + } + + template + friend constexpr bool operator==(const extended_group_iterator &, const extended_group_iterator &) noexcept; + +private: + It it; + std::tuple pools; +}; + +template +[[nodiscard]] constexpr bool operator==(const extended_group_iterator &lhs, const extended_group_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const extended_group_iterator &lhs, const extended_group_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Group. + * + * Primary template isn't defined on purpose. All the specializations give a + * compile-time error, but for a few reasonable cases. + */ +template +class basic_group; + +/** + * @brief Non-owning group. + * + * A non-owning group returns all entities and only the entities that are at + * least in the given storage. Moreover, it's guaranteed that the entity list is + * tightly packed in memory for fast iterations. + * + * @b Important + * + * Iterators aren't invalidated if: + * + * * New elements are added to the storage. + * * The entity currently pointed is modified (for example, components are added + * or removed from it). + * * The entity currently pointed is destroyed. + * + * In all other cases, modifying the pools iterated by the group in any way + * invalidates all the iterators and using them results in undefined behavior. + * + * @tparam Get Types of storage _observed_ by the group. + * @tparam Exclude Types of storage used to filter the group. + */ +template +class basic_group, get_t, exclude_t> { + using underlying_type = std::common_type_t; + using basic_common_type = std::common_type_t; + + template + static constexpr std::size_t index_of = type_list_index_v, type_list>; + +public: + /*! @brief Underlying entity identifier. */ + using entity_type = underlying_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = basic_common_type; + /*! @brief Random access iterator type. */ + using iterator = typename base_type::iterator; + /*! @brief Reversed iterator type. */ + using reverse_iterator = typename base_type::reverse_iterator; + /*! @brief Iterable group type. */ + using iterable = iterable_adaptor, get_t>>; + + /*! @brief Default constructor to use to create empty, invalid groups. */ + basic_group() noexcept + : handler{} {} + + /** + * @brief Constructs a group from a set of storage classes. + * @param ref The actual entities to iterate. + * @param gpool Storage types to iterate _observed_ by the group. + */ + basic_group(basic_common_type &ref, Get &...gpool) noexcept + : handler{&ref}, + pools{&gpool...} {} + + /** + * @brief Returns a const reference to the underlying handler. + * @return A const reference to the underlying handler. + */ + [[nodiscard]] const base_type &handle() const noexcept { + return *handler; + } + + /** + * @brief Returns the storage for a given component type. + * @tparam Type Type of component of which to return the storage. + * @return The storage for the given component type. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return storage>(); + } + + /** + * @brief Returns the storage for a given index. + * @tparam Index Index of the storage to return. + * @return The storage for the given index. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return *std::get(pools); + } + + /** + * @brief Returns the number of entities that are part of the group. + * @return Number of entities that are part of the group. + */ + [[nodiscard]] size_type size() const noexcept { + return *this ? handler->size() : size_type{}; + } + + /** + * @brief Returns the number of elements that a group has currently + * allocated space for. + * @return Capacity of the group. + */ + [[nodiscard]] size_type capacity() const noexcept { + return *this ? handler->capacity() : size_type{}; + } + + /*! @brief Requests the removal of unused capacity. */ + void shrink_to_fit() { + if(*this) { + handler->shrink_to_fit(); + } + } + + /** + * @brief Checks whether a group is empty. + * @return True if the group is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return !*this || handler->empty(); + } + + /** + * @brief Returns an iterator to the first entity of the group. + * + * The returned iterator points to the first entity of the group. If the + * group is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first entity of the group. + */ + [[nodiscard]] iterator begin() const noexcept { + return *this ? handler->begin() : iterator{}; + } + + /** + * @brief Returns an iterator that is past the last entity of the group. + * + * The returned iterator points to the entity following the last entity of + * the group. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the entity following the last entity of the + * group. + */ + [[nodiscard]] iterator end() const noexcept { + return *this ? handler->end() : iterator{}; + } + + /** + * @brief Returns an iterator to the first entity of the reversed group. + * + * The returned iterator points to the first entity of the reversed group. + * If the group is empty, the returned iterator will be equal to `rend()`. + * + * @return An iterator to the first entity of the reversed group. + */ + [[nodiscard]] reverse_iterator rbegin() const noexcept { + return *this ? handler->rbegin() : reverse_iterator{}; + } + + /** + * @brief Returns an iterator that is past the last entity of the reversed + * group. + * + * The returned iterator points to the entity following the last entity of + * the reversed group. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the entity following the last entity of the + * reversed group. + */ + [[nodiscard]] reverse_iterator rend() const noexcept { + return *this ? handler->rend() : reverse_iterator{}; + } + + /** + * @brief Returns the first entity of the group, if any. + * @return The first entity of the group if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type front() const noexcept { + const auto it = begin(); + return it != end() ? *it : null; + } + + /** + * @brief Returns the last entity of the group, if any. + * @return The last entity of the group if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type back() const noexcept { + const auto it = rbegin(); + return it != rend() ? *it : null; + } + + /** + * @brief Finds an entity. + * @param entt A valid identifier. + * @return An iterator to the given entity if it's found, past the end + * iterator otherwise. + */ + [[nodiscard]] iterator find(const entity_type entt) const noexcept { + const auto it = *this ? handler->find(entt) : iterator{}; + return it != end() && *it == entt ? it : end(); + } + + /** + * @brief Returns the identifier that occupies the given position. + * @param pos Position of the element to return. + * @return The identifier that occupies the given position. + */ + [[nodiscard]] entity_type operator[](const size_type pos) const { + return begin()[pos]; + } + + /** + * @brief Checks if a group is properly initialized. + * @return True if the group is properly initialized, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return handler != nullptr; + } + + /** + * @brief Checks if a group contains an entity. + * @param entt A valid identifier. + * @return True if the group contains the given entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const noexcept { + return *this && handler->contains(entt); + } + + /** + * @brief Returns the components assigned to the given entity. + * + * Prefer this function instead of `registry::get` during iterations. It has + * far better performance than its counterpart. + * + * @warning + * Attempting to use an invalid component type results in a compilation + * error. Attempting to use an entity that doesn't belong to the group + * results in undefined behavior. + * + * @tparam Type Types of components to get. + * @param entt A valid identifier. + * @return The components assigned to the entity. + */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + if constexpr(sizeof...(Type) == 0) { + return std::apply([entt](auto *...curr) { return std::tuple_cat(curr->get_as_tuple(entt)...); }, pools); + } else if constexpr(sizeof...(Type) == 1) { + return (std::get>(pools)->get(entt), ...); + } else { + return std::tuple_cat(std::get>(pools)->get_as_tuple(entt)...); + } + } + + /** + * @brief Iterates entities and components and applies the given function + * object to them. + * + * The function object is invoked for each entity. It is provided with the + * entity itself and a set of references to non-empty components. The + * _constness_ of the components is as requested.
+ * The signature of the function must be equivalent to one of the following + * forms: + * + * @code{.cpp} + * void(const entity_type, Type &...); + * void(Type &...); + * @endcode + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned during iterations. + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + for(const auto entt: *this) { + if constexpr(is_applicable_v{}, std::declval().get({})))>) { + std::apply(func, std::tuple_cat(std::make_tuple(entt), get(entt))); + } else { + std::apply(func, get(entt)); + } + } + } + + /** + * @brief Returns an iterable object to use to _visit_ a group. + * + * The iterable object returns tuples that contain the current entity and a + * set of references to its non-empty components. The _constness_ of the + * components is as requested. + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned during iterations. + * + * @return An iterable object to use to _visit_ the group. + */ + [[nodiscard]] iterable each() const noexcept { + return iterable{{begin(), pools}, {end(), pools}}; + } + + /** + * @brief Sort a group according to the given comparison function. + * + * Sort the group so that iterating it with a couple of iterators returns + * entities and components in the expected order. See `begin` and `end` for + * more details. + * + * The comparison function object must return `true` if the first element + * is _less_ than the second one, `false` otherwise. The signature of the + * comparison function should be equivalent to one of the following: + * + * @code{.cpp} + * bool(std::tuple, std::tuple); + * bool(const Type &..., const Type &...); + * bool(const Entity, const Entity); + * @endcode + * + * Where `Type` are such that they are iterated by the group.
+ * Moreover, the comparison function object shall induce a + * _strict weak ordering_ on the values. + * + * The sort function object must offer a member function template + * `operator()` that accepts three arguments: + * + * * An iterator to the first element of the range to sort. + * * An iterator past the last element of the range to sort. + * * A comparison function to use to compare the elements. + * + * @tparam Type Optional types of components to compare. + * @tparam Compare Type of comparison function object. + * @tparam Sort Type of sort function object. + * @tparam Args Types of arguments to forward to the sort function object. + * @param compare A valid comparison function object. + * @param algo A valid sort function object. + * @param args Arguments to forward to the sort function object, if any. + */ + template + void sort(Compare compare, Sort algo = Sort{}, Args &&...args) { + if(*this) { + if constexpr(sizeof...(Type) == 0) { + static_assert(std::is_invocable_v, "Invalid comparison function"); + handler->sort(std::move(compare), std::move(algo), std::forward(args)...); + } else { + auto comp = [this, &compare](const entity_type lhs, const entity_type rhs) { + if constexpr(sizeof...(Type) == 1) { + return compare((std::get>(pools)->get(lhs), ...), (std::get>(pools)->get(rhs), ...)); + } else { + return compare(std::forward_as_tuple(std::get>(pools)->get(lhs)...), std::forward_as_tuple(std::get>(pools)->get(rhs)...)); + } + }; + + handler->sort(std::move(comp), std::move(algo), std::forward(args)...); + } + } + } + + /** + * @brief Sort the shared pool of entities according to the given component. + * + * Non-owning groups of the same type share with the registry a pool of + * entities with its own order that doesn't depend on the order of any pool + * of components. Users can order the underlying data structure so that it + * respects the order of the pool of the given component. + * + * @note + * The shared pool of entities and thus its order is affected by the changes + * to each and every pool that it tracks. Therefore changes to those pools + * can quickly ruin the order imposed to the pool of entities shared between + * the non-owning groups. + * + * @tparam Type Type of component to use to impose the order. + */ + template + void sort() const { + if(*this) { + handler->respect(*std::get>(pools)); + } + } + +private: + base_type *const handler; + const std::tuple pools; +}; + +/** + * @brief Owning group. + * + * Owning groups returns all entities and only the entities that are at + * least in the given storage. Moreover: + * + * * It's guaranteed that the entity list is tightly packed in memory for fast + * iterations. + * * It's guaranteed that all components in the owned storage are tightly packed + * in memory for even faster iterations and to allow direct access. + * * They stay true to the order of the owned storage and all instances have the + * same order in memory. + * + * The more types of storage are owned, the faster it is to iterate a group. + * + * @b Important + * + * Iterators aren't invalidated if: + * + * * New elements are added to the storage. + * * The entity currently pointed is modified (for example, components are added + * or removed from it). + * * The entity currently pointed is destroyed. + * + * In all other cases, modifying the pools iterated by the group in any way + * invalidates all the iterators and using them results in undefined behavior. + * + * @tparam Owned Types of storage _owned_ by the group. + * @tparam Get Types of storage _observed_ by the group. + * @tparam Exclude Types of storage used to filter the group. + */ +template +class basic_group, get_t, exclude_t> { + using underlying_type = std::common_type_t; + using basic_common_type = std::common_type_t; + + template + static constexpr std::size_t index_of = type_list_index_v, type_list>; + +public: + /*! @brief Underlying entity identifier. */ + using entity_type = underlying_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = basic_common_type; + /*! @brief Random access iterator type. */ + using iterator = typename base_type::iterator; + /*! @brief Reversed iterator type. */ + using reverse_iterator = typename base_type::reverse_iterator; + /*! @brief Iterable group type. */ + using iterable = iterable_adaptor, get_t>>; + + /*! @brief Default constructor to use to create empty, invalid groups. */ + basic_group() noexcept + : length{} {} + + /** + * @brief Constructs a group from a set of storage classes. + * @param extent The actual number of entities to iterate. + * @param opool Storage types to iterate _owned_ by the group. + * @param gpool Storage types to iterate _observed_ by the group. + */ + basic_group(const std::size_t &extent, Owned &...opool, Get &...gpool) noexcept + : pools{&opool..., &gpool...}, + length{&extent} {} + + /** + * @brief Returns the storage for a given component type. + * @tparam Type Type of component of which to return the storage. + * @return The storage for the given component type. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return storage>(); + } + + /** + * @brief Returns the storage for a given index. + * @tparam Index Index of the storage to return. + * @return The storage for the given index. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return *std::get(pools); + } + + /** + * @brief Returns the number of entities that that are part of the group. + * @return Number of entities that that are part of the group. + */ + [[nodiscard]] size_type size() const noexcept { + return *this ? *length : size_type{}; + } + + /** + * @brief Checks whether a group is empty. + * @return True if the group is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return !*this || !*length; + } + + /** + * @brief Returns an iterator to the first entity of the group. + * + * The returned iterator points to the first entity of the group. If the + * group is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first entity of the group. + */ + [[nodiscard]] iterator begin() const noexcept { + return *this ? (std::get<0>(pools)->base_type::end() - *length) : iterator{}; + } + + /** + * @brief Returns an iterator that is past the last entity of the group. + * + * The returned iterator points to the entity following the last entity of + * the group. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the entity following the last entity of the + * group. + */ + [[nodiscard]] iterator end() const noexcept { + return *this ? std::get<0>(pools)->base_type::end() : iterator{}; + } + + /** + * @brief Returns an iterator to the first entity of the reversed group. + * + * The returned iterator points to the first entity of the reversed group. + * If the group is empty, the returned iterator will be equal to `rend()`. + * + * @return An iterator to the first entity of the reversed group. + */ + [[nodiscard]] reverse_iterator rbegin() const noexcept { + return *this ? std::get<0>(pools)->base_type::rbegin() : reverse_iterator{}; + } + + /** + * @brief Returns an iterator that is past the last entity of the reversed + * group. + * + * The returned iterator points to the entity following the last entity of + * the reversed group. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the entity following the last entity of the + * reversed group. + */ + [[nodiscard]] reverse_iterator rend() const noexcept { + return *this ? (std::get<0>(pools)->base_type::rbegin() + *length) : reverse_iterator{}; + } + + /** + * @brief Returns the first entity of the group, if any. + * @return The first entity of the group if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type front() const noexcept { + const auto it = begin(); + return it != end() ? *it : null; + } + + /** + * @brief Returns the last entity of the group, if any. + * @return The last entity of the group if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type back() const noexcept { + const auto it = rbegin(); + return it != rend() ? *it : null; + } + + /** + * @brief Finds an entity. + * @param entt A valid identifier. + * @return An iterator to the given entity if it's found, past the end + * iterator otherwise. + */ + [[nodiscard]] iterator find(const entity_type entt) const noexcept { + const auto it = *this ? std::get<0>(pools)->find(entt) : iterator{}; + return it != end() && it >= begin() && *it == entt ? it : end(); + } + + /** + * @brief Returns the identifier that occupies the given position. + * @param pos Position of the element to return. + * @return The identifier that occupies the given position. + */ + [[nodiscard]] entity_type operator[](const size_type pos) const { + return begin()[pos]; + } + + /** + * @brief Checks if a group is properly initialized. + * @return True if the group is properly initialized, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return length != nullptr; + } + + /** + * @brief Checks if a group contains an entity. + * @param entt A valid identifier. + * @return True if the group contains the given entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const noexcept { + return *this && std::get<0>(pools)->contains(entt) && (std::get<0>(pools)->index(entt) < (*length)); + } + + /** + * @brief Returns the components assigned to the given entity. + * + * Prefer this function instead of `registry::get` during iterations. It has + * far better performance than its counterpart. + * + * @warning + * Attempting to use an invalid component type results in a compilation + * error. Attempting to use an entity that doesn't belong to the group + * results in undefined behavior. + * + * @tparam Type Types of components to get. + * @param entt A valid identifier. + * @return The components assigned to the entity. + */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + if constexpr(sizeof...(Type) == 0) { + return std::apply([entt](auto *...curr) { return std::tuple_cat(curr->get_as_tuple(entt)...); }, pools); + } else if constexpr(sizeof...(Type) == 1) { + return (std::get>(pools)->get(entt), ...); + } else { + return std::tuple_cat(std::get>(pools)->get_as_tuple(entt)...); + } + } + + /** + * @brief Iterates entities and components and applies the given function + * object to them. + * + * The function object is invoked for each entity. It is provided with the + * entity itself and a set of references to non-empty components. The + * _constness_ of the components is as requested.
+ * The signature of the function must be equivalent to one of the following + * forms: + * + * @code{.cpp} + * void(const entity_type, Type &...); + * void(Type &...); + * @endcode + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned during iterations. + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + for(auto args: each()) { + if constexpr(is_applicable_v{}, std::declval().get({})))>) { + std::apply(func, args); + } else { + std::apply([&func](auto, auto &&...less) { func(std::forward(less)...); }, args); + } + } + } + + /** + * @brief Returns an iterable object to use to _visit_ a group. + * + * The iterable object returns tuples that contain the current entity and a + * set of references to its non-empty components. The _constness_ of the + * components is as requested. + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned during iterations. + * + * @return An iterable object to use to _visit_ the group. + */ + [[nodiscard]] iterable each() const noexcept { + return {{begin(), pools}, {end(), pools}}; + } + + /** + * @brief Sort a group according to the given comparison function. + * + * Sort the group so that iterating it with a couple of iterators returns + * entities and components in the expected order. See `begin` and `end` for + * more details. + * + * The comparison function object must return `true` if the first element + * is _less_ than the second one, `false` otherwise. The signature of the + * comparison function should be equivalent to one of the following: + * + * @code{.cpp} + * bool(std::tuple, std::tuple); + * bool(const Type &, const Type &); + * bool(const Entity, const Entity); + * @endcode + * + * Where `Type` are either owned types or not but still such that they are + * iterated by the group.
+ * Moreover, the comparison function object shall induce a + * _strict weak ordering_ on the values. + * + * The sort function object must offer a member function template + * `operator()` that accepts three arguments: + * + * * An iterator to the first element of the range to sort. + * * An iterator past the last element of the range to sort. + * * A comparison function to use to compare the elements. + * + * @tparam Type Optional types of components to compare. + * @tparam Compare Type of comparison function object. + * @tparam Sort Type of sort function object. + * @tparam Args Types of arguments to forward to the sort function object. + * @param compare A valid comparison function object. + * @param algo A valid sort function object. + * @param args Arguments to forward to the sort function object, if any. + */ + template + void sort(Compare compare, Sort algo = Sort{}, Args &&...args) const { + if constexpr(sizeof...(Type) == 0) { + static_assert(std::is_invocable_v, "Invalid comparison function"); + std::get<0>(pools)->sort_n(*length, std::move(compare), std::move(algo), std::forward(args)...); + } else { + auto comp = [this, &compare](const entity_type lhs, const entity_type rhs) { + if constexpr(sizeof...(Type) == 1) { + return compare((std::get>(pools)->get(lhs), ...), (std::get>(pools)->get(rhs), ...)); + } else { + return compare(std::forward_as_tuple(std::get>(pools)->get(lhs)...), std::forward_as_tuple(std::get>(pools)->get(rhs)...)); + } + }; + + std::get<0>(pools)->sort_n(*length, std::move(comp), std::move(algo), std::forward(args)...); + } + + std::apply([this](auto *head, auto *...other) { + for(auto next = *length; next; --next) { + const auto pos = next - 1; + [[maybe_unused]] const auto entt = head->data()[pos]; + (other->swap_elements(other->data()[pos], entt), ...); + } + }, + pools); + } + +private: + const std::tuple pools; + const size_type *const length; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/entity/handle.hpp b/LiteLoader/third-party/include/entt/entity/handle.hpp similarity index 54% rename from LiteLoader/Header/third-party/entt/entity/handle.hpp rename to LiteLoader/third-party/include/entt/entity/handle.hpp index 036e067..a42aeb0 100644 --- a/LiteLoader/Header/third-party/entt/entity/handle.hpp +++ b/LiteLoader/third-party/include/entt/entity/handle.hpp @@ -1,31 +1,107 @@ #ifndef ENTT_ENTITY_HANDLE_HPP #define ENTT_ENTITY_HANDLE_HPP - +#include #include #include #include -#include "../config/config.h" +#include "../core/iterator.hpp" #include "../core/type_traits.hpp" +#include "entity.hpp" #include "fwd.hpp" -#include "registry.hpp" - namespace entt { +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class handle_storage_iterator final { + template + friend class handle_storage_iterator; + + using underlying_type = std::remove_reference_t; + using entity_type = typename underlying_type::entity_type; + +public: + using value_type = typename std::iterator_traits::value_type; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr handle_storage_iterator() noexcept + : entt{null}, + it{}, + last{} {} + + constexpr handle_storage_iterator(entity_type value, It from, It to) noexcept + : entt{value}, + it{from}, + last{to} { + while(it != last && !it->second.contains(entt)) { ++it; } + } + + constexpr handle_storage_iterator &operator++() noexcept { + while(++it != last && !it->second.contains(entt)) {} + return *this; + } + + constexpr handle_storage_iterator operator++(int) noexcept { + handle_storage_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *it; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + template + friend constexpr bool operator==(const handle_storage_iterator &, const handle_storage_iterator &) noexcept; + +private: + entity_type entt; + It it; + It last; +}; + +template +[[nodiscard]] constexpr bool operator==(const handle_storage_iterator &lhs, const handle_storage_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const handle_storage_iterator &lhs, const handle_storage_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ /** * @brief Non-owning handle to an entity. * * Tiny wrapper around a registry and an entity. * - * @tparam Entity A valid entity type (see entt_traits for more details). - * @tparam Type Types to which to restrict the scope of a handle. + * @tparam Registry Basic registry type. + * @tparam Scope Types to which to restrict the scope of a handle. */ -template +template struct basic_handle { /*! @brief Type of registry accepted by the handle. */ - using registry_type = constness_as_t>, Entity>; + using registry_type = Registry; /*! @brief Underlying entity identifier. */ using entity_type = typename registry_type::entity_type; /*! @brief Underlying version type. */ @@ -34,29 +110,33 @@ struct basic_handle { using size_type = typename registry_type::size_type; /*! @brief Constructs an invalid handle. */ - basic_handle() ENTT_NOEXCEPT - : reg{}, entt{null} - {} + basic_handle() noexcept + : reg{}, + entt{null} {} /** * @brief Constructs a handle from a given registry and entity. * @param ref An instance of the registry class. - * @param value An entity identifier. + * @param value A valid identifier. */ - basic_handle(registry_type &ref, entity_type value) ENTT_NOEXCEPT - : reg{&ref}, entt{value} - {} + basic_handle(registry_type &ref, entity_type value) noexcept + : reg{&ref}, + entt{value} {} /** - * @brief Compares two handles. - * @tparam Args Template parameters of the handle with which to compare. - * @param other Handle with which to compare. - * @return True if both handles refer to the same registry and the same - * entity, false otherwise. + * @brief Returns an iterable object to use to _visit_ a handle. + * + * The iterable object returns a pair that contains the name and a reference + * to the current storage.
+ * Returned storage are those that contain the entity associated with the + * handle. + * + * @return An iterable object to use to _visit_ the handle. */ - template - [[nodiscard]] bool operator==(const basic_handle &other) const ENTT_NOEXCEPT { - return reg == other.registry() && entt == other.entity(); + [[nodiscard]] auto storage() const noexcept { + auto iterable = reg->storage(); + using iterator_type = internal::handle_storage_iterator; + return iterable_adaptor{iterator_type{entt, iterable.begin(), iterable.end()}, iterator_type{entt, iterable.end(), iterable.end()}}; } /** @@ -67,21 +147,18 @@ struct basic_handle { * entity. */ template - operator basic_handle() const ENTT_NOEXCEPT { - static_assert( - (std::is_same_v || std::is_same_v, Entity>) - && (sizeof...(Type) == 0 || ((sizeof...(Args) != 0 && sizeof...(Args) <= sizeof...(Type)) && ... && (type_list_contains_v, Args>))), - "Invalid conversion between different handles" - ); + operator basic_handle() const noexcept { + static_assert(std::is_same_v || std::is_same_v, Registry>, "Invalid conversion between different handles"); + static_assert((sizeof...(Scope) == 0 || ((sizeof...(Args) != 0 && sizeof...(Args) <= sizeof...(Scope)) && ... && (type_list_contains_v, Args>))), "Invalid conversion between different handles"); return reg ? basic_handle{*reg, entt} : basic_handle{}; } /** * @brief Converts a handle to its underlying entity. - * @return An entity identifier. + * @return The contained identifier. */ - [[nodiscard]] operator entity_type() const ENTT_NOEXCEPT { + [[nodiscard]] operator entity_type() const noexcept { return entity(); } @@ -89,7 +166,7 @@ struct basic_handle { * @brief Checks if a handle refers to non-null registry pointer and entity. * @return True if the handle refers to non-null registry and entity, false otherwise. */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { + [[nodiscard]] explicit operator bool() const noexcept { return reg && reg->valid(entt); } @@ -105,7 +182,7 @@ struct basic_handle { * @brief Returns a pointer to the underlying registry, if any. * @return A pointer to the underlying registry, if any. */ - [[nodiscard]] registry_type * registry() const ENTT_NOEXCEPT { + [[nodiscard]] registry_type *registry() const noexcept { return reg; } @@ -113,21 +190,17 @@ struct basic_handle { * @brief Returns the entity associated with a handle. * @return The entity associated with the handle. */ - [[nodiscard]] entity_type entity() const ENTT_NOEXCEPT { + [[nodiscard]] entity_type entity() const noexcept { return entt; } - /** - * @brief Destroys the entity associated with a handle. - * @sa basic_registry::destroy - */ + /*! @brief Destroys the entity associated with a handle. */ void destroy() { reg->destroy(entt); } /** * @brief Destroys the entity associated with a handle. - * @sa basic_registry::destroy * @param version A desired version upon destruction. */ void destroy(const version_type version) { @@ -136,103 +209,79 @@ struct basic_handle { /** * @brief Assigns the given component to a handle. - * @sa basic_registry::emplace * @tparam Component Type of component to create. * @tparam Args Types of arguments to use to construct the component. * @param args Parameters to use to initialize the component. * @return A reference to the newly created component. */ template - decltype(auto) emplace(Args &&... args) const { - static_assert(((sizeof...(Type) == 0) || ... || std::is_same_v), "Invalid type"); + decltype(auto) emplace(Args &&...args) const { + static_assert(((sizeof...(Scope) == 0) || ... || std::is_same_v), "Invalid type"); return reg->template emplace(entt, std::forward(args)...); } /** * @brief Assigns or replaces the given component for a handle. - * @sa basic_registry::emplace_or_replace * @tparam Component Type of component to assign or replace. * @tparam Args Types of arguments to use to construct the component. * @param args Parameters to use to initialize the component. * @return A reference to the newly created component. */ template - decltype(auto) emplace_or_replace(Args &&... args) const { - static_assert(((sizeof...(Type) == 0) || ... || std::is_same_v), "Invalid type"); + decltype(auto) emplace_or_replace(Args &&...args) const { + static_assert(((sizeof...(Scope) == 0) || ... || std::is_same_v), "Invalid type"); return reg->template emplace_or_replace(entt, std::forward(args)...); } /** * @brief Patches the given component for a handle. - * @sa basic_registry::patch * @tparam Component Type of component to patch. * @tparam Func Types of the function objects to invoke. * @param func Valid function objects. * @return A reference to the patched component. */ template - decltype(auto) patch(Func &&... func) const { - static_assert(((sizeof...(Type) == 0) || ... || std::is_same_v), "Invalid type"); + decltype(auto) patch(Func &&...func) const { + static_assert(((sizeof...(Scope) == 0) || ... || std::is_same_v), "Invalid type"); return reg->template patch(entt, std::forward(func)...); } /** * @brief Replaces the given component for a handle. - * @sa basic_registry::replace * @tparam Component Type of component to replace. * @tparam Args Types of arguments to use to construct the component. * @param args Parameters to use to initialize the component. * @return A reference to the component being replaced. */ template - decltype(auto) replace(Args &&... args) const { - static_assert(((sizeof...(Type) == 0) || ... || std::is_same_v), "Invalid type"); + decltype(auto) replace(Args &&...args) const { + static_assert(((sizeof...(Scope) == 0) || ... || std::is_same_v), "Invalid type"); return reg->template replace(entt, std::forward(args)...); } /** * @brief Removes the given components from a handle. - * @sa basic_registry::remove * @tparam Component Types of components to remove. * @return The number of components actually removed. */ template size_type remove() const { - static_assert(sizeof...(Type) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); + static_assert(sizeof...(Scope) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); return reg->template remove(entt); } /** * @brief Erases the given components from a handle. - * @sa basic_registry::erase * @tparam Component Types of components to erase. */ template void erase() const { - static_assert(sizeof...(Type) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); + static_assert(sizeof...(Scope) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); reg->template erase(entt); } - /*! @copydoc remove */ - template - [[deprecated("Use ::remove instead")]] - size_type remove_if_exists() const { - return remove(); - } - - /** - * @brief Removes all the components from a handle and makes it orphaned. - * @sa basic_registry::remove_all - */ - [[deprecated("No longer supported")]] - void remove_all() const { - static_assert(sizeof...(Type) == 0, "Invalid operation"); - reg->remove_all(entt); - } - /** * @brief Checks if a handle has all the given components. - * @sa basic_registry::all_of * @tparam Component Components for which to perform the check. * @return True if the handle has all the components, false otherwise. */ @@ -243,7 +292,6 @@ struct basic_handle { /** * @brief Checks if a handle has at least one of the given components. - * @sa basic_registry::any_of * @tparam Component Components for which to perform the check. * @return True if the handle has at least one of the given components, * false otherwise. @@ -255,39 +303,36 @@ struct basic_handle { /** * @brief Returns references to the given components for a handle. - * @sa basic_registry::get * @tparam Component Types of components to get. * @return References to the components owned by the handle. */ template [[nodiscard]] decltype(auto) get() const { - static_assert(sizeof...(Type) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); + static_assert(sizeof...(Scope) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); return reg->template get(entt); } /** * @brief Returns a reference to the given component for a handle. - * @sa basic_registry::get_or_emplace * @tparam Component Type of component to get. * @tparam Args Types of arguments to use to construct the component. * @param args Parameters to use to initialize the component. * @return Reference to the component owned by the handle. */ template - [[nodiscard]] decltype(auto) get_or_emplace(Args &&... args) const { - static_assert(((sizeof...(Type) == 0) || ... || std::is_same_v), "Invalid type"); + [[nodiscard]] decltype(auto) get_or_emplace(Args &&...args) const { + static_assert(((sizeof...(Scope) == 0) || ... || std::is_same_v), "Invalid type"); return reg->template get_or_emplace(entt, std::forward(args)...); } /** * @brief Returns pointers to the given components for a handle. - * @sa basic_registry::try_get * @tparam Component Types of components to get. * @return Pointers to the components owned by the handle. */ template [[nodiscard]] auto try_get() const { - static_assert(sizeof...(Type) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); + static_assert(sizeof...(Scope) == 0 || (type_list_contains_v, Component> && ...), "Invalid type"); return reg->template try_get(entt); } @@ -299,57 +344,39 @@ struct basic_handle { return reg->orphan(entt); } - /** - * @brief Visits a handle and returns the types for its components. - * @sa basic_registry::visit - * @tparam Func Type of the function object to invoke. - * @param func A valid function object. - */ - template - void visit(Func &&func) const { - reg->visit(entt, std::forward(func)); - } - private: registry_type *reg; entity_type entt; }; +/** + * @brief Compares two handles. + * @tparam Args Scope of the first handle. + * @tparam Other Scope of the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if both handles refer to the same registry and the same + * entity, false otherwise. + */ +template +[[nodiscard]] bool operator==(const basic_handle &lhs, const basic_handle &rhs) noexcept { + return lhs.registry() == rhs.registry() && lhs.entity() == rhs.entity(); +} /** * @brief Compares two handles. - * @tparam Type A valid entity type (see entt_traits for more details). - * @tparam Other A valid entity type (see entt_traits for more details). + * @tparam Args Scope of the first handle. + * @tparam Other Scope of the second handle. * @param lhs A valid handle. * @param rhs A valid handle. * @return False if both handles refer to the same registry and the same * entity, true otherwise. */ -template -bool operator!=(const basic_handle &lhs, const basic_handle &rhs) ENTT_NOEXCEPT { +template +[[nodiscard]] bool operator!=(const basic_handle &lhs, const basic_handle &rhs) noexcept { return !(lhs == rhs); } - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -basic_handle(basic_registry &, Entity) --> basic_handle; - - -/** - * @brief Deduction guide. - * @tparam Entity A valid entity type (see entt_traits for more details). - */ -template -basic_handle(const basic_registry &, Entity) --> basic_handle; - - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/entity/helper.hpp b/LiteLoader/third-party/include/entt/entity/helper.hpp new file mode 100644 index 0000000..7440937 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/helper.hpp @@ -0,0 +1,144 @@ +#ifndef ENTT_ENTITY_HELPER_HPP +#define ENTT_ENTITY_HELPER_HPP + +#include +#include +#include "../core/fwd.hpp" +#include "../core/type_traits.hpp" +#include "../signal/delegate.hpp" +#include "component.hpp" +#include "fwd.hpp" +#include "group.hpp" +#include "view.hpp" + +namespace entt { + +/** + * @brief Converts a registry to a view. + * @tparam Registry Basic registry type. + */ +template +class as_view { + template + auto dispatch(get_t, exclude_t) const { + return reg.template view...>(exclude_t...>{}); + } + +public: + /*! @brief Type of registry to convert. */ + using registry_type = Registry; + /*! @brief Underlying entity identifier. */ + using entity_type = std::remove_const_t; + + /** + * @brief Constructs a converter for a given registry. + * @param source A valid reference to a registry. + */ + as_view(registry_type &source) noexcept + : reg{source} {} + + /** + * @brief Conversion function from a registry to a view. + * @tparam Get Type of storage used to construct the view. + * @tparam Exclude Types of storage used to filter the view. + * @return A newly created view. + */ + template + operator basic_view() const { + return dispatch(Get{}, Exclude{}); + } + +private: + registry_type ® +}; + +/** + * @brief Converts a registry to a group. + * @tparam Registry Basic registry type. + */ +template +class as_group { + template + auto dispatch(owned_t, get_t, exclude_t) const { + if constexpr(std::is_const_v) { + return reg.template group_if_exists(get_t{}, exclude_t{}); + } else { + return reg.template group...>(get_t...>{}, exclude_t...>{}); + } + } + +public: + /*! @brief Type of registry to convert. */ + using registry_type = Registry; + /*! @brief Underlying entity identifier. */ + using entity_type = std::remove_const_t; + + /** + * @brief Constructs a converter for a given registry. + * @param source A valid reference to a registry. + */ + as_group(registry_type &source) noexcept + : reg{source} {} + + /** + * @brief Conversion function from a registry to a group. + * @tparam Owned Types of _owned_ by the group. + * @tparam Get Types of storage _observed_ by the group. + * @tparam Exclude Types of storage used to filter the group. + * @return A newly created group. + */ + template + operator basic_group() const { + return dispatch(Owned{}, Get{}, Exclude{}); + } + +private: + registry_type ® +}; + +/** + * @brief Helper to create a listener that directly invokes a member function. + * @tparam Member Member function to invoke on a component of the given type. + * @tparam Registry Basic registry type. + * @param reg A registry that contains the given entity and its components. + * @param entt Entity from which to get the component. + */ +template>> +void invoke(Registry ®, const typename Registry::entity_type entt) { + static_assert(std::is_member_function_pointer_v, "Invalid pointer to non-static member function"); + delegate func; + func.template connect(reg.template get>(entt)); + func(reg, entt); +} + +/** + * @brief Returns the entity associated with a given component. + * + * @warning + * Currently, this function only works correctly with the default pool as it + * makes assumptions about how the components are laid out. + * + * @tparam Registry Basic registry type. + * @tparam Component Type of component. + * @param reg A registry that contains the given entity and its components. + * @param instance A valid component instance. + * @return The entity associated with the given component. + */ +template +typename Registry::entity_type to_entity(const Registry ®, const Component &instance) { + const auto &storage = reg.template storage(); + const typename Registry::base_type &base = storage; + const auto *addr = std::addressof(instance); + + for(auto it = base.rbegin(), last = base.rend(); it < last; it += component_traits::page_size) { + if(const auto dist = (addr - std::addressof(storage.get(*it))); dist >= 0 && dist < static_cast(component_traits::page_size)) { + return *(it + dist); + } + } + + return null; +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/entity/observer.hpp b/LiteLoader/third-party/include/entt/entity/observer.hpp similarity index 79% rename from LiteLoader/Header/third-party/entt/entity/observer.hpp rename to LiteLoader/third-party/include/entt/entity/observer.hpp index 3665203..5c1f503 100644 --- a/LiteLoader/Header/third-party/entt/entity/observer.hpp +++ b/LiteLoader/third-party/include/entt/entity/observer.hpp @@ -1,30 +1,22 @@ #ifndef ENTT_ENTITY_OBSERVER_HPP #define ENTT_ENTITY_OBSERVER_HPP - -#include #include #include -#include +#include #include -#include "../config/config.h" +#include #include "../core/type_traits.hpp" #include "../signal/delegate.hpp" -#include "registry.hpp" -#include "storage.hpp" -#include "utility.hpp" -#include "entity.hpp" #include "fwd.hpp" - +#include "storage.hpp" namespace entt { - /*! @brief Grouping matcher. */ template struct matcher {}; - /** * @brief Collector. * @@ -34,7 +26,6 @@ struct matcher {}; template struct basic_collector; - /** * @brief Collector. * @@ -52,7 +43,7 @@ struct basic_collector<> { * @return The updated collector. */ template - static constexpr auto group(exclude_t = {}) ENTT_NOEXCEPT { + static constexpr auto group(exclude_t = {}) noexcept { return basic_collector, type_list<>, type_list, AllOf...>>{}; } @@ -62,7 +53,7 @@ struct basic_collector<> { * @return The updated collector. */ template - static constexpr auto update() ENTT_NOEXCEPT { + static constexpr auto update() noexcept { return basic_collector, type_list<>, AnyOf>>{}; } }; @@ -87,7 +78,7 @@ struct basic_collector, type_list, Rule * @return The updated collector. */ template - static constexpr auto group(exclude_t = {}) ENTT_NOEXCEPT { + static constexpr auto group(exclude_t = {}) noexcept { return basic_collector, type_list<>, type_list, AllOf...>, current_type, Other...>{}; } @@ -97,7 +88,7 @@ struct basic_collector, type_list, Rule * @return The updated collector. */ template - static constexpr auto update() ENTT_NOEXCEPT { + static constexpr auto update() noexcept { return basic_collector, type_list<>, AnyOf>, current_type, Other...>{}; } @@ -108,17 +99,15 @@ struct basic_collector, type_list, Rule * @return The updated collector. */ template - static constexpr auto where(exclude_t = {}) ENTT_NOEXCEPT { + static constexpr auto where(exclude_t = {}) noexcept { using extended_type = matcher, type_list, Rule...>; return basic_collector{}; } }; - /*! @brief Variable template used to ease the definition of collectors. */ inline constexpr basic_collector<> collector{}; - /** * @brief Observer. * @@ -166,11 +155,11 @@ inline constexpr basic_collector<> collector{}; * from the registry before being destroyed to avoid crashes due to dangling * pointers. * - * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Registry Basic registry type. */ -template -class basic_observer { - using payload_type = std::uint32_t; +template +class basic_observer: private basic_storage { + using base_type = basic_storage; template struct matcher_handler; @@ -178,32 +167,32 @@ class basic_observer { template struct matcher_handler, type_list, AnyOf>> { template - static void maybe_valid_if(basic_observer &obs, basic_registry ®, const Entity entt) { + static void maybe_valid_if(basic_observer &obs, Registry ®, const typename Registry::entity_type entt) { if(reg.template all_of(entt) && !reg.template any_of(entt)) { - if(!obs.storage.contains(entt)) { - obs.storage.emplace(entt); + if(!obs.contains(entt)) { + obs.emplace(entt); } - obs.storage.get(entt) |= (1 << Index); + obs.get(entt) |= (1 << Index); } } template - static void discard_if(basic_observer &obs, basic_registry &, const Entity entt) { - if(obs.storage.contains(entt) && !(obs.storage.get(entt) &= (~(1 << Index)))) { - obs.storage.erase(entt); + static void discard_if(basic_observer &obs, Registry &, const typename Registry::entity_type entt) { + if(obs.contains(entt) && !(obs.get(entt) &= (~(1 << Index)))) { + obs.erase(entt); } } template - static void connect(basic_observer &obs, basic_registry ®) { + static void connect(basic_observer &obs, Registry ®) { (reg.template on_destroy().template connect<&discard_if>(obs), ...); (reg.template on_construct().template connect<&discard_if>(obs), ...); reg.template on_update().template connect<&maybe_valid_if>(obs); reg.template on_destroy().template connect<&discard_if>(obs); } - static void disconnect(basic_observer &obs, basic_registry ®) { + static void disconnect(basic_observer &obs, Registry ®) { (reg.template on_destroy().disconnect(obs), ...); (reg.template on_construct().disconnect(obs), ...); reg.template on_update().disconnect(obs); @@ -214,32 +203,33 @@ class basic_observer { template struct matcher_handler, type_list, type_list, AllOf...>> { template - static void maybe_valid_if(basic_observer &obs, basic_registry ®, const Entity entt) { - if([®, entt]() { + static void maybe_valid_if(basic_observer &obs, Registry ®, const typename Registry::entity_type entt) { + auto condition = [®, entt]() { if constexpr(sizeof...(Ignore) == 0) { return reg.template all_of(entt) && !reg.template any_of(entt); } else { return reg.template all_of(entt) && ((std::is_same_v || !reg.template any_of(entt)) && ...) && !reg.template any_of(entt); } - }()) - { - if(!obs.storage.contains(entt)) { - obs.storage.emplace(entt); + }; + + if(condition()) { + if(!obs.contains(entt)) { + obs.emplace(entt); } - obs.storage.get(entt) |= (1 << Index); + obs.get(entt) |= (1 << Index); } } template - static void discard_if(basic_observer &obs, basic_registry &, const Entity entt) { - if(obs.storage.contains(entt) && !(obs.storage.get(entt) &= (~(1 << Index)))) { - obs.storage.erase(entt); + static void discard_if(basic_observer &obs, Registry &, const typename Registry::entity_type entt) { + if(obs.contains(entt) && !(obs.get(entt) &= (~(1 << Index)))) { + obs.erase(entt); } } template - static void connect(basic_observer &obs, basic_registry ®) { + static void connect(basic_observer &obs, Registry ®) { (reg.template on_destroy().template connect<&discard_if>(obs), ...); (reg.template on_construct().template connect<&discard_if>(obs), ...); (reg.template on_construct().template connect<&maybe_valid_if>(obs), ...); @@ -248,7 +238,7 @@ class basic_observer { (reg.template on_construct().template connect<&discard_if>(obs), ...); } - static void disconnect(basic_observer &obs, basic_registry ®) { + static void disconnect(basic_observer &obs, Registry ®) { (reg.template on_destroy().disconnect(obs), ...); (reg.template on_construct().disconnect(obs), ...); (reg.template on_construct().disconnect(obs), ...); @@ -259,30 +249,30 @@ class basic_observer { }; template - static void disconnect(basic_registry ®, basic_observer &obs) { + static void disconnect(Registry ®, basic_observer &obs) { (matcher_handler::disconnect(obs, reg), ...); } template - void connect(basic_registry ®, std::index_sequence) { - static_assert(sizeof...(Matcher) < std::numeric_limits::digits, "Too many matchers"); + void connect(Registry ®, std::index_sequence) { + static_assert(sizeof...(Matcher) < std::numeric_limits::digits, "Too many matchers"); (matcher_handler::template connect(*this, reg), ...); release.template connect<&basic_observer::disconnect>(reg); } public: + /*! Basic registry type. */ + using registry_type = Registry; /*! @brief Underlying entity identifier. */ - using entity_type = Entity; + using entity_type = typename registry_type::entity_type; /*! @brief Unsigned integer type. */ using size_type = std::size_t; /*! @brief Random access iterator type. */ - using iterator = typename basic_sparse_set::iterator; + using iterator = typename registry_type::base_type::iterator; /*! @brief Default constructor. */ basic_observer() - : release{}, - storage{} - {} + : release{} {} /*! @brief Default copy constructor, deleted on purpose. */ basic_observer(const basic_observer &) = delete; @@ -295,9 +285,8 @@ public: * @param reg A valid reference to a registry. */ template - basic_observer(basic_registry ®, basic_collector) - : basic_observer{} - { + basic_observer(registry_type ®, basic_collector) + : basic_observer{} { connect(reg, std::index_sequence_for{}); } @@ -308,13 +297,13 @@ public: * @brief Default copy assignment operator, deleted on purpose. * @return This observer. */ - basic_observer & operator=(const basic_observer &) = delete; + basic_observer &operator=(const basic_observer &) = delete; /** * @brief Default move assignment operator, deleted on purpose. * @return This observer. */ - basic_observer & operator=(basic_observer &&) = delete; + basic_observer &operator=(basic_observer &&) = delete; /** * @brief Connects an observer to a given registry. @@ -322,10 +311,10 @@ public: * @param reg A valid reference to a registry. */ template - void connect(basic_registry ®, basic_collector) { + void connect(registry_type ®, basic_collector) { disconnect(); connect(reg, std::index_sequence_for{}); - storage.clear(); + base_type::clear(); } /*! @brief Disconnects an observer from the registry it keeps track of. */ @@ -340,16 +329,16 @@ public: * @brief Returns the number of elements in an observer. * @return Number of elements. */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { - return storage.size(); + [[nodiscard]] size_type size() const noexcept { + return base_type::size(); } /** * @brief Checks whether an observer is empty. * @return True if the observer is empty, false otherwise. */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { - return storage.empty(); + [[nodiscard]] bool empty() const noexcept { + return base_type::empty(); } /** @@ -364,8 +353,8 @@ public: * * @return A pointer to the array of entities. */ - [[nodiscard]] const entity_type * data() const ENTT_NOEXCEPT { - return storage.data(); + [[nodiscard]] const entity_type *data() const noexcept { + return base_type::data(); } /** @@ -376,8 +365,8 @@ public: * * @return An iterator to the first entity of the observer. */ - [[nodiscard]] iterator begin() const ENTT_NOEXCEPT { - return storage.basic_sparse_set::begin(); + [[nodiscard]] iterator begin() const noexcept { + return base_type::base_type::begin(); } /** @@ -390,13 +379,13 @@ public: * @return An iterator to the entity following the last entity of the * observer. */ - [[nodiscard]] iterator end() const ENTT_NOEXCEPT { - return storage.basic_sparse_set::end(); + [[nodiscard]] iterator end() const noexcept { + return base_type::base_type::end(); } /*! @brief Clears the underlying container. */ - void clear() ENTT_NOEXCEPT { - storage.clear(); + void clear() noexcept { + base_type::clear(); } /** @@ -436,11 +425,8 @@ public: private: delegate release; - basic_storage storage; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/entity/organizer.hpp b/LiteLoader/third-party/include/entt/entity/organizer.hpp similarity index 51% rename from LiteLoader/Header/third-party/entt/entity/organizer.hpp rename to LiteLoader/third-party/include/entt/entity/organizer.hpp index d0ed9c8..ebda20b 100644 --- a/LiteLoader/Header/third-party/entt/entity/organizer.hpp +++ b/LiteLoader/third-party/include/entt/entity/organizer.hpp @@ -1,115 +1,98 @@ #ifndef ENTT_ENTITY_ORGANIZER_HPP #define ENTT_ENTITY_ORGANIZER_HPP - #include -#include #include -#include #include #include #include "../core/type_info.hpp" #include "../core/type_traits.hpp" +#include "../core/utility.hpp" +#include "../graph/adjacency_matrix.hpp" +#include "../graph/flow.hpp" #include "fwd.hpp" #include "helper.hpp" - namespace entt { - /** * @cond TURN_OFF_DOXYGEN * Internal details not to be documented. */ - namespace internal { - template struct is_view: std::false_type {}; -template -struct is_view, Component...>>: std::true_type {}; +template +struct is_view>: std::true_type {}; template inline constexpr bool is_view_v = is_view::value; - template struct unpack_type { using ro = std::conditional_t< - type_list_contains_v> || (std::is_const_v && !type_list_contains_v>), + type_list_contains_v || (std::is_const_v && !type_list_contains_v>), type_list>, - type_list<> - >; + type_list<>>; using rw = std::conditional_t< - type_list_contains_v> || (!std::is_const_v && !type_list_contains_v>), + type_list_contains_v> || (!std::is_const_v && !type_list_contains_v), type_list, - type_list<> - >; + type_list<>>; }; -template -struct unpack_type, type_list> { +template +struct unpack_type, type_list> { using ro = type_list<>; using rw = type_list<>; }; -template -struct unpack_type, type_list> - : unpack_type, type_list> -{}; +template +struct unpack_type, type_list> + : unpack_type, type_list> {}; -template -struct unpack_type, Component...>, type_list> { - using ro = type_list_cat_t, typename unpack_type>::ro...>; - using rw = type_list_cat_t>::rw...>; +template +struct unpack_type, exclude_t>, type_list> { + using ro = type_list_cat_t, typename unpack_type, type_list>::ro...>; + using rw = type_list_cat_t, type_list>::rw...>; }; -template -struct unpack_type, Component...>, type_list> - : unpack_type, Component...>, type_list> -{}; - +template +struct unpack_type, exclude_t>, type_list> + : unpack_type, exclude_t>, type_list> {}; template -struct resource; +struct resource_traits; template -struct resource, type_list> { +struct resource_traits, type_list> { using args = type_list...>; using ro = type_list_cat_t>::ro..., typename unpack_type>::ro...>; using rw = type_list_cat_t>::rw..., typename unpack_type>::rw...>; }; - template -resource...>, type_list> free_function_to_resource(Ret(*)(Args...)); +resource_traits...>, type_list> free_function_to_resource_traits(Ret (*)(Args...)); template -resource...>, type_list> constrained_function_to_resource(Ret(*)(Type &, Args...)); +resource_traits...>, type_list> constrained_function_to_resource_traits(Ret (*)(Type &, Args...)); template -resource...>, type_list> constrained_function_to_resource(Ret(Class:: *)(Args...)); +resource_traits...>, type_list> constrained_function_to_resource_traits(Ret (Class::*)(Args...)); template -resource...>, type_list> constrained_function_to_resource(Ret(Class:: *)(Args...) const); - -template -resource, type_list> to_resource(); - - -} +resource_traits...>, type_list> constrained_function_to_resource_traits(Ret (Class::*)(Args...) const); +} // namespace internal /** * Internal details not to be documented. * @endcond */ - /** * @brief Utility class for creating a static task graph. * @@ -119,13 +102,13 @@ resource, type_list> to_resource(); * goal of the tool. Instead, they are returned to the user in the form of a * graph that allows for safe execution. * - * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Registry Basic registry type. */ -template +template class basic_organizer final { - using callback_type = void(const void *, entt::basic_registry &); - using prepare_type = void(entt::basic_registry &); - using dependency_type = std::size_t(const bool, type_info *, const std::size_t); + using callback_type = void(const void *, Registry &); + using prepare_type = void(Registry &); + using dependency_type = std::size_t(const bool, const type_info **, const std::size_t); struct vertex_data final { std::size_t ro_count{}; @@ -135,117 +118,54 @@ class basic_organizer final { callback_type *callback{}; dependency_type *dependency; prepare_type *prepare{}; - type_info info{}; + const type_info *info{}; }; template - [[nodiscard]] static decltype(auto) extract(basic_registry ®) { - if constexpr(std::is_same_v>) { + [[nodiscard]] static decltype(auto) extract(Registry ®) { + if constexpr(std::is_same_v) { return reg; } else if constexpr(internal::is_view_v) { return as_view{reg}; } else { - return reg.template ctx_or_set>(); + return reg.ctx().template emplace>(); } } template - [[nodiscard]] static auto to_args(basic_registry ®, type_list) { + [[nodiscard]] static auto to_args(Registry ®, type_list) { return std::tuple(reg))...>(extract(reg)...); } template - static std::size_t fill_dependencies(type_list, [[maybe_unused]] type_info *buffer, [[maybe_unused]] const std::size_t count) { + static std::size_t fill_dependencies(type_list, [[maybe_unused]] const type_info **buffer, [[maybe_unused]] const std::size_t count) { if constexpr(sizeof...(Type) == 0u) { return {}; } else { - type_info info[sizeof...(Type)]{type_id()...}; - const auto length = (std::min)(count, sizeof...(Type)); - std::copy_n(info, length, buffer); + const type_info *info[sizeof...(Type)]{&type_id()...}; + const auto length = count < sizeof...(Type) ? count : sizeof...(Type); + + for(std::size_t pos{}; pos < length; ++pos) { + buffer[pos] = info[pos]; + } + return length; } } template void track_dependencies(std::size_t index, const bool requires_registry, type_list, type_list) { - dependencies[type_hash>::value()].emplace_back(index, requires_registry || (sizeof...(RO) + sizeof...(RW) == 0u)); - (dependencies[type_hash::value()].emplace_back(index, false), ...); - (dependencies[type_hash::value()].emplace_back(index, true), ...); - } - - [[nodiscard]] std::vector adjacency_matrix() { - const auto length = vertices.size(); - std::vector edges(length * length, false); - - // creates the ajacency matrix - for(const auto &deps: dependencies) { - const auto last = deps.second.cend(); - auto it = deps.second.cbegin(); - - while(it != last) { - if(it->second) { - // rw item - if(auto curr = it++; it != last) { - if(it->second) { - edges[curr->first * length + it->first] = true; - } else { - if(const auto next = std::find_if(it, last, [](const auto &elem) { return elem.second; }); next != last) { - for(; it != next; ++it) { - edges[curr->first * length + it->first] = true; - edges[it->first * length + next->first] = true; - } - } else { - for(; it != next; ++it) { - edges[curr->first * length + it->first] = true; - } - } - } - } - } else { - // ro item, possibly only on first iteration - if(const auto next = std::find_if(it, last, [](const auto &elem) { return elem.second; }); next != last) { - for(; it != next; ++it) { - edges[it->first * length + next->first] = true; - } - } else { - it = last; - } - } - } - } - - // computes the transitive closure - for(std::size_t vk{}; vk < length; ++vk) { - for(std::size_t vi{}; vi < length; ++vi) { - for(std::size_t vj{}; vj < length; ++vj) { - edges[vi * length + vj] = edges[vi * length + vj] || (edges[vi * length + vk] && edges[vk * length + vj]); - } - } - } - - // applies the transitive reduction - for(std::size_t vert{}; vert < length; ++vert) { - edges[vert * length + vert] = false; - } - - for(std::size_t vj{}; vj < length; ++vj) { - for(std::size_t vi{}; vi < length; ++vi) { - if(edges[vi * length + vj]) { - for(std::size_t vk{}; vk < length; ++vk) { - if(edges[vj * length + vk]) { - edges[vi * length + vk] = false; - } - } - } - } - } - - return edges; + builder.bind(static_cast(index)); + builder.set(type_hash::value(), requires_registry || (sizeof...(RO) + sizeof...(RW) == 0u)); + (builder.ro(type_hash::value()), ...); + (builder.rw(type_hash::value()), ...); } public: + /*! Basic registry type. */ + using registry_type = Registry; /*! @brief Underlying entity identifier. */ - using entity_type = Entity; + using entity_type = typename registry_type::entity_type; /*! @brief Unsigned integer type. */ using size_type = std::size_t; /*! @brief Raw task function type. */ @@ -262,8 +182,7 @@ public: vertex(const bool vtype, vertex_data data, std::vector edges) : is_top_level{vtype}, node{std::move(data)}, - reachable{std::move(edges)} - {} + reachable{std::move(edges)} {} /** * @brief Fills a buffer with the type info objects for the writable @@ -272,7 +191,7 @@ public: * @param length The length of the user-supplied buffer. * @return The number of type info objects written to the buffer. */ - size_type ro_dependency(type_info *buffer, const std::size_t length) const ENTT_NOEXCEPT { + size_type ro_dependency(const type_info **buffer, const std::size_t length) const noexcept { return node.dependency(false, buffer, length); } @@ -283,7 +202,7 @@ public: * @param length The length of the user-supplied buffer. * @return The number of type info objects written to the buffer. */ - size_type rw_dependency(type_info *buffer, const std::size_t length) const ENTT_NOEXCEPT { + size_type rw_dependency(const type_info **buffer, const std::size_t length) const noexcept { return node.dependency(true, buffer, length); } @@ -291,7 +210,7 @@ public: * @brief Returns the number of read-only resources of a vertex. * @return The number of read-only resources of the vertex. */ - size_type ro_count() const ENTT_NOEXCEPT { + size_type ro_count() const noexcept { return node.ro_count; } @@ -299,7 +218,7 @@ public: * @brief Returns the number of writable resources of a vertex. * @return The number of writable resources of the vertex. */ - size_type rw_count() const ENTT_NOEXCEPT { + size_type rw_count() const noexcept { return node.rw_count; } @@ -307,7 +226,7 @@ public: * @brief Checks if a vertex is also a top-level one. * @return True if the vertex is a top-level one, false otherwise. */ - bool top_level() const ENTT_NOEXCEPT { + bool top_level() const noexcept { return is_top_level; } @@ -315,15 +234,15 @@ public: * @brief Returns a type info object associated with a vertex. * @return A properly initialized type info object. */ - type_info info() const ENTT_NOEXCEPT { - return node.info; + const type_info &info() const noexcept { + return *node.info; } /** * @brief Returns a user defined name associated with a vertex, if any. * @return The user defined name associated with the vertex, if any. */ - const char * name() const ENTT_NOEXCEPT { + const char *name() const noexcept { return node.name; } @@ -331,7 +250,7 @@ public: * @brief Returns the function associated with a vertex. * @return The function associated with the vertex. */ - function_type * callback() const ENTT_NOEXCEPT { + function_type *callback() const noexcept { return node.callback; } @@ -339,7 +258,7 @@ public: * @brief Returns the payload associated with a vertex, if any. * @return The payload associated with the vertex, if any. */ - const void * data() const ENTT_NOEXCEPT { + const void *data() const noexcept { return node.payload; } @@ -347,7 +266,7 @@ public: * @brief Returns the list of nodes reachable from a given vertex. * @return The list of nodes reachable from the vertex. */ - const std::vector & children() const ENTT_NOEXCEPT { + const std::vector &children() const noexcept { return reachable; } @@ -356,7 +275,7 @@ public: * are properly instantiated before using them. * @param reg A valid registry. */ - void prepare(basic_registry ®) const { + void prepare(registry_type ®) const { node.prepare ? node.prepare(reg) : void(); } @@ -374,25 +293,25 @@ public: */ template void emplace(const char *name = nullptr) { - using resource_type = decltype(internal::free_function_to_resource(Candidate)); - constexpr auto requires_registry = type_list_contains_v>; + using resource_type = decltype(internal::free_function_to_resource_traits(Candidate)); + constexpr auto requires_registry = type_list_contains_v; - callback_type *callback = +[](const void *, basic_registry ®) { + callback_type *callback = +[](const void *, registry_type ®) { std::apply(Candidate, to_args(reg, typename resource_type::args{})); }; - track_dependencies(vertices.size(), requires_registry, typename resource_type::ro{}, typename resource_type::rw{}); - - vertices.push_back({ + vertex_data vdata{ resource_type::ro::size, resource_type::rw::size, name, nullptr, callback, - +[](const bool rw, type_info *buffer, const std::size_t length) { return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); }, - +[](basic_registry ®) { void(to_args(reg, typename resource_type::args{})); }, - type_id>() - }); + +[](const bool rw, const type_info **buffer, const std::size_t length) { return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); }, + +[](registry_type ®) { void(to_args(reg, typename resource_type::args{})); }, + &type_id>()}; + + track_dependencies(vertices.size(), requires_registry, typename resource_type::ro{}, typename resource_type::rw{}); + vertices.push_back(std::move(vdata)); } /** @@ -406,30 +325,26 @@ public: */ template void emplace(Type &value_or_instance, const char *name = nullptr) { - using resource_type = decltype(internal::constrained_function_to_resource(Candidate)); - constexpr auto requires_registry = type_list_contains_v>; + using resource_type = decltype(internal::constrained_function_to_resource_traits(Candidate)); + constexpr auto requires_registry = type_list_contains_v; - callback_type *callback = +[](const void *payload, basic_registry ®) { + callback_type *callback = +[](const void *payload, registry_type ®) { Type *curr = static_cast(const_cast *>(payload)); std::apply(Candidate, std::tuple_cat(std::forward_as_tuple(*curr), to_args(reg, typename resource_type::args{}))); }; - track_dependencies(vertices.size(), requires_registry, typename resource_type::ro{}, typename resource_type::rw{}); - - vertices.push_back({ + vertex_data vdata{ resource_type::ro::size, resource_type::rw::size, name, &value_or_instance, callback, - +[](const bool rw, type_info *buffer, const std::size_t length) { - return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); - }, - +[](basic_registry ®) { - void(to_args(reg, typename resource_type::args{})); - }, - type_id>() - }); + +[](const bool rw, const type_info **buffer, const std::size_t length) { return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); }, + +[](registry_type ®) { void(to_args(reg, typename resource_type::args{})); }, + &type_id>()}; + + track_dependencies(vertices.size(), requires_registry, typename resource_type::ro{}, typename resource_type::rw{}); + vertices.push_back(std::move(vdata)); } /** @@ -442,21 +357,20 @@ public: */ template void emplace(function_type *func, const void *payload = nullptr, const char *name = nullptr) { - using resource_type = internal::resource, type_list>; + using resource_type = internal::resource_traits, type_list>; track_dependencies(vertices.size(), true, typename resource_type::ro{}, typename resource_type::rw{}); - vertices.push_back({ + vertex_data vdata{ resource_type::ro::size, resource_type::rw::size, name, payload, func, - +[](const bool rw, type_info *buffer, const std::size_t length) { - return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); - }, + +[](const bool rw, const type_info **buffer, const std::size_t length) { return rw ? fill_dependencies(typename resource_type::rw{}, buffer, length) : fill_dependencies(typename resource_type::ro{}, buffer, length); }, nullptr, - type_info{} - }); + &type_id()}; + + vertices.push_back(std::move(vdata)); } /** @@ -464,28 +378,19 @@ public: * @return The adjacency list of the task graph. */ std::vector graph() { - const auto edges = adjacency_matrix(); - - // creates the adjacency list std::vector adjacency_list{}; adjacency_list.reserve(vertices.size()); + auto adjacency_matrix = builder.graph(); - for(std::size_t col{}, length = vertices.size(); col < length; ++col) { + for(auto curr: adjacency_matrix.vertices()) { + const auto iterable = adjacency_matrix.in_edges(curr); std::vector reachable{}; - const auto row = col * length; - bool is_top_level = true; - for(std::size_t next{}; next < length; ++next) { - if(edges[row + next]) { - reachable.push_back(next); - } + for(auto &&edge: adjacency_matrix.out_edges(curr)) { + reachable.push_back(edge.second); } - for(std::size_t next{}; next < length && is_top_level; ++next) { - is_top_level = !edges[next * length + col]; - } - - adjacency_list.emplace_back(is_top_level, vertices[col], std::move(reachable)); + adjacency_list.emplace_back(iterable.cbegin() == iterable.cend(), vertices[curr], std::move(reachable)); } return adjacency_list; @@ -493,17 +398,15 @@ public: /*! @brief Erases all elements from a container. */ void clear() { - dependencies.clear(); + builder.clear(); vertices.clear(); } private: - std::unordered_map>> dependencies; std::vector vertices; + flow builder; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/entity/registry.hpp b/LiteLoader/third-party/include/entt/entity/registry.hpp new file mode 100644 index 0000000..4841640 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/registry.hpp @@ -0,0 +1,1530 @@ +#ifndef ENTT_ENTITY_REGISTRY_HPP +#define ENTT_ENTITY_REGISTRY_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../container/dense_map.hpp" +#include "../core/algorithm.hpp" +#include "../core/any.hpp" +#include "../core/compressed_pair.hpp" +#include "../core/fwd.hpp" +#include "../core/iterator.hpp" +#include "../core/memory.hpp" +#include "../core/type_info.hpp" +#include "../core/type_traits.hpp" +#include "../core/utility.hpp" +#include "component.hpp" +#include "entity.hpp" +#include "fwd.hpp" +#include "group.hpp" +#include "sparse_set.hpp" +#include "storage.hpp" +#include "view.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class registry_storage_iterator final { + template + friend class registry_storage_iterator; + + using mapped_type = std::remove_reference_t()->second)>; + +public: + using value_type = std::pair &>; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr registry_storage_iterator() noexcept + : it{} {} + + constexpr registry_storage_iterator(It iter) noexcept + : it{iter} {} + + template && std::is_constructible_v>> + constexpr registry_storage_iterator(const registry_storage_iterator &other) noexcept + : registry_storage_iterator{other.it} {} + + constexpr registry_storage_iterator &operator++() noexcept { + return ++it, *this; + } + + constexpr registry_storage_iterator operator++(int) noexcept { + registry_storage_iterator orig = *this; + return ++(*this), orig; + } + + constexpr registry_storage_iterator &operator--() noexcept { + return --it, *this; + } + + constexpr registry_storage_iterator operator--(int) noexcept { + registry_storage_iterator orig = *this; + return operator--(), orig; + } + + constexpr registry_storage_iterator &operator+=(const difference_type value) noexcept { + it += value; + return *this; + } + + constexpr registry_storage_iterator operator+(const difference_type value) const noexcept { + registry_storage_iterator copy = *this; + return (copy += value); + } + + constexpr registry_storage_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr registry_storage_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return {it[value].first, *it[value].second}; + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return {it->first, *it->second}; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + template + friend constexpr std::ptrdiff_t operator-(const registry_storage_iterator &, const registry_storage_iterator &) noexcept; + + template + friend constexpr bool operator==(const registry_storage_iterator &, const registry_storage_iterator &) noexcept; + + template + friend constexpr bool operator<(const registry_storage_iterator &, const registry_storage_iterator &) noexcept; + +private: + It it; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return lhs.it - rhs.it; +} + +template +[[nodiscard]] constexpr bool operator==(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return lhs.it < rhs.it; +} + +template +[[nodiscard]] constexpr bool operator>(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return rhs < lhs; +} + +template +[[nodiscard]] constexpr bool operator<=(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const registry_storage_iterator &lhs, const registry_storage_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +class registry_context { + using key_type = id_type; + using mapped_type = basic_any<0u>; + using container_type = dense_map; + +public: + template + [[deprecated("Use ::emplace_as instead")]] Type &emplace_hint(const id_type id, Args &&...args) { + return emplace_as(id, std::forward(args)...); + } + + template + Type &emplace_as(const id_type id, Args &&...args) { + return any_cast(ctx.try_emplace(id, std::in_place_type, std::forward(args)...).first->second); + } + + template + Type &emplace(Args &&...args) { + return emplace_as(type_id().hash(), std::forward(args)...); + } + + template + Type &insert_or_assign(const id_type id, Type &&value) { + return any_cast> &>(ctx.insert_or_assign(id, std::forward(value)).first->second); + } + + template + Type &insert_or_assign(Type &&value) { + return insert_or_assign(type_id().hash(), std::forward(value)); + } + + template + bool erase(const id_type id = type_id().hash()) { + const auto it = ctx.find(id); + return it != ctx.end() && it->second.type() == type_id() ? (ctx.erase(it), true) : false; + } + + template + [[deprecated("Use ::get instead")]] [[nodiscard]] const Type &at(const id_type id = type_id().hash()) const { + return get(id); + } + + template + [[deprecated("Use ::get instead")]] [[nodiscard]] Type &at(const id_type id = type_id().hash()) { + return get(id); + } + + template + [[nodiscard]] const Type &get(const id_type id = type_id().hash()) const { + return any_cast(ctx.at(id)); + } + + template + [[nodiscard]] Type &get(const id_type id = type_id().hash()) { + return any_cast(ctx.at(id)); + } + + template + [[nodiscard]] const Type *find(const id_type id = type_id().hash()) const { + const auto it = ctx.find(id); + return it != ctx.cend() ? any_cast(&it->second) : nullptr; + } + + template + [[nodiscard]] Type *find(const id_type id = type_id().hash()) { + const auto it = ctx.find(id); + return it != ctx.end() ? any_cast(&it->second) : nullptr; + } + + template + [[nodiscard]] bool contains(const id_type id = type_id().hash()) const { + const auto it = ctx.find(id); + return it != ctx.cend() && it->second.type() == type_id(); + } + +private: + container_type ctx; +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Fast and reliable entity-component system. + * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_registry { + using alloc_traits = typename std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using basic_common_type = basic_sparse_set; + using entity_traits = entt_traits; + + template + using storage_for_type = typename storage_for>>::type; + + template + struct group_handler; + + template + struct group_handler, get_t, Owned...> { + // nasty workaround for an issue with the toolset v141 that doesn't accept a fold expression here + static_assert(!std::disjunction_v::in_place_delete>...>, "Groups do not support in-place delete"); + using value_type = std::conditional_t; + value_type current{}; + + template + group_handler(Args &&...args) + : current{std::forward(args)...} {} + + template + void maybe_valid_if(basic_registry &owner, const Entity entt) { + [[maybe_unused]] const auto cpools = std::forward_as_tuple(owner.assure()...); + + const auto is_valid = ((std::is_same_v || std::get &>(cpools).contains(entt)) && ...) + && ((std::is_same_v || owner.assure().contains(entt)) && ...) + && ((std::is_same_v || !owner.assure().contains(entt)) && ...); + + if constexpr(sizeof...(Owned) == 0) { + if(is_valid && !current.contains(entt)) { + current.emplace(entt); + } + } else { + if(is_valid && !(std::get<0>(cpools).index(entt) < current)) { + const auto pos = current++; + (std::get &>(cpools).swap_elements(std::get &>(cpools).data()[pos], entt), ...); + } + } + } + + void discard_if([[maybe_unused]] basic_registry &owner, const Entity entt) { + if constexpr(sizeof...(Owned) == 0) { + current.remove(entt); + } else { + if(const auto cpools = std::forward_as_tuple(owner.assure()...); std::get<0>(cpools).contains(entt) && (std::get<0>(cpools).index(entt) < current)) { + const auto pos = --current; + (std::get &>(cpools).swap_elements(std::get &>(cpools).data()[pos], entt), ...); + } + } + } + }; + + struct group_data { + std::size_t size; + std::shared_ptr group; + bool (*owned)(const id_type) noexcept; + bool (*get)(const id_type) noexcept; + bool (*exclude)(const id_type) noexcept; + }; + + template + [[nodiscard]] auto &assure(const id_type id = type_hash::value()) { + static_assert(std::is_same_v>, "Non-decayed types not allowed"); + auto &cpool = pools[id]; + + if(!cpool) { + cpool = std::allocate_shared>>(get_allocator(), get_allocator()); + cpool->bind(forward_as_any(*this)); + } + + ENTT_ASSERT(cpool->type() == type_id(), "Unexpected type"); + return static_cast &>(*cpool); + } + + template + [[nodiscard]] const auto &assure(const id_type id = type_hash::value()) const { + static_assert(std::is_same_v>, "Non-decayed types not allowed"); + + if(const auto it = pools.find(id); it != pools.cend()) { + ENTT_ASSERT(it->second->type() == type_id(), "Unexpected type"); + return static_cast &>(*it->second); + } + + static storage_for_type placeholder{}; + return placeholder; + } + + auto generate_identifier(const std::size_t pos) noexcept { + ENTT_ASSERT(pos < entity_traits::to_entity(null), "No entities available"); + return entity_traits::combine(static_cast(pos), {}); + } + + auto recycle_identifier() noexcept { + ENTT_ASSERT(free_list != null, "No entities available"); + const auto curr = entity_traits::to_entity(free_list); + free_list = entity_traits::combine(entity_traits::to_integral(epool[curr]), tombstone); + return (epool[curr] = entity_traits::combine(curr, entity_traits::to_integral(epool[curr]))); + } + + auto release_entity(const Entity entt, const typename entity_traits::version_type version) { + const typename entity_traits::version_type vers = version + (version == entity_traits::to_version(tombstone)); + epool[entity_traits::to_entity(entt)] = entity_traits::construct(entity_traits::to_integral(free_list), vers); + free_list = entity_traits::combine(entity_traits::to_integral(entt), tombstone); + return vers; + } + + void rebind() { + for(auto &&curr: pools) { + curr.second->bind(forward_as_any(*this)); + } + } + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Underlying entity identifier. */ + using entity_type = Entity; + /*! @brief Underlying version type. */ + using version_type = typename entity_traits::version_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = basic_common_type; + /*! @brief Context type. */ + using context = internal::registry_context; + + /*! @brief Default constructor. */ + basic_registry() + : basic_registry{allocator_type{}} {} + + /** + * @brief Constructs an empty registry with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_registry(const allocator_type &allocator) + : basic_registry{0u, allocator} {} + + /** + * @brief Allocates enough memory upon construction to store `count` pools. + * @param count The number of pools to allocate memory for. + * @param allocator The allocator to use. + */ + basic_registry(const size_type count, const allocator_type &allocator = allocator_type{}) + : vars{}, + free_list{tombstone}, + epool{allocator}, + pools{allocator}, + groups{allocator} { + pools.reserve(count); + } + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_registry(basic_registry &&other) noexcept + : vars{std::move(other.vars)}, + free_list{std::move(other.free_list)}, + epool{std::move(other.epool)}, + pools{std::move(other.pools)}, + groups{std::move(other.groups)} { + rebind(); + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This registry. + */ + basic_registry &operator=(basic_registry &&other) noexcept { + vars = std::move(other.vars); + free_list = std::move(other.free_list); + epool = std::move(other.epool); + pools = std::move(other.pools); + groups = std::move(other.groups); + + rebind(); + + return *this; + } + + /** + * @brief Exchanges the contents with those of a given registry. + * @param other Registry to exchange the content with. + */ + void swap(basic_registry &other) { + using std::swap; + swap(vars, other.vars); + swap(free_list, other.free_list); + swap(epool, other.epool); + swap(pools, other.pools); + swap(groups, other.groups); + + rebind(); + other.rebind(); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return epool.get_allocator(); + } + + /** + * @brief Returns an iterable object to use to _visit_ a registry. + * + * The iterable object returns a pair that contains the name and a reference + * to the current storage. + * + * @return An iterable object to use to _visit_ the registry. + */ + [[nodiscard]] auto storage() noexcept { + return iterable_adaptor{internal::registry_storage_iterator{pools.begin()}, internal::registry_storage_iterator{pools.end()}}; + } + + /*! @copydoc storage */ + [[nodiscard]] auto storage() const noexcept { + return iterable_adaptor{internal::registry_storage_iterator{pools.cbegin()}, internal::registry_storage_iterator{pools.cend()}}; + } + + /** + * @brief Finds the storage associated with a given name, if any. + * @param id Name used to map the storage within the registry. + * @return A pointer to the storage if it exists, a null pointer otherwise. + */ + [[nodiscard]] base_type *storage(const id_type id) { + return const_cast(std::as_const(*this).storage(id)); + } + + /** + * @brief Finds the storage associated with a given name, if any. + * @param id Name used to map the storage within the registry. + * @return A pointer to the storage if it exists, a null pointer otherwise. + */ + [[nodiscard]] const base_type *storage(const id_type id) const { + const auto it = pools.find(id); + return it == pools.cend() ? nullptr : it->second.get(); + } + + /** + * @brief Returns the storage for a given component type. + * @tparam Type Type of component of which to return the storage. + * @param id Optional name used to map the storage within the registry. + * @return The storage for the given component type. + */ + template + decltype(auto) storage(const id_type id = type_hash::value()) { + return assure(id); + } + + /** + * @brief Returns the storage for a given component type. + * + * @warning + * If a storage for the given component doesn't exist yet, a temporary + * placeholder is returned instead. + * + * @tparam Type Type of component of which to return the storage. + * @param id Optional name used to map the storage within the registry. + * @return The storage for the given component type. + */ + template + decltype(auto) storage(const id_type id = type_hash::value()) const { + return assure(id); + } + + /** + * @brief Returns the number of entities created so far. + * @return Number of entities created so far. + */ + [[nodiscard]] size_type size() const noexcept { + return epool.size(); + } + + /** + * @brief Returns the number of entities still in use. + * @return Number of entities still in use. + */ + [[nodiscard]] size_type alive() const { + auto sz = epool.size(); + + for(auto curr = free_list; curr != null; --sz) { + curr = epool[entity_traits::to_entity(curr)]; + } + + return sz; + } + + /** + * @brief Increases the capacity (number of entities) of the registry. + * @param cap Desired capacity. + */ + void reserve(const size_type cap) { + epool.reserve(cap); + } + + /** + * @brief Returns the number of entities that a registry has currently + * allocated space for. + * @return Capacity of the registry. + */ + [[nodiscard]] size_type capacity() const noexcept { + return epool.capacity(); + } + + /** + * @brief Checks whether the registry is empty (no entities still in use). + * @return True if the registry is empty, false otherwise. + */ + [[nodiscard]] bool empty() const { + return !alive(); + } + + /** + * @brief Direct access to the list of entities of a registry. + * + * The returned pointer is such that range `[data(), data() + size())` is + * always a valid range, even if the registry is empty. + * + * @warning + * This list contains both valid and destroyed entities and isn't suitable + * for direct use. + * + * @return A pointer to the array of entities. + */ + [[nodiscard]] const entity_type *data() const noexcept { + return epool.data(); + } + + /** + * @brief Returns the head of the list of released entities. + * + * This function is intended for use in conjunction with `assign`.
+ * The returned entity has an invalid identifier in all cases. + * + * @return The head of the list of released entities. + */ + [[nodiscard]] entity_type released() const noexcept { + return free_list; + } + + /** + * @brief Checks if an identifier refers to a valid entity. + * @param entt An identifier, either valid or not. + * @return True if the identifier is valid, false otherwise. + */ + [[nodiscard]] bool valid(const entity_type entt) const { + const auto pos = size_type(entity_traits::to_entity(entt)); + return (pos < epool.size() && epool[pos] == entt); + } + + /** + * @brief Returns the actual version for an identifier. + * @param entt A valid identifier. + * @return The version for the given identifier if valid, the tombstone + * version otherwise. + */ + [[nodiscard]] version_type current(const entity_type entt) const { + const auto pos = size_type(entity_traits::to_entity(entt)); + return entity_traits::to_version(pos < epool.size() ? epool[pos] : tombstone); + } + + /** + * @brief Creates a new entity or recycles a destroyed one. + * @return A valid identifier. + */ + [[nodiscard]] entity_type create() { + return (free_list == null) ? epool.emplace_back(generate_identifier(epool.size())) : recycle_identifier(); + } + + /** + * @copybrief create + * + * If the requested entity isn't in use, the suggested identifier is used. + * Otherwise, a new identifier is generated. + * + * @param hint Required identifier. + * @return A valid identifier. + */ + [[nodiscard]] entity_type create(const entity_type hint) { + const auto length = epool.size(); + + if(hint == null || hint == tombstone) { + return create(); + } else if(const auto req = entity_traits::to_entity(hint); !(req < length)) { + epool.resize(size_type(req) + 1u, null); + + for(auto pos = length; pos < req; ++pos) { + release_entity(generate_identifier(pos), {}); + } + + return (epool[req] = hint); + } else if(const auto curr = entity_traits::to_entity(epool[req]); req == curr) { + return create(); + } else { + auto *it = &free_list; + for(; entity_traits::to_entity(*it) != req; it = &epool[entity_traits::to_entity(*it)]) {} + *it = entity_traits::combine(curr, entity_traits::to_integral(*it)); + return (epool[req] = hint); + } + } + + /** + * @brief Assigns each element in a range an identifier. + * + * @sa create + * + * @tparam It Type of forward iterator. + * @param first An iterator to the first element of the range to generate. + * @param last An iterator past the last element of the range to generate. + */ + template + void create(It first, It last) { + for(; free_list != null && first != last; ++first) { + *first = recycle_identifier(); + } + + const auto length = epool.size(); + epool.resize(length + std::distance(first, last), null); + + for(auto pos = length; first != last; ++first, ++pos) { + *first = epool[pos] = generate_identifier(pos); + } + } + + /** + * @brief Assigns identifiers to an empty registry. + * + * This function is intended for use in conjunction with `data`, `size` and + * `released`.
+ * Don't try to inject ranges of randomly generated entities nor the _wrong_ + * head for the list of destroyed entities. There is no guarantee that a + * registry will continue to work properly in this case. + * + * @warning + * There must be no entities still alive for this to work properly. + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param destroyed The head of the list of destroyed entities. + */ + template + void assign(It first, It last, const entity_type destroyed) { + ENTT_ASSERT(!alive(), "Entities still alive"); + epool.assign(first, last); + free_list = destroyed; + } + + /** + * @brief Releases an identifier. + * + * The version is updated and the identifier can be recycled at any time. + * + * @warning + * Attempting to use an invalid entity results in undefined behavior. + * + * @param entt A valid identifier. + * @return The version of the recycled entity. + */ + version_type release(const entity_type entt) { + return release(entt, static_cast(entity_traits::to_version(entt) + 1u)); + } + + /** + * @brief Releases an identifier. + * + * The suggested version or the valid version closest to the suggested one + * is used instead of the implicitly generated version. + * + * @sa release + * + * @param entt A valid identifier. + * @param version A desired version upon destruction. + * @return The version actually assigned to the entity. + */ + version_type release(const entity_type entt, const version_type version) { + ENTT_ASSERT(valid(entt), "Invalid identifier"); + ENTT_ASSERT(std::all_of(pools.cbegin(), pools.cend(), [entt](auto &&curr) { return (curr.second->current(entt) == entity_traits::to_version(tombstone)); }), "Non-orphan entity"); + return release_entity(entt, version); + } + + /** + * @brief Releases all identifiers in a range. + * + * @sa release + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + template + void release(It first, It last) { + for(; first != last; ++first) { + release(*first); + } + } + + /** + * @brief Destroys an entity and releases its identifier. + * + * @sa release + * + * @warning + * Adding or removing components to an entity that is being destroyed can + * result in undefined behavior. Attempting to use an invalid entity results + * in undefined behavior. + * + * @param entt A valid identifier. + * @return The version of the recycled entity. + */ + version_type destroy(const entity_type entt) { + return destroy(entt, static_cast(entity_traits::to_version(entt) + 1u)); + } + + /** + * @brief Destroys an entity and releases its identifier. + * + * The suggested version or the valid version closest to the suggested one + * is used instead of the implicitly generated version. + * + * @sa destroy + * + * @param entt A valid identifier. + * @param version A desired version upon destruction. + * @return The version actually assigned to the entity. + */ + version_type destroy(const entity_type entt, const version_type version) { + for(size_type pos = pools.size(); pos; --pos) { + pools.begin()[pos - 1u].second->remove(entt); + } + + return release(entt, version); + } + + /** + * @brief Destroys all entities in a range and releases their identifiers. + * + * @sa destroy + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + template + void destroy(It first, It last) { + for(; first != last; ++first) { + destroy(*first); + } + } + + /** + * @brief Assigns the given component to an entity. + * + * The component must have a proper constructor or be of aggregate type. + * + * @warning + * Attempting to assign a component to an entity that already owns it + * results in undefined behavior. + * + * @tparam Type Type of component to create. + * @tparam Args Types of arguments to use to construct the component. + * @param entt A valid identifier. + * @param args Parameters to use to initialize the component. + * @return A reference to the newly created component. + */ + template + decltype(auto) emplace(const entity_type entt, Args &&...args) { + return assure().emplace(entt, std::forward(args)...); + } + + /** + * @brief Assigns each entity in a range the given component. + * + * @sa emplace + * + * @tparam Type Type of component to create. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param value An instance of the component to assign. + */ + template + void insert(It first, It last, const Type &value = {}) { + assure().insert(first, last, value); + } + + /** + * @brief Assigns each entity in a range the given components. + * + * @sa emplace + * + * @tparam Type Type of component to create. + * @tparam EIt Type of input iterator. + * @tparam CIt Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param from An iterator to the first element of the range of components. + */ + template::value_type, Type>>> + void insert(EIt first, EIt last, CIt from) { + assure().insert(first, last, from); + } + + /** + * @brief Assigns or replaces the given component for an entity. + * + * @sa emplace + * @sa replace + * + * @tparam Type Type of component to assign or replace. + * @tparam Args Types of arguments to use to construct the component. + * @param entt A valid identifier. + * @param args Parameters to use to initialize the component. + * @return A reference to the newly created component. + */ + template + decltype(auto) emplace_or_replace(const entity_type entt, Args &&...args) { + if(auto &cpool = assure(); cpool.contains(entt)) { + return cpool.patch(entt, [&args...](auto &...curr) { ((curr = Type{std::forward(args)...}), ...); }); + } else { + return cpool.emplace(entt, std::forward(args)...); + } + } + + /** + * @brief Patches the given component for an entity. + * + * The signature of the function should be equivalent to the following: + * + * @code{.cpp} + * void(Type &); + * @endcode + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned. However, this function can be used to trigger an update signal + * for them. + * + * @warning + * Attempting to to patch a component of an entity that doesn't own it + * results in undefined behavior. + * + * @tparam Type Type of component to patch. + * @tparam Func Types of the function objects to invoke. + * @param entt A valid identifier. + * @param func Valid function objects. + * @return A reference to the patched component. + */ + template + decltype(auto) patch(const entity_type entt, Func &&...func) { + return assure().patch(entt, std::forward(func)...); + } + + /** + * @brief Replaces the given component for an entity. + * + * The component must have a proper constructor or be of aggregate type. + * + * @warning + * Attempting to replace a component of an entity that doesn't own it + * results in undefined behavior. + * + * @tparam Type Type of component to replace. + * @tparam Args Types of arguments to use to construct the component. + * @param entt A valid identifier. + * @param args Parameters to use to initialize the component. + * @return A reference to the component being replaced. + */ + template + decltype(auto) replace(const entity_type entt, Args &&...args) { + return patch(entt, [&args...](auto &...curr) { ((curr = Type{std::forward(args)...}), ...); }); + } + + /** + * @brief Removes the given components from an entity. + * + * @tparam Type Type of component to remove. + * @tparam Other Other types of components to remove. + * @param entt A valid identifier. + * @return The number of components actually removed. + */ + template + size_type remove(const entity_type entt) { + return (assure().remove(entt) + ... + assure().remove(entt)); + } + + /** + * @brief Removes the given components from all the entities in a range. + * + * @sa remove + * + * @tparam Type Type of component to remove. + * @tparam Other Other types of components to remove. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @return The number of components actually removed. + */ + template + size_type remove(It first, It last) { + if constexpr(sizeof...(Other) == 0u) { + return assure().remove(std::move(first), std::move(last)); + } else { + size_type count{}; + + for(auto cpools = std::forward_as_tuple(assure(), assure()...); first != last; ++first) { + count += std::apply([entt = *first](auto &...curr) { return (curr.remove(entt) + ... + 0u); }, cpools); + } + + return count; + } + } + + /** + * @brief Erases the given components from an entity. + * + * @warning + * Attempting to erase a component from an entity that doesn't own it + * results in undefined behavior. + * + * @tparam Type Types of components to erase. + * @tparam Other Other types of components to erase. + * @param entt A valid identifier. + */ + template + void erase(const entity_type entt) { + (assure().erase(entt), (assure().erase(entt), ...)); + } + + /** + * @brief Erases the given components from all the entities in a range. + * + * @sa erase + * + * @tparam Type Types of components to erase. + * @tparam Other Other types of components to erase. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + template + void erase(It first, It last) { + if constexpr(sizeof...(Other) == 0u) { + assure().erase(std::move(first), std::move(last)); + } else { + for(auto cpools = std::forward_as_tuple(assure(), assure()...); first != last; ++first) { + std::apply([entt = *first](auto &...curr) { (curr.erase(entt), ...); }, cpools); + } + } + } + + /** + * @brief Removes all tombstones from a registry or only the pools for the + * given components. + * @tparam Type Types of components for which to clear all tombstones. + */ + template + void compact() { + if constexpr(sizeof...(Type) == 0) { + for(auto &&curr: pools) { + curr.second->compact(); + } + } else { + (assure().compact(), ...); + } + } + + /** + * @brief Check if an entity is part of all the given storage. + * @tparam Type Type of storage to check for. + * @param entt A valid identifier. + * @return True if the entity is part of all the storage, false otherwise. + */ + template + [[nodiscard]] bool all_of(const entity_type entt) const { + return (assure>().contains(entt) && ...); + } + + /** + * @brief Check if an entity is part of at least one given storage. + * @tparam Type Type of storage to check for. + * @param entt A valid identifier. + * @return True if the entity is part of at least one storage, false + * otherwise. + */ + template + [[nodiscard]] bool any_of(const entity_type entt) const { + return (assure>().contains(entt) || ...); + } + + /** + * @brief Returns references to the given components for an entity. + * + * @warning + * Attempting to get a component from an entity that doesn't own it results + * in undefined behavior. + * + * @tparam Type Types of components to get. + * @param entt A valid identifier. + * @return References to the components owned by the entity. + */ + template + [[nodiscard]] decltype(auto) get([[maybe_unused]] const entity_type entt) const { + if constexpr(sizeof...(Type) == 1u) { + return (assure>().get(entt), ...); + } else { + return std::forward_as_tuple(get(entt)...); + } + } + + /*! @copydoc get */ + template + [[nodiscard]] decltype(auto) get([[maybe_unused]] const entity_type entt) { + if constexpr(sizeof...(Type) == 1u) { + return (const_cast(std::as_const(*this).template get(entt)), ...); + } else { + return std::forward_as_tuple(get(entt)...); + } + } + + /** + * @brief Returns a reference to the given component for an entity. + * + * In case the entity doesn't own the component, the parameters provided are + * used to construct it. + * + * @sa get + * @sa emplace + * + * @tparam Type Type of component to get. + * @tparam Args Types of arguments to use to construct the component. + * @param entt A valid identifier. + * @param args Parameters to use to initialize the component. + * @return Reference to the component owned by the entity. + */ + template + [[nodiscard]] decltype(auto) get_or_emplace(const entity_type entt, Args &&...args) { + if(auto &cpool = assure(); cpool.contains(entt)) { + return cpool.get(entt); + } else { + return cpool.emplace(entt, std::forward(args)...); + } + } + + /** + * @brief Returns pointers to the given components for an entity. + * + * @note + * The registry retains ownership of the pointed-to components. + * + * @tparam Type Types of components to get. + * @param entt A valid identifier. + * @return Pointers to the components owned by the entity. + */ + template + [[nodiscard]] auto try_get([[maybe_unused]] const entity_type entt) const { + if constexpr(sizeof...(Type) == 1) { + const auto &cpool = assure...>(); + return cpool.contains(entt) ? std::addressof(cpool.get(entt)) : nullptr; + } else { + return std::make_tuple(try_get(entt)...); + } + } + + /*! @copydoc try_get */ + template + [[nodiscard]] auto try_get([[maybe_unused]] const entity_type entt) { + if constexpr(sizeof...(Type) == 1) { + return (const_cast(std::as_const(*this).template try_get(entt)), ...); + } else { + return std::make_tuple(try_get(entt)...); + } + } + + /** + * @brief Clears a whole registry or the pools for the given components. + * @tparam Type Types of components to remove from their entities. + */ + template + void clear() { + if constexpr(sizeof...(Type) == 0) { + for(auto &&curr: pools) { + curr.second->clear(); + } + + each([this](const auto entity) { this->release(entity); }); + } else { + (assure().clear(), ...); + } + } + + /** + * @brief Iterates all the entities that are still in use. + * + * The signature of the function should be equivalent to the following: + * + * @code{.cpp} + * void(const Entity); + * @endcode + * + * It's not defined whether entities created during iteration are returned. + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + if(free_list == null) { + for(auto pos = epool.size(); pos; --pos) { + func(epool[pos - 1]); + } + } else { + for(auto pos = epool.size(); pos; --pos) { + if(const auto entity = epool[pos - 1]; entity_traits::to_entity(entity) == (pos - 1)) { + func(entity); + } + } + } + } + + /** + * @brief Checks if an entity has components assigned. + * @param entt A valid identifier. + * @return True if the entity has no components assigned, false otherwise. + */ + [[nodiscard]] bool orphan(const entity_type entt) const { + return std::none_of(pools.cbegin(), pools.cend(), [entt](auto &&curr) { return curr.second->contains(entt); }); + } + + /** + * @brief Returns a sink object for the given component. + * + * Use this function to receive notifications whenever a new instance of the + * given component is created and assigned to an entity.
+ * The function type for a listener is equivalent to: + * + * @code{.cpp} + * void(basic_registry &, Entity); + * @endcode + * + * Listeners are invoked **after** assigning the component to the entity. + * + * @sa sink + * + * @tparam Type Type of component of which to get the sink. + * @return A temporary sink object. + */ + template + [[nodiscard]] auto on_construct() { + return assure().on_construct(); + } + + /** + * @brief Returns a sink object for the given component. + * + * Use this function to receive notifications whenever an instance of the + * given component is explicitly updated.
+ * The function type for a listener is equivalent to: + * + * @code{.cpp} + * void(basic_registry &, Entity); + * @endcode + * + * Listeners are invoked **after** updating the component. + * + * @sa sink + * + * @tparam Type Type of component of which to get the sink. + * @return A temporary sink object. + */ + template + [[nodiscard]] auto on_update() { + return assure().on_update(); + } + + /** + * @brief Returns a sink object for the given component. + * + * Use this function to receive notifications whenever an instance of the + * given component is removed from an entity and thus destroyed.
+ * The function type for a listener is equivalent to: + * + * @code{.cpp} + * void(basic_registry &, Entity); + * @endcode + * + * Listeners are invoked **before** removing the component from the entity. + * + * @sa sink + * + * @tparam Type Type of component of which to get the sink. + * @return A temporary sink object. + */ + template + [[nodiscard]] auto on_destroy() { + return assure().on_destroy(); + } + + /** + * @brief Returns a view for the given components. + * + * Views are created on the fly and share with the registry its internal + * data structures. Feel free to discard them after the use.
+ * Creating and destroying a view is an incredibly cheap operation. As a + * rule of thumb, storing a view should never be an option. + * + * @tparam Type Type of component used to construct the view. + * @tparam Other Other types of components used to construct the view. + * @tparam Exclude Types of components used to filter the view. + * @return A newly created view. + */ + template + [[nodiscard]] basic_view, storage_for_type...>, exclude_t...>> + view(exclude_t = {}) const { + return {assure>(), assure>()..., assure>()...}; + } + + /*! @copydoc view */ + template + [[nodiscard]] basic_view, storage_for_type...>, exclude_t...>> + view(exclude_t = {}) { + return {assure>(), assure>()..., assure>()...}; + } + + /** + * @brief Returns a group for the given components. + * + * Groups are created on the fly and share with the registry its internal + * data structures. Feel free to discard them after the use.
+ * Creating and destroying a group is an incredibly cheap operation. As a + * rule of thumb, storing a group should never be an option. + * + * Groups support exclusion lists and can own types of components. The more + * types are owned by a group, the faster it is to iterate entities and + * components.
+ * However, groups also affect some features of the registry such as the + * creation and destruction of components. + * + * @note + * Pools of components that are owned by a group cannot be sorted anymore. + * The group takes the ownership of the pools and arrange components so as + * to iterate them as fast as possible. + * + * @tparam Owned Type of storage _owned_ by the group. + * @tparam Get Type of storage _observed_ by the group. + * @tparam Exclude Type of storage used to filter the group. + * @return A newly created group. + */ + template + [[nodiscard]] basic_group...>, get_t...>, exclude_t...>> + group(get_t = {}, exclude_t = {}) { + static_assert(sizeof...(Owned) + sizeof...(Get) > 0, "Exclusion-only groups are not supported"); + static_assert(sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude) > 1, "Single component groups are not allowed"); + + using handler_type = group_handler...>, get_t...>, std::remove_const_t...>; + + const auto cpools = std::forward_as_tuple(assure>()..., assure>()...); + constexpr auto size = sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude); + handler_type *handler = nullptr; + + auto it = std::find_if(groups.cbegin(), groups.cend(), [size](const auto &gdata) { + return gdata.size == size + && (gdata.owned(type_hash>::value()) && ...) + && (gdata.get(type_hash>::value()) && ...) + && (gdata.exclude(type_hash>::value()) && ...); + }); + + if(it != groups.cend()) { + handler = static_cast(it->group.get()); + } else { + group_data candidate = { + size, + std::apply([this](auto &&...args) { return std::allocate_shared(get_allocator(), std::forward(args)...); }, entt::uses_allocator_construction_args(get_allocator())), + []([[maybe_unused]] const id_type ctype) noexcept { return ((ctype == type_hash>::value()) || ...); }, + []([[maybe_unused]] const id_type ctype) noexcept { return ((ctype == type_hash>::value()) || ...); }, + []([[maybe_unused]] const id_type ctype) noexcept { return ((ctype == type_hash>::value()) || ...); }, + }; + + handler = static_cast(candidate.group.get()); + + const void *maybe_valid_if = nullptr; + const void *discard_if = nullptr; + + if constexpr(sizeof...(Owned) == 0) { + groups.push_back(std::move(candidate)); + } else { + [[maybe_unused]] auto has_conflict = [size](const auto &gdata) { + const auto overlapping = (0u + ... + gdata.owned(type_hash>::value())); + const auto sz = overlapping + (0u + ... + gdata.get(type_hash>::value())) + (0u + ... + gdata.exclude(type_hash>::value())); + return !overlapping || ((sz == size) || (sz == gdata.size)); + }; + + ENTT_ASSERT(std::all_of(groups.cbegin(), groups.cend(), std::move(has_conflict)), "Conflicting groups"); + + const auto next = std::find_if_not(groups.cbegin(), groups.cend(), [size](const auto &gdata) { + return !(0u + ... + gdata.owned(type_hash>::value())) || (size > gdata.size); + }); + + const auto prev = std::find_if(std::make_reverse_iterator(next), groups.crend(), [](const auto &gdata) { + return (0u + ... + gdata.owned(type_hash>::value())); + }); + + maybe_valid_if = (next == groups.cend() ? maybe_valid_if : next->group.get()); + discard_if = (prev == groups.crend() ? discard_if : prev->group.get()); + groups.insert(next, std::move(candidate)); + } + + (on_construct>().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>>(*handler), ...); + (on_construct>().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>>(*handler), ...); + (on_destroy>().before(maybe_valid_if).template connect<&handler_type::template maybe_valid_if>>(*handler), ...); + + (on_destroy>().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); + (on_destroy>().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); + (on_construct>().before(discard_if).template connect<&handler_type::discard_if>(*handler), ...); + + if constexpr(sizeof...(Owned) == 0) { + for(const auto entity: view(exclude)) { + handler->current.emplace(entity); + } + } else { + // we cannot iterate backwards because we want to leave behind valid entities in case of owned types + for(auto *first = std::get<0>(cpools).data(), *last = first + std::get<0>(cpools).size(); first != last; ++first) { + handler->template maybe_valid_if...>>>(*this, *first); + } + } + } + + return {handler->current, std::get> &>(cpools)..., std::get> &>(cpools)...}; + } + + /*! @copydoc group */ + template + [[nodiscard]] basic_group...>, get_t...>, exclude_t...>> + group_if_exists(get_t = {}, exclude_t = {}) const { + auto it = std::find_if(groups.cbegin(), groups.cend(), [](const auto &gdata) { + return gdata.size == (sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude)) + && (gdata.owned(type_hash>::value()) && ...) + && (gdata.get(type_hash>::value()) && ...) + && (gdata.exclude(type_hash>::value()) && ...); + }); + + if(it == groups.cend()) { + return {}; + } else { + using handler_type = group_handler...>, get_t...>, std::remove_const_t...>; + return {static_cast(it->group.get())->current, assure>()..., assure>()...}; + } + } + + /** + * @brief Checks whether the given components belong to any group. + * @tparam Component Types of components in which one is interested. + * @return True if the pools of the given components are _free_, false + * otherwise. + */ + template + [[nodiscard]] bool owned() const { + return std::any_of(groups.cbegin(), groups.cend(), [](auto &&gdata) { return (gdata.owned(type_hash>::value()) || ...); }); + } + + /** + * @brief Checks whether a group can be sorted. + * @tparam Owned Type of storage _owned_ by the group. + * @tparam Get Type of storage _observed_ by the group. + * @tparam Exclude Type of storage used to filter the group. + * @return True if the group can be sorted, false otherwise. + */ + template + [[nodiscard]] bool sortable(const basic_group, get_t, exclude_t> &) noexcept { + constexpr auto size = sizeof...(Owned) + sizeof...(Get) + sizeof...(Exclude); + auto pred = [size](const auto &gdata) { return (0u + ... + gdata.owned(type_hash::value())) && (size < gdata.size); }; + return std::find_if(groups.cbegin(), groups.cend(), std::move(pred)) == groups.cend(); + } + + /** + * @brief Sorts the elements of a given component. + * + * The order remains valid until a component of the given type is assigned + * to or removed from an entity.
+ * The comparison function object returns `true` if the first element is + * _less_ than the second one, `false` otherwise. Its signature is also + * equivalent to one of the following: + * + * @code{.cpp} + * bool(const Entity, const Entity); + * bool(const Type &, const Type &); + * @endcode + * + * Moreover, it shall induce a _strict weak ordering_ on the values.
+ * The sort function object offers an `operator()` that accepts: + * + * * An iterator to the first element of the range to sort. + * * An iterator past the last element of the range to sort. + * * A comparison function object to use to compare the elements. + * + * The comparison function object hasn't necessarily the type of the one + * passed along with the other parameters to this member function. + * + * @warning + * Pools of components owned by a group cannot be sorted. + * + * @tparam Type Type of components to sort. + * @tparam Compare Type of comparison function object. + * @tparam Sort Type of sort function object. + * @tparam Args Types of arguments to forward to the sort function object. + * @param compare A valid comparison function object. + * @param algo A valid sort function object. + * @param args Arguments to forward to the sort function object, if any. + */ + template + void sort(Compare compare, Sort algo = Sort{}, Args &&...args) { + ENTT_ASSERT(!owned(), "Cannot sort owned storage"); + auto &cpool = assure(); + + if constexpr(std::is_invocable_v) { + auto comp = [&cpool, compare = std::move(compare)](const auto lhs, const auto rhs) { return compare(std::as_const(cpool.get(lhs)), std::as_const(cpool.get(rhs))); }; + cpool.sort(std::move(comp), std::move(algo), std::forward(args)...); + } else { + cpool.sort(std::move(compare), std::move(algo), std::forward(args)...); + } + } + + /** + * @brief Sorts two pools of components in the same way. + * + * Being `To` and `From` the two sets, after invoking this function an + * iterator for `To` returns elements according to the following rules: + * + * * All entities in `To` that are also in `From` are returned first + * according to the order they have in `From`. + * * All entities in `To` that are not in `From` are returned in no + * particular order after all the other entities. + * + * Any subsequent change to `From` won't affect the order in `To`. + * + * @warning + * Pools of components owned by a group cannot be sorted. + * + * @tparam To Type of components to sort. + * @tparam From Type of components to use to sort. + */ + template + void sort() { + ENTT_ASSERT(!owned(), "Cannot sort owned storage"); + assure().respect(assure()); + } + + /** + * @brief Returns the context object, that is, a general purpose container. + * @return The context object, that is, a general purpose container. + */ + context &ctx() noexcept { + return vars; + } + + /*! @copydoc ctx */ + const context &ctx() const noexcept { + return vars; + } + +private: + context vars; + entity_type free_list; + std::vector epool; + // std::shared_ptr because of its type erased allocator which is useful here + dense_map, identity, std::equal_to, typename alloc_traits::template rebind_alloc>>> pools; + std::vector> groups; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/entity/runtime_view.hpp b/LiteLoader/third-party/include/entt/entity/runtime_view.hpp new file mode 100644 index 0000000..7ffad5c --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/runtime_view.hpp @@ -0,0 +1,335 @@ +#ifndef ENTT_ENTITY_RUNTIME_VIEW_HPP +#define ENTT_ENTITY_RUNTIME_VIEW_HPP + +#include +#include +#include +#include +#include +#include "entity.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class runtime_view_iterator final { + using iterator_type = typename Set::iterator; + + [[nodiscard]] bool valid() const { + return (!tombstone_check || *it != tombstone) + && std::all_of(++pools->begin(), pools->end(), [entt = *it](const auto *curr) { return curr->contains(entt); }) + && std::none_of(filter->cbegin(), filter->cend(), [entt = *it](const auto *curr) { return curr && curr->contains(entt); }); + } + +public: + using difference_type = typename iterator_type::difference_type; + using value_type = typename iterator_type::value_type; + using pointer = typename iterator_type::pointer; + using reference = typename iterator_type::reference; + using iterator_category = std::bidirectional_iterator_tag; + + constexpr runtime_view_iterator() noexcept + : pools{}, + filter{}, + it{}, + tombstone_check{} {} + + runtime_view_iterator(const std::vector &cpools, const std::vector &ignore, iterator_type curr) noexcept + : pools{&cpools}, + filter{&ignore}, + it{curr}, + tombstone_check{pools->size() == 1u && (*pools)[0u]->policy() == deletion_policy::in_place} { + if(it != (*pools)[0]->end() && !valid()) { + ++(*this); + } + } + + runtime_view_iterator &operator++() { + while(++it != (*pools)[0]->end() && !valid()) {} + return *this; + } + + runtime_view_iterator operator++(int) { + runtime_view_iterator orig = *this; + return ++(*this), orig; + } + + runtime_view_iterator &operator--() { + while(--it != (*pools)[0]->begin() && !valid()) {} + return *this; + } + + runtime_view_iterator operator--(int) { + runtime_view_iterator orig = *this; + return operator--(), orig; + } + + [[nodiscard]] pointer operator->() const noexcept { + return it.operator->(); + } + + [[nodiscard]] reference operator*() const noexcept { + return *operator->(); + } + + [[nodiscard]] constexpr bool operator==(const runtime_view_iterator &other) const noexcept { + return it == other.it; + } + + [[nodiscard]] constexpr bool operator!=(const runtime_view_iterator &other) const noexcept { + return !(*this == other); + } + +private: + const std::vector *pools; + const std::vector *filter; + iterator_type it; + bool tombstone_check; +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Generic runtime view. + * + * Runtime views iterate over those entities that have at least all the given + * components in their bags. During initialization, a runtime view looks at the + * number of entities available for each component and picks up a reference to + * the smallest set of candidate entities in order to get a performance boost + * when iterate.
+ * Order of elements during iterations are highly dependent on the order of the + * underlying data structures. See sparse_set and its specializations for more + * details. + * + * @b Important + * + * Iterators aren't invalidated if: + * + * * New instances of the given components are created and assigned to entities. + * * The entity currently pointed is modified (as an example, if one of the + * given components is removed from the entity to which the iterator points). + * * The entity currently pointed is destroyed. + * + * In all the other cases, modifying the pools of the given components in any + * way invalidates all the iterators and using them results in undefined + * behavior. + * + * @note + * Views share references to the underlying data structures of the registry that + * generated them. Therefore any change to the entities and to the components + * made by means of the registry are immediately reflected by the views, unless + * a pool was missing when the view was built (in this case, the view won't + * have a valid reference and won't be updated accordingly). + * + * @warning + * Lifetime of a view must not overcome that of the registry that generated it. + * In any other case, attempting to use a view results in undefined behavior. + * + * @tparam Type Common base type. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_runtime_view { + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using container_type = std::vector; + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Underlying entity identifier. */ + using entity_type = typename Type::entity_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = Type; + /*! @brief Bidirectional iterator type. */ + using iterator = internal::runtime_view_iterator; + + /*! @brief Default constructor to use to create empty, invalid views. */ + basic_runtime_view() noexcept + : basic_runtime_view{allocator_type{}} {} + + /** + * @brief Constructs an empty, invalid view with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_runtime_view(const allocator_type &allocator) + : pools{allocator}, + filter{allocator} {} + + /*! @brief Default copy constructor. */ + basic_runtime_view(const basic_runtime_view &) = default; + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + basic_runtime_view(const basic_runtime_view &other, const allocator_type &allocator) + : pools{other.pools, allocator}, + filter{other.filter, allocator} {} + + /*! @brief Default move constructor. */ + basic_runtime_view(basic_runtime_view &&) noexcept(std::is_nothrow_move_constructible_v) = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_runtime_view(basic_runtime_view &&other, const allocator_type &allocator) + : pools{std::move(other.pools), allocator}, + filter{std::move(other.filter), allocator} {} + + /** + * @brief Default copy assignment operator. + * @return This container. + */ + basic_runtime_view &operator=(const basic_runtime_view &) = default; + + /** + * @brief Default move assignment operator. + * @return This container. + */ + basic_runtime_view &operator=(basic_runtime_view &&) noexcept(std::is_nothrow_move_assignable_v) = default; + + /** + * @brief Exchanges the contents with those of a given view. + * @param other View to exchange the content with. + */ + void swap(basic_runtime_view &other) { + using std::swap; + swap(pools, other.pools); + swap(filter, other.filter); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return pools.get_allocator(); + } + + /*! @brief Clears the view. */ + void clear() { + pools.clear(); + filter.clear(); + } + + /** + * @brief Appends an opaque storage object to a runtime view. + * @param base An opaque reference to a storage object. + * @return This runtime view. + */ + basic_runtime_view &iterate(base_type &base) { + if(pools.empty() || !(base.size() < pools[0u]->size())) { + pools.push_back(&base); + } else { + pools.push_back(std::exchange(pools[0u], &base)); + } + + return *this; + } + + /** + * @brief Adds an opaque storage object as a filter of a runtime view. + * @param base An opaque reference to a storage object. + * @return This runtime view. + */ + basic_runtime_view &exclude(base_type &base) { + filter.push_back(&base); + return *this; + } + + /** + * @brief Estimates the number of entities iterated by the view. + * @return Estimated number of entities iterated by the view. + */ + [[nodiscard]] size_type size_hint() const { + return pools.empty() ? size_type{} : pools.front()->size(); + } + + /** + * @brief Returns an iterator to the first entity that has the given + * components. + * + * The returned iterator points to the first entity that has the given + * components. If the view is empty, the returned iterator will be equal to + * `end()`. + * + * @return An iterator to the first entity that has the given components. + */ + [[nodiscard]] iterator begin() const { + return pools.empty() ? iterator{} : iterator{pools, filter, pools[0]->begin()}; + } + + /** + * @brief Returns an iterator that is past the last entity that has the + * given components. + * + * The returned iterator points to the entity following the last entity that + * has the given components. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the entity following the last entity that has the + * given components. + */ + [[nodiscard]] iterator end() const { + return pools.empty() ? iterator{} : iterator{pools, filter, pools[0]->end()}; + } + + /** + * @brief Checks if a view contains an entity. + * @param entt A valid identifier. + * @return True if the view contains the given entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const { + return !pools.empty() + && std::all_of(pools.cbegin(), pools.cend(), [entt](const auto *curr) { return curr->contains(entt); }) + && std::none_of(filter.cbegin(), filter.cend(), [entt](const auto *curr) { return curr && curr->contains(entt); }); + } + + /** + * @brief Iterates entities and applies the given function object to them. + * + * The function object is invoked for each entity. It is provided only with + * the entity itself. To get the components, users can use the registry with + * which the view was built.
+ * The signature of the function should be equivalent to the following: + * + * @code{.cpp} + * void(const entity_type); + * @endcode + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + for(const auto entity: *this) { + func(entity); + } + } + +private: + container_type pools; + container_type filter; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/entity/snapshot.hpp b/LiteLoader/third-party/include/entt/entity/snapshot.hpp similarity index 74% rename from LiteLoader/Header/third-party/entt/entity/snapshot.hpp rename to LiteLoader/third-party/include/entt/entity/snapshot.hpp index 2ce0abf..d60befc 100644 --- a/LiteLoader/Header/third-party/entt/entity/snapshot.hpp +++ b/LiteLoader/third-party/include/entt/entity/snapshot.hpp @@ -1,25 +1,23 @@ #ifndef ENTT_ENTITY_SNAPSHOT_HPP #define ENTT_ENTITY_SNAPSHOT_HPP - #include #include #include #include #include -#include #include #include #include "../config/config.h" +#include "../container/dense_map.hpp" #include "../core/type_traits.hpp" +#include "component.hpp" #include "entity.hpp" #include "fwd.hpp" -#include "registry.hpp" - +#include "view.hpp" namespace entt { - /** * @brief Utility class to create snapshots from a registry. * @@ -28,16 +26,16 @@ namespace entt { * This type can be used in both cases if provided with a correctly configured * output archive. * - * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Registry Basic registry type. */ -template +template class basic_snapshot { - using traits_type = entt_traits; + using entity_traits = entt_traits; template void get(Archive &archive, std::size_t sz, It first, It last) const { - const auto view = reg->template view>(); - archive(typename traits_type::entity_type(sz)); + const auto view = reg->template view(); + archive(typename entity_traits::entity_type(sz)); while(first != last) { const auto entt = *(first++); @@ -62,22 +60,23 @@ class basic_snapshot { } public: + /*! Basic registry type. */ + using registry_type = Registry; /*! @brief Underlying entity identifier. */ - using entity_type = Entity; + using entity_type = typename registry_type::entity_type; /** * @brief Constructs an instance that is bound to a given registry. * @param source A valid reference to a registry. */ - basic_snapshot(const basic_registry &source) ENTT_NOEXCEPT - : reg{&source} - {} + basic_snapshot(const registry_type &source) noexcept + : reg{&source} {} /*! @brief Default move constructor. */ - basic_snapshot(basic_snapshot &&) = default; + basic_snapshot(basic_snapshot &&) noexcept = default; /*! @brief Default move assignment operator. @return This snapshot. */ - basic_snapshot & operator=(basic_snapshot &&) = default; + basic_snapshot &operator=(basic_snapshot &&) noexcept = default; /** * @brief Puts aside all the entities from the underlying registry. @@ -90,17 +89,16 @@ public: * @return An object of this type to continue creating the snapshot. */ template - const basic_snapshot & entities(Archive &archive) const { + const basic_snapshot &entities(Archive &archive) const { const auto sz = reg->size(); - archive(typename traits_type::entity_type(sz)); + archive(typename entity_traits::entity_type(sz + 1u)); + archive(reg->released()); for(auto first = reg->data(), last = first + sz; first != last; ++first) { archive(*first); } - archive(reg->released()); - return *this; } @@ -116,10 +114,10 @@ public: * @return An object of this type to continue creating the snapshot. */ template - const basic_snapshot & component(Archive &archive) const { + const basic_snapshot &component(Archive &archive) const { if constexpr(sizeof...(Component) == 1u) { const auto view = reg->template view(); - (component(archive, view.data(), view.data() + view.size()), ...); + (component(archive, view.rbegin(), view.rend()), ...); return *this; } else { (component(archive), ...); @@ -142,16 +140,15 @@ public: * @return An object of this type to continue creating the snapshot. */ template - const basic_snapshot & component(Archive &archive, It first, It last) const { + const basic_snapshot &component(Archive &archive, It first, It last) const { component(archive, first, last, std::index_sequence_for{}); return *this; } private: - const basic_registry *reg; + const registry_type *reg; }; - /** * @brief Utility class to restore a snapshot as a whole. * @@ -160,58 +157,59 @@ private: * originally had.
* An example of use is the implementation of a save/restore utility. * - * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Registry Basic registry type. */ -template +template class basic_snapshot_loader { - using traits_type = entt_traits; + using entity_traits = entt_traits; - template + template void assign(Archive &archive) const { - typename traits_type::entity_type length{}; + typename entity_traits::entity_type length{}; + entity_type entt; + archive(length); - entity_type entt{}; - - if constexpr(std::tuple_size_vtemplate view().get({}))> == 0) { + if constexpr(ignore_as_empty_v) { while(length--) { archive(entt); const auto entity = reg->valid(entt) ? entt : reg->create(entt); ENTT_ASSERT(entity == entt, "Entity not available for use"); - reg->template emplace(entity); + reg->template emplace(entt); } } else { - Type instance{}; + Component instance; while(length--) { archive(entt, instance); const auto entity = reg->valid(entt) ? entt : reg->create(entt); ENTT_ASSERT(entity == entt, "Entity not available for use"); - reg->template emplace(entity, std::move(instance)); + reg->template emplace(entt, std::move(instance)); } } } public: + /*! Basic registry type. */ + using registry_type = Registry; /*! @brief Underlying entity identifier. */ - using entity_type = Entity; + using entity_type = typename registry_type::entity_type; /** * @brief Constructs an instance that is bound to a given registry. * @param source A valid reference to a registry. */ - basic_snapshot_loader(basic_registry &source) ENTT_NOEXCEPT - : reg{&source} - { + basic_snapshot_loader(registry_type &source) noexcept + : reg{&source} { // restoring a snapshot as a whole requires a clean registry ENTT_ASSERT(reg->empty(), "Registry must be empty"); } /*! @brief Default move constructor. */ - basic_snapshot_loader(basic_snapshot_loader &&) = default; + basic_snapshot_loader(basic_snapshot_loader &&) noexcept = default; /*! @brief Default move assignment operator. @return This loader. */ - basic_snapshot_loader & operator=(basic_snapshot_loader &&) = default; + basic_snapshot_loader &operator=(basic_snapshot_loader &&) noexcept = default; /** * @brief Restores entities that were in use during serialization. @@ -224,20 +222,17 @@ public: * @return A valid loader to continue restoring data. */ template - const basic_snapshot_loader & entities(Archive &archive) const { - typename traits_type::entity_type length{}; + const basic_snapshot_loader &entities(Archive &archive) const { + typename entity_traits::entity_type length{}; archive(length); std::vector all(length); - for(decltype(length) pos{}; pos < length; ++pos) { + for(std::size_t pos{}; pos < length; ++pos) { archive(all[pos]); } - entity_type destroyed; - archive(destroyed); - - reg->assign(all.cbegin(), all.cend(), destroyed); + reg->assign(++all.cbegin(), all.cend(), all[0u]); return *this; } @@ -256,7 +251,7 @@ public: * @return A valid loader to continue restoring data. */ template - const basic_snapshot_loader & component(Archive &archive) const { + const basic_snapshot_loader &component(Archive &archive) const { (assign(archive), ...); return *this; } @@ -271,19 +266,20 @@ public: * * @return A valid loader to continue restoring data. */ - const basic_snapshot_loader & orphans() const { - reg->orphans([this](const auto entt) { - reg->release(entt); + const basic_snapshot_loader &orphans() const { + reg->each([this](const auto entt) { + if(reg->orphan(entt)) { + reg->release(entt); + } }); return *this; } private: - basic_registry *reg; + registry_type *reg; }; - /** * @brief Utility class for _continuous loading_. * @@ -298,13 +294,13 @@ private: * the requirement of transferring somehow parts of the representation side to * side. * - * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Registry Basic registry type. */ -template +template class basic_continuous_loader { - using traits_type = entt_traits; + using entity_traits = entt_traits; - void destroy(Entity entt) { + void destroy(typename Registry::entity_type entt) { if(const auto it = remloc.find(entt); it == remloc.cend()) { const auto local = reg->create(); remloc.emplace(entt, std::make_pair(local, true)); @@ -312,7 +308,7 @@ class basic_continuous_loader { } } - void restore(Entity entt) { + void restore(typename Registry::entity_type entt) { const auto it = remloc.find(entt); if(it == remloc.cend()) { @@ -329,8 +325,7 @@ class basic_continuous_loader { } template - auto update(int, Container &container) - -> decltype(typename Container::mapped_type{}, void()) { + auto update(int, Container &container) -> decltype(typename Container::mapped_type{}, void()) { // map like container Container other; @@ -348,12 +343,12 @@ class basic_continuous_loader { } } - std::swap(container, other); + using std::swap; + swap(container, other); } template - auto update(char, Container &container) - -> decltype(typename Container::value_type{}, void()) { + auto update(char, Container &container) -> decltype(typename Container::value_type{}, void()) { // vector like container static_assert(std::is_same_v, "Invalid value type"); @@ -362,9 +357,9 @@ class basic_continuous_loader { } } - template - void update([[maybe_unused]] Other &instance, [[maybe_unused]] Member Type:: *member) { - if constexpr(!std::is_same_v) { + template + void update([[maybe_unused]] Component &instance, [[maybe_unused]] Member Other::*member) { + if constexpr(!std::is_same_v) { return; } else if constexpr(std::is_same_v) { instance.*member = map(instance.*member); @@ -385,48 +380,49 @@ class basic_continuous_loader { } } - template - void assign(Archive &archive, [[maybe_unused]] Member Type:: *... member) { - typename traits_type::entity_type length{}; + template + void assign(Archive &archive, [[maybe_unused]] Member Other::*...member) { + typename entity_traits::entity_type length{}; + entity_type entt; + archive(length); - entity_type entt{}; - - if constexpr(std::tuple_size_vtemplate view().get({}))> == 0) { + if constexpr(ignore_as_empty_v) { while(length--) { archive(entt); restore(entt); - reg->template emplace_or_replace(map(entt)); + reg->template emplace_or_replace(map(entt)); } } else { - Other instance{}; + Component instance; while(length--) { archive(entt, instance); (update(instance, member), ...); restore(entt); - reg->template emplace_or_replace(map(entt), std::move(instance)); + reg->template emplace_or_replace(map(entt), std::move(instance)); } } } public: + /*! Basic registry type. */ + using registry_type = Registry; /*! @brief Underlying entity identifier. */ - using entity_type = Entity; + using entity_type = typename registry_type::entity_type; /** * @brief Constructs an instance that is bound to a given registry. * @param source A valid reference to a registry. */ - basic_continuous_loader(basic_registry &source) ENTT_NOEXCEPT - : reg{&source} - {} + basic_continuous_loader(registry_type &source) noexcept + : reg{&source} {} /*! @brief Default move constructor. */ basic_continuous_loader(basic_continuous_loader &&) = default; /*! @brief Default move assignment operator. @return This loader. */ - basic_continuous_loader & operator=(basic_continuous_loader &&) = default; + basic_continuous_loader &operator=(basic_continuous_loader &&) = default; /** * @brief Restores entities that were in use during serialization. @@ -439,25 +435,24 @@ public: * @return A non-const reference to this loader. */ template - basic_continuous_loader & entities(Archive &archive) { - typename traits_type::entity_type length{}; + basic_continuous_loader &entities(Archive &archive) { + typename entity_traits::entity_type length{}; entity_type entt{}; archive(length); + // discards the head of the list of destroyed entities + archive(entt); - for(decltype(length) pos{}; pos < length; ++pos) { + for(std::size_t pos{}, last = length - 1u; pos < last; ++pos) { archive(entt); - if(const auto entity = traits_type::to_entity(entt); entity == pos) { + if(const auto entity = entity_traits::to_entity(entt); entity == pos) { restore(entt); } else { destroy(entt); } } - // discards the head of the list of destroyed entities - archive(entt); - return *this; } @@ -474,14 +469,14 @@ public: * * @tparam Component Type of component to restore. * @tparam Archive Type of input archive. - * @tparam Type Types of components to update with local counterparts. + * @tparam Other Types of components to update with local counterparts. * @tparam Member Types of members to update with their local counterparts. * @param archive A valid reference to an input archive. * @param member Members to update with their local counterparts. * @return A non-const reference to this loader. */ - template - basic_continuous_loader & component(Archive &archive, Member Type:: *... member) { + template + basic_continuous_loader &component(Archive &archive, Member Other::*...member) { (remove_if_exists(), ...); (assign(archive, member...), ...); return *this; @@ -495,7 +490,7 @@ public: * * @return A non-const reference to this loader. */ - basic_continuous_loader & shrink() { + basic_continuous_loader &shrink() { auto it = remloc.begin(); while(it != remloc.cend()) { @@ -527,9 +522,11 @@ public: * * @return A non-const reference to this loader. */ - basic_continuous_loader & orphans() { - reg->orphans([this](const auto entt) { - reg->release(entt); + basic_continuous_loader &orphans() { + reg->each([this](const auto entt) { + if(reg->orphan(entt)) { + reg->release(entt); + } }); return *this; @@ -537,19 +534,19 @@ public: /** * @brief Tests if a loader knows about a given entity. - * @param entt An entity identifier. + * @param entt A valid identifier. * @return True if `entity` is managed by the loader, false otherwise. */ - [[nodiscard]] bool contains(entity_type entt) const ENTT_NOEXCEPT { + [[nodiscard]] bool contains(entity_type entt) const noexcept { return (remloc.find(entt) != remloc.cend()); } /** * @brief Returns the identifier to which an entity refers. - * @param entt An entity identifier. + * @param entt A valid identifier. * @return The local identifier if any, the null entity otherwise. */ - [[nodiscard]] entity_type map(entity_type entt) const ENTT_NOEXCEPT { + [[nodiscard]] entity_type map(entity_type entt) const noexcept { const auto it = remloc.find(entt); entity_type other = null; @@ -561,12 +558,10 @@ public: } private: - std::unordered_map> remloc; - basic_registry *reg; + dense_map> remloc; + registry_type *reg; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/entity/sparse_set.hpp b/LiteLoader/third-party/include/entt/entity/sparse_set.hpp new file mode 100644 index 0000000..96aa172 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/sparse_set.hpp @@ -0,0 +1,976 @@ +#ifndef ENTT_ENTITY_SPARSE_SET_HPP +#define ENTT_ENTITY_SPARSE_SET_HPP + +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/algorithm.hpp" +#include "../core/any.hpp" +#include "../core/memory.hpp" +#include "../core/type_info.hpp" +#include "entity.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct sparse_set_iterator final { + using value_type = typename Container::value_type; + using pointer = typename Container::const_pointer; + using reference = typename Container::const_reference; + using difference_type = typename Container::difference_type; + using iterator_category = std::random_access_iterator_tag; + + constexpr sparse_set_iterator() noexcept + : packed{}, + offset{} {} + + constexpr sparse_set_iterator(const Container &ref, const difference_type idx) noexcept + : packed{std::addressof(ref)}, + offset{idx} {} + + constexpr sparse_set_iterator &operator++() noexcept { + return --offset, *this; + } + + constexpr sparse_set_iterator operator++(int) noexcept { + sparse_set_iterator orig = *this; + return ++(*this), orig; + } + + constexpr sparse_set_iterator &operator--() noexcept { + return ++offset, *this; + } + + constexpr sparse_set_iterator operator--(int) noexcept { + sparse_set_iterator orig = *this; + return operator--(), orig; + } + + constexpr sparse_set_iterator &operator+=(const difference_type value) noexcept { + offset -= value; + return *this; + } + + constexpr sparse_set_iterator operator+(const difference_type value) const noexcept { + sparse_set_iterator copy = *this; + return (copy += value); + } + + constexpr sparse_set_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr sparse_set_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return packed->data()[index() - value]; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return packed->data() + index(); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *operator->(); + } + + [[nodiscard]] constexpr difference_type index() const noexcept { + return offset - 1; + } + +private: + const Container *packed; + difference_type offset; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return rhs.index() - lhs.index(); +} + +template +[[nodiscard]] constexpr bool operator==(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return lhs.index() == rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator!=(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return lhs.index() > rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator>(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return lhs.index() < rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator<=(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const sparse_set_iterator &lhs, const sparse_set_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/*! @brief Sparse set deletion policy. */ +enum class deletion_policy : std::uint8_t { + /*! @brief Swap-and-pop deletion policy. */ + swap_and_pop = 0u, + /*! @brief In-place deletion policy. */ + in_place = 1u +}; + +/** + * @brief Basic sparse set implementation. + * + * Sparse set or packed array or whatever is the name users give it.
+ * Two arrays: an _external_ one and an _internal_ one; a _sparse_ one and a + * _packed_ one; one used for direct access through contiguous memory, the other + * one used to get the data through an extra level of indirection.
+ * This is largely used by the registry to offer users the fastest access ever + * to the components. Views and groups in general are almost entirely designed + * around sparse sets. + * + * This type of data structure is widely documented in the literature and on the + * web. This is nothing more than a customized implementation suitable for the + * purpose of the framework. + * + * @note + * Internal data structures arrange elements to maximize performance. There are + * no guarantees that entities are returned in the insertion order when iterate + * a sparse set. Do not make assumption on the order in any case. + * + * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_sparse_set { + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using sparse_container_type = std::vector>; + using packed_container_type = std::vector; + using entity_traits = entt_traits; + + [[nodiscard]] auto sparse_ptr(const Entity entt) const { + const auto pos = static_cast(entity_traits::to_entity(entt)); + const auto page = pos / entity_traits::page_size; + return (page < sparse.size() && sparse[page]) ? (sparse[page] + fast_mod(pos, entity_traits::page_size)) : nullptr; + } + + [[nodiscard]] auto &sparse_ref(const Entity entt) const { + ENTT_ASSERT(sparse_ptr(entt), "Invalid element"); + const auto pos = static_cast(entity_traits::to_entity(entt)); + return sparse[pos / entity_traits::page_size][fast_mod(pos, entity_traits::page_size)]; + } + + [[nodiscard]] auto &assure_at_least(const Entity entt) { + const auto pos = static_cast(entity_traits::to_entity(entt)); + const auto page = pos / entity_traits::page_size; + + if(!(page < sparse.size())) { + sparse.resize(page + 1u, nullptr); + } + + if(!sparse[page]) { + auto page_allocator{packed.get_allocator()}; + sparse[page] = alloc_traits::allocate(page_allocator, entity_traits::page_size); + std::uninitialized_fill(sparse[page], sparse[page] + entity_traits::page_size, null); + } + + auto &elem = sparse[page][fast_mod(pos, entity_traits::page_size)]; + ENTT_ASSERT(elem == null, "Slot not available"); + return elem; + } + + void release_sparse_pages() { + auto page_allocator{packed.get_allocator()}; + + for(auto &&page: sparse) { + if(page != nullptr) { + std::destroy(page, page + entity_traits::page_size); + alloc_traits::deallocate(page_allocator, page, entity_traits::page_size); + page = nullptr; + } + } + } + +private: + virtual const void *get_at(const std::size_t) const { + return nullptr; + } + + virtual void swap_at(const std::size_t, const std::size_t) {} + virtual void move_element(const std::size_t, const std::size_t) {} + +protected: + /*! @brief Random access iterator type. */ + using basic_iterator = internal::sparse_set_iterator; + + /** + * @brief Erases an entity from a sparse set. + * @param it An iterator to the element to pop. + */ + void swap_and_pop(const basic_iterator it) { + ENTT_ASSERT(mode == deletion_policy::swap_and_pop, "Deletion policy mismatched"); + auto &self = sparse_ref(*it); + const auto entt = entity_traits::to_entity(self); + sparse_ref(packed.back()) = entity_traits::combine(entt, entity_traits::to_integral(packed.back())); + packed[static_cast(entt)] = packed.back(); + // unnecessary but it helps to detect nasty bugs + ENTT_ASSERT((packed.back() = null, true), ""); + // lazy self-assignment guard + self = null; + packed.pop_back(); + } + + /** + * @brief Erases an entity from a sparse set. + * @param it An iterator to the element to pop. + */ + void in_place_pop(const basic_iterator it) { + ENTT_ASSERT(mode == deletion_policy::in_place, "Deletion policy mismatched"); + const auto entt = entity_traits::to_entity(std::exchange(sparse_ref(*it), null)); + packed[static_cast(entt)] = std::exchange(free_list, entity_traits::combine(entt, entity_traits::reserved)); + } + +protected: + /** + * @brief Erases entities from a sparse set. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + virtual void pop(basic_iterator first, basic_iterator last) { + if(mode == deletion_policy::swap_and_pop) { + for(; first != last; ++first) { + swap_and_pop(first); + } + } else { + for(; first != last; ++first) { + in_place_pop(first); + } + } + } + + /** + * @brief Assigns an entity to a sparse set. + * @param entt A valid identifier. + * @param force_back Force back insertion. + * @return Iterator pointing to the emplaced element. + */ + virtual basic_iterator try_emplace(const Entity entt, const bool force_back, const void * = nullptr) { + ENTT_ASSERT(!contains(entt), "Set already contains entity"); + + if(auto &elem = assure_at_least(entt); free_list == null || force_back) { + packed.push_back(entt); + elem = entity_traits::combine(static_cast(packed.size() - 1u), entity_traits::to_integral(entt)); + return begin(); + } else { + const auto pos = static_cast(entity_traits::to_entity(free_list)); + elem = entity_traits::combine(entity_traits::to_integral(free_list), entity_traits::to_integral(entt)); + free_list = std::exchange(packed[pos], entt); + return --(end() - pos); + } + } + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Underlying entity identifier. */ + using entity_type = typename entity_traits::value_type; + /*! @brief Underlying version type. */ + using version_type = typename entity_traits::version_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Pointer type to contained entities. */ + using pointer = typename packed_container_type::const_pointer; + /*! @brief Random access iterator type. */ + using iterator = basic_iterator; + /*! @brief Constant random access iterator type. */ + using const_iterator = iterator; + /*! @brief Reverse iterator type. */ + using reverse_iterator = std::reverse_iterator; + /*! @brief Constant reverse iterator type. */ + using const_reverse_iterator = reverse_iterator; + + /*! @brief Default constructor. */ + basic_sparse_set() + : basic_sparse_set{type_id()} {} + + /** + * @brief Constructs an empty container with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_sparse_set(const allocator_type &allocator) + : basic_sparse_set{type_id(), deletion_policy::swap_and_pop, allocator} {} + + /** + * @brief Constructs an empty container with the given policy and allocator. + * @param pol Type of deletion policy. + * @param allocator The allocator to use (possibly default-constructed). + */ + explicit basic_sparse_set(deletion_policy pol, const allocator_type &allocator = {}) + : basic_sparse_set{type_id(), pol, allocator} {} + + /** + * @brief Constructs an empty container with the given value type, policy + * and allocator. + * @param value Returned value type, if any. + * @param pol Type of deletion policy. + * @param allocator The allocator to use (possibly default-constructed). + */ + explicit basic_sparse_set(const type_info &value, deletion_policy pol = deletion_policy::swap_and_pop, const allocator_type &allocator = {}) + : sparse{allocator}, + packed{allocator}, + info{&value}, + free_list{tombstone}, + mode{pol} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_sparse_set(basic_sparse_set &&other) noexcept + : sparse{std::move(other.sparse)}, + packed{std::move(other.packed)}, + info{other.info}, + free_list{std::exchange(other.free_list, tombstone)}, + mode{other.mode} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_sparse_set(basic_sparse_set &&other, const allocator_type &allocator) noexcept + : sparse{std::move(other.sparse), allocator}, + packed{std::move(other.packed), allocator}, + info{other.info}, + free_list{std::exchange(other.free_list, tombstone)}, + mode{other.mode} { + ENTT_ASSERT(alloc_traits::is_always_equal::value || packed.get_allocator() == other.packed.get_allocator(), "Copying a sparse set is not allowed"); + } + + /*! @brief Default destructor. */ + virtual ~basic_sparse_set() { + release_sparse_pages(); + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This sparse set. + */ + basic_sparse_set &operator=(basic_sparse_set &&other) noexcept { + ENTT_ASSERT(alloc_traits::is_always_equal::value || packed.get_allocator() == other.packed.get_allocator(), "Copying a sparse set is not allowed"); + + release_sparse_pages(); + sparse = std::move(other.sparse); + packed = std::move(other.packed); + info = other.info; + free_list = std::exchange(other.free_list, tombstone); + mode = other.mode; + return *this; + } + + /** + * @brief Exchanges the contents with those of a given sparse set. + * @param other Sparse set to exchange the content with. + */ + void swap(basic_sparse_set &other) { + using std::swap; + swap(sparse, other.sparse); + swap(packed, other.packed); + swap(info, other.info); + swap(free_list, other.free_list); + swap(mode, other.mode); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return packed.get_allocator(); + } + + /** + * @brief Returns the deletion policy of a sparse set. + * @return The deletion policy of the sparse set. + */ + [[nodiscard]] deletion_policy policy() const noexcept { + return mode; + } + + /** + * @brief Increases the capacity of a sparse set. + * + * If the new capacity is greater than the current capacity, new storage is + * allocated, otherwise the method does nothing. + * + * @param cap Desired capacity. + */ + virtual void reserve(const size_type cap) { + packed.reserve(cap); + } + + /** + * @brief Returns the number of elements that a sparse set has currently + * allocated space for. + * @return Capacity of the sparse set. + */ + [[nodiscard]] virtual size_type capacity() const noexcept { + return packed.capacity(); + } + + /*! @brief Requests the removal of unused capacity. */ + virtual void shrink_to_fit() { + packed.shrink_to_fit(); + } + + /** + * @brief Returns the extent of a sparse set. + * + * The extent of a sparse set is also the size of the internal sparse array. + * There is no guarantee that the internal packed array has the same size. + * Usually the size of the internal sparse array is equal or greater than + * the one of the internal packed array. + * + * @return Extent of the sparse set. + */ + [[nodiscard]] size_type extent() const noexcept { + return sparse.size() * entity_traits::page_size; + } + + /** + * @brief Returns the number of elements in a sparse set. + * + * The number of elements is also the size of the internal packed array. + * There is no guarantee that the internal sparse array has the same size. + * Usually the size of the internal sparse array is equal or greater than + * the one of the internal packed array. + * + * @return Number of elements. + */ + [[nodiscard]] size_type size() const noexcept { + return packed.size(); + } + + /** + * @brief Checks whether a sparse set is empty. + * @return True if the sparse set is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return packed.empty(); + } + + /** + * @brief Direct access to the internal packed array. + * @return A pointer to the internal packed array. + */ + [[nodiscard]] pointer data() const noexcept { + return packed.data(); + } + + /** + * @brief Returns an iterator to the beginning. + * + * The returned iterator points to the first entity of the internal packed + * array. If the sparse set is empty, the returned iterator will be equal to + * `end()`. + * + * @return An iterator to the first entity of the sparse set. + */ + [[nodiscard]] const_iterator begin() const noexcept { + const auto pos = static_cast(packed.size()); + return iterator{packed, pos}; + } + + /*! @copydoc begin */ + [[nodiscard]] const_iterator cbegin() const noexcept { + return begin(); + } + + /** + * @brief Returns an iterator to the end. + * + * The returned iterator points to the element following the last entity in + * a sparse set. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the element following the last entity of a sparse + * set. + */ + [[nodiscard]] iterator end() const noexcept { + return iterator{packed, {}}; + } + + /*! @copydoc end */ + [[nodiscard]] const_iterator cend() const noexcept { + return end(); + } + + /** + * @brief Returns a reverse iterator to the beginning. + * + * The returned iterator points to the first entity of the reversed internal + * packed array. If the sparse set is empty, the returned iterator will be + * equal to `rend()`. + * + * @return An iterator to the first entity of the reversed internal packed + * array. + */ + [[nodiscard]] const_reverse_iterator rbegin() const noexcept { + return std::make_reverse_iterator(end()); + } + + /*! @copydoc rbegin */ + [[nodiscard]] const_reverse_iterator crbegin() const noexcept { + return rbegin(); + } + + /** + * @brief Returns a reverse iterator to the end. + * + * The returned iterator points to the element following the last entity in + * the reversed sparse set. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the element following the last entity of the + * reversed sparse set. + */ + [[nodiscard]] reverse_iterator rend() const noexcept { + return std::make_reverse_iterator(begin()); + } + + /*! @copydoc rend */ + [[nodiscard]] const_reverse_iterator crend() const noexcept { + return rend(); + } + + /** + * @brief Finds an entity. + * @param entt A valid identifier. + * @return An iterator to the given entity if it's found, past the end + * iterator otherwise. + */ + [[nodiscard]] iterator find(const entity_type entt) const noexcept { + return contains(entt) ? --(end() - index(entt)) : end(); + } + + /** + * @brief Checks if a sparse set contains an entity. + * @param entt A valid identifier. + * @return True if the sparse set contains the entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const noexcept { + const auto elem = sparse_ptr(entt); + constexpr auto cap = entity_traits::to_entity(null); + // testing versions permits to avoid accessing the packed array + return elem && (((~cap & entity_traits::to_integral(entt)) ^ entity_traits::to_integral(*elem)) < cap); + } + + /** + * @brief Returns the contained version for an identifier. + * @param entt A valid identifier. + * @return The version for the given identifier if present, the tombstone + * version otherwise. + */ + [[nodiscard]] version_type current(const entity_type entt) const noexcept { + const auto elem = sparse_ptr(entt); + constexpr auto fallback = entity_traits::to_version(tombstone); + return elem ? entity_traits::to_version(*elem) : fallback; + } + + /** + * @brief Returns the position of an entity in a sparse set. + * + * @warning + * Attempting to get the position of an entity that doesn't belong to the + * sparse set results in undefined behavior. + * + * @param entt A valid identifier. + * @return The position of the entity in the sparse set. + */ + [[nodiscard]] size_type index(const entity_type entt) const noexcept { + ENTT_ASSERT(contains(entt), "Set does not contain entity"); + return static_cast(entity_traits::to_entity(sparse_ref(entt))); + } + + /** + * @brief Returns the entity at specified location, with bounds checking. + * @param pos The position for which to return the entity. + * @return The entity at specified location if any, a null entity otherwise. + */ + [[nodiscard]] entity_type at(const size_type pos) const noexcept { + return pos < packed.size() ? packed[pos] : null; + } + + /** + * @brief Returns the entity at specified location, without bounds checking. + * @param pos The position for which to return the entity. + * @return The entity at specified location. + */ + [[nodiscard]] entity_type operator[](const size_type pos) const noexcept { + ENTT_ASSERT(pos < packed.size(), "Position is out of bounds"); + return packed[pos]; + } + + /** + * @brief Returns the element assigned to an entity, if any. + * + * @warning + * Attempting to use an entity that doesn't belong to the sparse set results + * in undefined behavior. + * + * @param entt A valid identifier. + * @return An opaque pointer to the element assigned to the entity, if any. + */ + [[nodiscard]] const void *get(const entity_type entt) const noexcept { + return get_at(index(entt)); + } + + /*! @copydoc get */ + [[nodiscard]] void *get(const entity_type entt) noexcept { + return const_cast(std::as_const(*this).get(entt)); + } + + /** + * @brief Assigns an entity to a sparse set. + * + * @warning + * Attempting to assign an entity that already belongs to the sparse set + * results in undefined behavior. + * + * @param entt A valid identifier. + * @param value Optional opaque value to forward to mixins, if any. + * @return Iterator pointing to the emplaced element in case of success, the + * `end()` iterator otherwise. + */ + iterator emplace(const entity_type entt, const void *value = nullptr) { + return try_emplace(entt, false, value); + } + + /** + * @brief Bump the version number of an entity. + * + * @warning + * Attempting to bump the version of an entity that doesn't belong to the + * sparse set results in undefined behavior. + * + * @param entt A valid identifier. + */ + void bump(const entity_type entt) { + auto &entity = sparse_ref(entt); + ENTT_ASSERT(entt != tombstone && entity != null, "Cannot set the required version"); + entity = entity_traits::combine(entity_traits::to_integral(entity), entity_traits::to_integral(entt)); + packed[static_cast(entity_traits::to_entity(entity))] = entt; + } + + /** + * @brief Assigns one or more entities to a sparse set. + * + * @warning + * Attempting to assign an entity that already belongs to the sparse set + * results in undefined behavior. + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @return Iterator pointing to the first element inserted in case of + * success, the `end()` iterator otherwise. + */ + template + iterator insert(It first, It last) { + for(auto it = first; it != last; ++it) { + try_emplace(*it, true); + } + + return first == last ? end() : find(*first); + } + + /** + * @brief Erases an entity from a sparse set. + * + * @warning + * Attempting to erase an entity that doesn't belong to the sparse set + * results in undefined behavior. + * + * @param entt A valid identifier. + */ + void erase(const entity_type entt) { + const auto it = --(end() - index(entt)); + pop(it, it + 1u); + } + + /** + * @brief Erases entities from a set. + * + * @sa erase + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + template + void erase(It first, It last) { + if constexpr(std::is_same_v) { + pop(first, last); + } else { + for(; first != last; ++first) { + erase(*first); + } + } + } + + /** + * @brief Removes an entity from a sparse set if it exists. + * @param entt A valid identifier. + * @return True if the entity is actually removed, false otherwise. + */ + bool remove(const entity_type entt) { + return contains(entt) && (erase(entt), true); + } + + /** + * @brief Removes entities from a sparse set if they exist. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @return The number of entities actually removed. + */ + template + size_type remove(It first, It last) { + size_type count{}; + + for(; first != last; ++first) { + count += remove(*first); + } + + return count; + } + + /*! @brief Removes all tombstones from the packed array of a sparse set. */ + void compact() { + size_type from = packed.size(); + for(; from && packed[from - 1u] == tombstone; --from) {} + + for(auto *it = &free_list; *it != null && from; it = std::addressof(packed[entity_traits::to_entity(*it)])) { + if(const size_type to = entity_traits::to_entity(*it); to < from) { + --from; + move_element(from, to); + + using std::swap; + swap(packed[from], packed[to]); + + const auto entity = static_cast(to); + sparse_ref(packed[to]) = entity_traits::combine(entity, entity_traits::to_integral(packed[to])); + *it = entity_traits::combine(static_cast(from), entity_traits::reserved); + for(; from && packed[from - 1u] == tombstone; --from) {} + } + } + + free_list = tombstone; + packed.resize(from); + } + + /** + * @brief Swaps two entities in a sparse set. + * + * For what it's worth, this function affects both the internal sparse array + * and the internal packed array. Users should not care of that anyway. + * + * @warning + * Attempting to swap entities that don't belong to the sparse set results + * in undefined behavior. + * + * @param lhs A valid identifier. + * @param rhs A valid identifier. + */ + void swap_elements(const entity_type lhs, const entity_type rhs) { + ENTT_ASSERT(contains(lhs) && contains(rhs), "Set does not contain entities"); + + auto &entt = sparse_ref(lhs); + auto &other = sparse_ref(rhs); + + const auto from = entity_traits::to_entity(entt); + const auto to = entity_traits::to_entity(other); + + // basic no-leak guarantee (with invalid state) if swapping throws + swap_at(static_cast(from), static_cast(to)); + entt = entity_traits::combine(to, entity_traits::to_integral(packed[from])); + other = entity_traits::combine(from, entity_traits::to_integral(packed[to])); + + using std::swap; + swap(packed[from], packed[to]); + } + + /** + * @brief Sort the first count elements according to the given comparison + * function. + * + * The comparison function object must return `true` if the first element + * is _less_ than the second one, `false` otherwise. The signature of the + * comparison function should be equivalent to the following: + * + * @code{.cpp} + * bool(const Entity, const Entity); + * @endcode + * + * Moreover, the comparison function object shall induce a + * _strict weak ordering_ on the values. + * + * The sort function object must offer a member function template + * `operator()` that accepts three arguments: + * + * * An iterator to the first element of the range to sort. + * * An iterator past the last element of the range to sort. + * * A comparison function to use to compare the elements. + * + * @tparam Compare Type of comparison function object. + * @tparam Sort Type of sort function object. + * @tparam Args Types of arguments to forward to the sort function object. + * @param length Number of elements to sort. + * @param compare A valid comparison function object. + * @param algo A valid sort function object. + * @param args Arguments to forward to the sort function object, if any. + */ + template + void sort_n(const size_type length, Compare compare, Sort algo = Sort{}, Args &&...args) { + ENTT_ASSERT(!(length > packed.size()), "Length exceeds the number of elements"); + ENTT_ASSERT(free_list == null, "Partial sorting with tombstones is not supported"); + + algo(packed.rend() - length, packed.rend(), std::move(compare), std::forward(args)...); + + for(size_type pos{}; pos < length; ++pos) { + auto curr = pos; + auto next = index(packed[curr]); + + while(curr != next) { + const auto idx = index(packed[next]); + const auto entt = packed[curr]; + + swap_at(next, idx); + const auto entity = static_cast(curr); + sparse_ref(entt) = entity_traits::combine(entity, entity_traits::to_integral(packed[curr])); + curr = std::exchange(next, idx); + } + } + } + + /** + * @brief Sort all elements according to the given comparison function. + * + * @sa sort_n + * + * @tparam Compare Type of comparison function object. + * @tparam Sort Type of sort function object. + * @tparam Args Types of arguments to forward to the sort function object. + * @param compare A valid comparison function object. + * @param algo A valid sort function object. + * @param args Arguments to forward to the sort function object, if any. + */ + template + void sort(Compare compare, Sort algo = Sort{}, Args &&...args) { + compact(); + sort_n(packed.size(), std::move(compare), std::move(algo), std::forward(args)...); + } + + /** + * @brief Sort entities according to their order in another sparse set. + * + * Entities that are part of both the sparse sets are ordered internally + * according to the order they have in `other`. All the other entities goes + * to the end of the list and there are no guarantees on their order.
+ * In other terms, this function can be used to impose the same order on two + * sets by using one of them as a master and the other one as a slave. + * + * Iterating the sparse set with a couple of iterators returns elements in + * the expected order after a call to `respect`. See `begin` and `end` for + * more details. + * + * @param other The sparse sets that imposes the order of the entities. + */ + void respect(const basic_sparse_set &other) { + compact(); + + const auto to = other.end(); + auto from = other.begin(); + + for(size_type pos = packed.size() - 1; pos && from != to; ++from) { + if(contains(*from)) { + if(*from != packed[pos]) { + // basic no-leak guarantee (with invalid state) if swapping throws + swap_elements(packed[pos], *from); + } + + --pos; + } + } + } + + /*! @brief Clears a sparse set. */ + void clear() { + if(const auto last = end(); free_list == null) { + pop(begin(), last); + } else { + for(auto &&entity: *this) { + // tombstone filter on itself + if(const auto it = find(entity); it != last) { + pop(it, it + 1u); + } + } + } + + free_list = tombstone; + packed.clear(); + } + + /** + * @brief Returned value type, if any. + * @return Returned value type, if any. + */ + const type_info &type() const noexcept { + return *info; + } + + /*! @brief Forwards variables to derived classes, if any. */ + virtual void bind(any) noexcept {} + +private: + sparse_container_type sparse; + packed_container_type packed; + const type_info *info; + entity_type free_list; + deletion_policy mode; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/entity/storage.hpp b/LiteLoader/third-party/include/entt/entity/storage.hpp new file mode 100644 index 0000000..9bd6d11 --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/storage.hpp @@ -0,0 +1,941 @@ +#ifndef ENTT_ENTITY_STORAGE_HPP +#define ENTT_ENTITY_STORAGE_HPP + +#include +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/compressed_pair.hpp" +#include "../core/iterator.hpp" +#include "../core/memory.hpp" +#include "../core/type_info.hpp" +#include "component.hpp" +#include "entity.hpp" +#include "fwd.hpp" +#include "sparse_set.hpp" +#include "storage_mixin.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class storage_iterator final { + friend storage_iterator; + + using container_type = std::remove_const_t; + using alloc_traits = std::allocator_traits; + using comp_traits = component_traits>; + + using iterator_traits = std::iterator_traits, + typename alloc_traits::template rebind_traits::element_type>::const_pointer, + typename alloc_traits::template rebind_traits::element_type>::pointer>>; + +public: + using value_type = typename iterator_traits::value_type; + using pointer = typename iterator_traits::pointer; + using reference = typename iterator_traits::reference; + using difference_type = typename iterator_traits::difference_type; + using iterator_category = std::random_access_iterator_tag; + + constexpr storage_iterator() noexcept = default; + + constexpr storage_iterator(Container *ref, const difference_type idx) noexcept + : packed{ref}, + offset{idx} {} + + template, typename = std::enable_if_t> + constexpr storage_iterator(const storage_iterator> &other) noexcept + : storage_iterator{other.packed, other.offset} {} + + constexpr storage_iterator &operator++() noexcept { + return --offset, *this; + } + + constexpr storage_iterator operator++(int) noexcept { + storage_iterator orig = *this; + return ++(*this), orig; + } + + constexpr storage_iterator &operator--() noexcept { + return ++offset, *this; + } + + constexpr storage_iterator operator--(int) noexcept { + storage_iterator orig = *this; + return operator--(), orig; + } + + constexpr storage_iterator &operator+=(const difference_type value) noexcept { + offset -= value; + return *this; + } + + constexpr storage_iterator operator+(const difference_type value) const noexcept { + storage_iterator copy = *this; + return (copy += value); + } + + constexpr storage_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr storage_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + const auto pos = index() - value; + return (*packed)[pos / comp_traits::page_size][fast_mod(pos, comp_traits::page_size)]; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + const auto pos = index(); + return (*packed)[pos / comp_traits::page_size] + fast_mod(pos, comp_traits::page_size); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *operator->(); + } + + [[nodiscard]] constexpr difference_type index() const noexcept { + return offset - 1; + } + +private: + Container *packed; + difference_type offset; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return rhs.index() - lhs.index(); +} + +template +[[nodiscard]] constexpr bool operator==(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return lhs.index() == rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator!=(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return lhs.index() > rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator>(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return lhs.index() < rhs.index(); +} + +template +[[nodiscard]] constexpr bool operator<=(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const storage_iterator &lhs, const storage_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +template +class extended_storage_iterator final { + template + friend class extended_storage_iterator; + +public: + using value_type = decltype(std::tuple_cat(std::make_tuple(*std::declval()), std::forward_as_tuple(*std::declval()...))); + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr extended_storage_iterator() + : it{} {} + + constexpr extended_storage_iterator(It base, Other... other) + : it{base, other...} {} + + template && ...) && (std::is_constructible_v && ...)>> + constexpr extended_storage_iterator(const extended_storage_iterator &other) + : it{other.it} {} + + constexpr extended_storage_iterator &operator++() noexcept { + return ++std::get(it), (++std::get(it), ...), *this; + } + + constexpr extended_storage_iterator operator++(int) noexcept { + extended_storage_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return {*std::get(it), *std::get(it)...}; + } + + template + friend constexpr bool operator==(const extended_storage_iterator &, const extended_storage_iterator &) noexcept; + +private: + std::tuple it; +}; + +template +[[nodiscard]] constexpr bool operator==(const extended_storage_iterator &lhs, const extended_storage_iterator &rhs) noexcept { + return std::get<0>(lhs.it) == std::get<0>(rhs.it); +} + +template +[[nodiscard]] constexpr bool operator!=(const extended_storage_iterator &lhs, const extended_storage_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Basic storage implementation. + * + * Internal data structures arrange elements to maximize performance. There are + * no guarantees that objects are returned in the insertion order when iterate + * a storage. Do not make assumption on the order in any case. + * + * @warning + * Empty types aren't explicitly instantiated. Therefore, many of the functions + * normally available for non-empty types will not be available for empty ones. + * + * @tparam Type Type of objects assigned to the entities. + * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_storage: public basic_sparse_set::template rebind_alloc> { + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using underlying_type = basic_sparse_set>; + using container_type = std::vector>; + using comp_traits = component_traits; + + static constexpr bool is_pinned_type_v = !(std::is_move_constructible_v && std::is_move_assignable_v); + + [[nodiscard]] auto &element_at(const std::size_t pos) const { + return packed.first()[pos / comp_traits::page_size][fast_mod(pos, comp_traits::page_size)]; + } + + auto assure_at_least(const std::size_t pos) { + auto &&container = packed.first(); + const auto idx = pos / comp_traits::page_size; + + if(!(idx < container.size())) { + auto curr = container.size(); + container.resize(idx + 1u, nullptr); + + ENTT_TRY { + for(const auto last = container.size(); curr < last; ++curr) { + container[curr] = alloc_traits::allocate(packed.second(), comp_traits::page_size); + } + } + ENTT_CATCH { + container.resize(curr); + ENTT_THROW; + } + } + + return container[idx] + fast_mod(pos, comp_traits::page_size); + } + + template + auto emplace_element(const Entity entt, const bool force_back, Args &&...args) { + const auto it = base_type::try_emplace(entt, force_back); + + ENTT_TRY { + auto elem = assure_at_least(static_cast(it.index())); + entt::uninitialized_construct_using_allocator(to_address(elem), packed.second(), std::forward(args)...); + } + ENTT_CATCH { + base_type::pop(it, it + 1u); + ENTT_THROW; + } + + return it; + } + + void shrink_to_size(const std::size_t sz) { + for(auto pos = sz, length = base_type::size(); pos < length; ++pos) { + if constexpr(comp_traits::in_place_delete) { + if(base_type::at(pos) != tombstone) { + std::destroy_at(std::addressof(element_at(pos))); + } + } else { + std::destroy_at(std::addressof(element_at(pos))); + } + } + + auto &&container = packed.first(); + auto page_allocator{packed.second()}; + const auto from = (sz + comp_traits::page_size - 1u) / comp_traits::page_size; + + for(auto pos = from, last = container.size(); pos < last; ++pos) { + alloc_traits::deallocate(page_allocator, container[pos], comp_traits::page_size); + } + + container.resize(from); + } + +private: + const void *get_at(const std::size_t pos) const final { + return std::addressof(element_at(pos)); + } + + void swap_at([[maybe_unused]] const std::size_t lhs, [[maybe_unused]] const std::size_t rhs) final { + // use a runtime value to avoid compile-time suppression that drives the code coverage tool crazy + ENTT_ASSERT((lhs + 1u) && !is_pinned_type_v, "Pinned type"); + + if constexpr(!is_pinned_type_v) { + using std::swap; + swap(element_at(lhs), element_at(rhs)); + } + } + + void move_element([[maybe_unused]] const std::size_t from, [[maybe_unused]] const std::size_t to) final { + // use a runtime value to avoid compile-time suppression that drives the code coverage tool crazy + ENTT_ASSERT((from + 1u) && !is_pinned_type_v, "Pinned type"); + + if constexpr(!is_pinned_type_v) { + auto &elem = element_at(from); + entt::uninitialized_construct_using_allocator(to_address(assure_at_least(to)), packed.second(), std::move(elem)); + std::destroy_at(std::addressof(elem)); + } + } + +protected: + /*! @brief Random access iterator type. */ + using basic_iterator = typename underlying_type::basic_iterator; + + /** + * @brief Erases entities from a sparse set. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + void pop(basic_iterator first, basic_iterator last) override { + for(; first != last; ++first) { + // cannot use first.index() because it would break with cross iterators + auto &elem = element_at(base_type::index(*first)); + + if constexpr(comp_traits::in_place_delete) { + base_type::in_place_pop(first); + std::destroy_at(std::addressof(elem)); + } else { + auto &other = element_at(base_type::size() - 1u); + // destroying on exit allows reentrant destructors + [[maybe_unused]] auto unused = std::exchange(elem, std::move(other)); + std::destroy_at(std::addressof(other)); + base_type::swap_and_pop(first); + } + } + } + + /** + * @brief Assigns an entity to a storage. + * @param entt A valid identifier. + * @param value Optional opaque value. + * @param force_back Force back insertion. + * @return Iterator pointing to the emplaced element. + */ + basic_iterator try_emplace([[maybe_unused]] const Entity entt, const bool force_back, const void *value) override { + if(value) { + if constexpr(std::is_copy_constructible_v) { + return emplace_element(entt, force_back, *static_cast(value)); + } else { + return base_type::end(); + } + } else { + if constexpr(std::is_default_constructible_v) { + return emplace_element(entt, force_back); + } else { + return base_type::end(); + } + } + } + +public: + /*! @brief Base type. */ + using base_type = underlying_type; + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Type of the objects assigned to entities. */ + using value_type = Type; + /*! @brief Underlying entity identifier. */ + using entity_type = Entity; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Pointer type to contained elements. */ + using pointer = typename container_type::pointer; + /*! @brief Constant pointer type to contained elements. */ + using const_pointer = typename alloc_traits::template rebind_traits::const_pointer; + /*! @brief Random access iterator type. */ + using iterator = internal::storage_iterator; + /*! @brief Constant random access iterator type. */ + using const_iterator = internal::storage_iterator; + /*! @brief Reverse iterator type. */ + using reverse_iterator = std::reverse_iterator; + /*! @brief Constant reverse iterator type. */ + using const_reverse_iterator = std::reverse_iterator; + /*! @brief Extended iterable storage proxy. */ + using iterable = iterable_adaptor>; + /*! @brief Constant extended iterable storage proxy. */ + using const_iterable = iterable_adaptor>; + + /*! @brief Default constructor. */ + basic_storage() + : basic_storage{allocator_type{}} {} + + /** + * @brief Constructs an empty storage with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_storage(const allocator_type &allocator) + : base_type{type_id(), deletion_policy{comp_traits::in_place_delete}, allocator}, + packed{container_type{allocator}, allocator} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_storage(basic_storage &&other) noexcept + : base_type{std::move(other)}, + packed{std::move(other.packed)} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_storage(basic_storage &&other, const allocator_type &allocator) noexcept + : base_type{std::move(other), allocator}, + packed{container_type{std::move(other.packed.first()), allocator}, allocator} { + ENTT_ASSERT(alloc_traits::is_always_equal::value || packed.second() == other.packed.second(), "Copying a storage is not allowed"); + } + + /*! @brief Default destructor. */ + ~basic_storage() override { + shrink_to_size(0u); + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This storage. + */ + basic_storage &operator=(basic_storage &&other) noexcept { + ENTT_ASSERT(alloc_traits::is_always_equal::value || packed.second() == other.packed.second(), "Copying a storage is not allowed"); + + shrink_to_size(0u); + base_type::operator=(std::move(other)); + packed.first() = std::move(other.packed.first()); + propagate_on_container_move_assignment(packed.second(), other.packed.second()); + return *this; + } + + /** + * @brief Exchanges the contents with those of a given storage. + * @param other Storage to exchange the content with. + */ + void swap(basic_storage &other) { + using std::swap; + underlying_type::swap(other); + propagate_on_container_swap(packed.second(), other.packed.second()); + swap(packed.first(), other.packed.first()); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return allocator_type{packed.second()}; + } + + /** + * @brief Increases the capacity of a storage. + * + * If the new capacity is greater than the current capacity, new storage is + * allocated, otherwise the method does nothing. + * + * @param cap Desired capacity. + */ + void reserve(const size_type cap) override { + if(cap != 0u) { + base_type::reserve(cap); + assure_at_least(cap - 1u); + } + } + + /** + * @brief Returns the number of elements that a storage has currently + * allocated space for. + * @return Capacity of the storage. + */ + [[nodiscard]] size_type capacity() const noexcept override { + return packed.first().size() * comp_traits::page_size; + } + + /*! @brief Requests the removal of unused capacity. */ + void shrink_to_fit() override { + base_type::shrink_to_fit(); + shrink_to_size(base_type::size()); + } + + /** + * @brief Direct access to the array of objects. + * @return A pointer to the array of objects. + */ + [[nodiscard]] const_pointer raw() const noexcept { + return packed.first().data(); + } + + /*! @copydoc raw */ + [[nodiscard]] pointer raw() noexcept { + return packed.first().data(); + } + + /** + * @brief Returns an iterator to the beginning. + * + * The returned iterator points to the first instance of the internal array. + * If the storage is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first instance of the internal array. + */ + [[nodiscard]] const_iterator cbegin() const noexcept { + const auto pos = static_cast(base_type::size()); + return const_iterator{&packed.first(), pos}; + } + + /*! @copydoc cbegin */ + [[nodiscard]] const_iterator begin() const noexcept { + return cbegin(); + } + + /*! @copydoc begin */ + [[nodiscard]] iterator begin() noexcept { + const auto pos = static_cast(base_type::size()); + return iterator{&packed.first(), pos}; + } + + /** + * @brief Returns an iterator to the end. + * + * The returned iterator points to the element following the last instance + * of the internal array. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the element following the last instance of the + * internal array. + */ + [[nodiscard]] const_iterator cend() const noexcept { + return const_iterator{&packed.first(), {}}; + } + + /*! @copydoc cend */ + [[nodiscard]] const_iterator end() const noexcept { + return cend(); + } + + /*! @copydoc end */ + [[nodiscard]] iterator end() noexcept { + return iterator{&packed.first(), {}}; + } + + /** + * @brief Returns a reverse iterator to the beginning. + * + * The returned iterator points to the first instance of the reversed + * internal array. If the storage is empty, the returned iterator will be + * equal to `rend()`. + * + * @return An iterator to the first instance of the reversed internal array. + */ + [[nodiscard]] const_reverse_iterator crbegin() const noexcept { + return std::make_reverse_iterator(cend()); + } + + /*! @copydoc crbegin */ + [[nodiscard]] const_reverse_iterator rbegin() const noexcept { + return crbegin(); + } + + /*! @copydoc rbegin */ + [[nodiscard]] reverse_iterator rbegin() noexcept { + return std::make_reverse_iterator(end()); + } + + /** + * @brief Returns a reverse iterator to the end. + * + * The returned iterator points to the element following the last instance + * of the reversed internal array. Attempting to dereference the returned + * iterator results in undefined behavior. + * + * @return An iterator to the element following the last instance of the + * reversed internal array. + */ + [[nodiscard]] const_reverse_iterator crend() const noexcept { + return std::make_reverse_iterator(cbegin()); + } + + /*! @copydoc crend */ + [[nodiscard]] const_reverse_iterator rend() const noexcept { + return crend(); + } + + /*! @copydoc rend */ + [[nodiscard]] reverse_iterator rend() noexcept { + return std::make_reverse_iterator(begin()); + } + + /** + * @brief Returns the object assigned to an entity. + * + * @warning + * Attempting to use an entity that doesn't belong to the storage results in + * undefined behavior. + * + * @param entt A valid identifier. + * @return The object assigned to the entity. + */ + [[nodiscard]] const value_type &get(const entity_type entt) const noexcept { + return element_at(base_type::index(entt)); + } + + /*! @copydoc get */ + [[nodiscard]] value_type &get(const entity_type entt) noexcept { + return const_cast(std::as_const(*this).get(entt)); + } + + /** + * @brief Returns the object assigned to an entity as a tuple. + * @param entt A valid identifier. + * @return The object assigned to the entity as a tuple. + */ + [[nodiscard]] std::tuple get_as_tuple(const entity_type entt) const noexcept { + return std::forward_as_tuple(get(entt)); + } + + /*! @copydoc get_as_tuple */ + [[nodiscard]] std::tuple get_as_tuple(const entity_type entt) noexcept { + return std::forward_as_tuple(get(entt)); + } + + /** + * @brief Assigns an entity to a storage and constructs its object. + * + * @warning + * Attempting to use an entity that already belongs to the storage results + * in undefined behavior. + * + * @tparam Args Types of arguments to use to construct the object. + * @param entt A valid identifier. + * @param args Parameters to use to construct an object for the entity. + * @return A reference to the newly created object. + */ + template + value_type &emplace(const entity_type entt, Args &&...args) { + if constexpr(std::is_aggregate_v) { + const auto it = emplace_element(entt, false, Type{std::forward(args)...}); + return element_at(static_cast(it.index())); + } else { + const auto it = emplace_element(entt, false, std::forward(args)...); + return element_at(static_cast(it.index())); + } + } + + /** + * @brief Updates the instance assigned to a given entity in-place. + * @tparam Func Types of the function objects to invoke. + * @param entt A valid identifier. + * @param func Valid function objects. + * @return A reference to the updated instance. + */ + template + value_type &patch(const entity_type entt, Func &&...func) { + const auto idx = base_type::index(entt); + auto &elem = element_at(idx); + (std::forward(func)(elem), ...); + return elem; + } + + /** + * @brief Assigns one or more entities to a storage and constructs their + * objects from a given instance. + * + * @warning + * Attempting to assign an entity that already belongs to the storage + * results in undefined behavior. + * + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param value An instance of the object to construct. + */ + template + void insert(It first, It last, const value_type &value = {}) { + for(; first != last; ++first) { + emplace_element(*first, true, value); + } + } + + /** + * @brief Assigns one or more entities to a storage and constructs their + * objects from a given range. + * + * @sa construct + * + * @tparam EIt Type of input iterator. + * @tparam CIt Type of input iterator. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param from An iterator to the first element of the range of objects. + */ + template::value_type, value_type>>> + void insert(EIt first, EIt last, CIt from) { + for(; first != last; ++first, ++from) { + emplace_element(*first, true, *from); + } + } + + /** + * @brief Returns an iterable object to use to _visit_ a storage. + * + * The iterable object returns a tuple that contains the current entity and + * a reference to its component. + * + * @return An iterable object to use to _visit_ the storage. + */ + [[nodiscard]] iterable each() noexcept { + return {internal::extended_storage_iterator{base_type::begin(), begin()}, internal::extended_storage_iterator{base_type::end(), end()}}; + } + + /*! @copydoc each */ + [[nodiscard]] const_iterable each() const noexcept { + return {internal::extended_storage_iterator{base_type::cbegin(), cbegin()}, internal::extended_storage_iterator{base_type::cend(), cend()}}; + } + +private: + compressed_pair packed; +}; + +/*! @copydoc basic_storage */ +template +class basic_storage>> + : public basic_sparse_set::template rebind_alloc> { + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using underlying_type = basic_sparse_set>; + using comp_traits = component_traits; + +public: + /*! @brief Base type. */ + using base_type = underlying_type; + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Type of the objects assigned to entities. */ + using value_type = Type; + /*! @brief Underlying entity identifier. */ + using entity_type = Entity; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Extended iterable storage proxy. */ + using iterable = iterable_adaptor>; + /*! @brief Constant extended iterable storage proxy. */ + using const_iterable = iterable_adaptor>; + + /*! @brief Default constructor. */ + basic_storage() + : basic_storage{allocator_type{}} {} + + /** + * @brief Constructs an empty container with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_storage(const allocator_type &allocator) + : base_type{type_id(), deletion_policy{comp_traits::in_place_delete}, allocator} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_storage(basic_storage &&other) noexcept = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_storage(basic_storage &&other, const allocator_type &allocator) noexcept + : base_type{std::move(other), allocator} {} + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This storage. + */ + basic_storage &operator=(basic_storage &&other) noexcept = default; + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return allocator_type{base_type::get_allocator()}; + } + + /** + * @brief Returns the object assigned to an entity, that is `void`. + * + * @warning + * Attempting to use an entity that doesn't belong to the storage results in + * undefined behavior. + * + * @param entt A valid identifier. + */ + void get([[maybe_unused]] const entity_type entt) const noexcept { + ENTT_ASSERT(base_type::contains(entt), "Storage does not contain entity"); + } + + /** + * @brief Returns an empty tuple. + * + * @warning + * Attempting to use an entity that doesn't belong to the storage results in + * undefined behavior. + * + * @param entt A valid identifier. + * @return Returns an empty tuple. + */ + [[nodiscard]] std::tuple<> get_as_tuple([[maybe_unused]] const entity_type entt) const noexcept { + ENTT_ASSERT(base_type::contains(entt), "Storage does not contain entity"); + return std::tuple{}; + } + + /** + * @brief Assigns an entity to a storage and constructs its object. + * + * @warning + * Attempting to use an entity that already belongs to the storage results + * in undefined behavior. + * + * @tparam Args Types of arguments to use to construct the object. + * @param entt A valid identifier. + */ + template + void emplace(const entity_type entt, Args &&...) { + base_type::try_emplace(entt, false); + } + + /** + * @brief Updates the instance assigned to a given entity in-place. + * @tparam Func Types of the function objects to invoke. + * @param entt A valid identifier. + * @param func Valid function objects. + */ + template + void patch([[maybe_unused]] const entity_type entt, Func &&...func) { + ENTT_ASSERT(base_type::contains(entt), "Storage does not contain entity"); + (std::forward(func)(), ...); + } + + /** + * @brief Assigns entities to a storage. + * @tparam It Type of input iterator. + * @tparam Args Types of optional arguments. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + */ + template + void insert(It first, It last, Args &&...) { + for(; first != last; ++first) { + base_type::try_emplace(*first, true); + } + } + + /** + * @brief Returns an iterable object to use to _visit_ a storage. + * + * The iterable object returns a tuple that contains the current entity. + * + * @return An iterable object to use to _visit_ the storage. + */ + [[nodiscard]] iterable each() noexcept { + return {internal::extended_storage_iterator{base_type::begin()}, internal::extended_storage_iterator{base_type::end()}}; + } + + /*! @copydoc each */ + [[nodiscard]] const_iterable each() const noexcept { + return {internal::extended_storage_iterator{base_type::cbegin()}, internal::extended_storage_iterator{base_type::cend()}}; + } +}; + +/** + * @brief Provides a common way to define storage types. + * @tparam Type Storage value type. + * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +struct storage_type { + /*! @brief Type-to-storage conversion result. */ + using type = sigh_storage_mixin>; +}; + +/** + * @brief Helper type. + * @tparam Args Arguments to forward. + */ +template +using storage_type_t = typename storage_type::type; + +/** + * Type-to-storage conversion utility that preserves constness. + * @tparam Type Storage value type, eventually const. + * @tparam Entity A valid entity type (see entt_traits for more details). + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +struct storage_for { + /*! @brief Type-to-storage conversion result. */ + using type = constness_as_t, Entity, Allocator>, Type>; +}; + +/** + * @brief Helper type. + * @tparam Args Arguments to forward. + */ +template +using storage_for_t = typename storage_for::type; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/entity/storage_mixin.hpp b/LiteLoader/third-party/include/entt/entity/storage_mixin.hpp new file mode 100644 index 0000000..0686e4e --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/storage_mixin.hpp @@ -0,0 +1,236 @@ +#ifndef ENTT_ENTITY_SIGH_STORAGE_MIXIN_HPP +#define ENTT_ENTITY_SIGH_STORAGE_MIXIN_HPP + +#include +#include "../config/config.h" +#include "../core/any.hpp" +#include "../signal/sigh.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @brief Mixin type used to add signal support to storage types. + * + * The function type of a listener is equivalent to: + * + * @code{.cpp} + * void(basic_registry &, entity_type); + * @endcode + * + * This applies to all signals made available. + * + * @tparam Type The type of the underlying storage. + */ +template +class sigh_storage_mixin final: public Type { + using basic_registry_type = basic_registry; + using sigh_type = sigh; + using basic_iterator = typename Type::basic_iterator; + + void pop(basic_iterator first, basic_iterator last) override { + ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); + + for(; first != last; ++first) { + const auto entt = *first; + destruction.publish(*owner, entt); + const auto it = Type::find(entt); + Type::pop(it, it + 1u); + } + } + + basic_iterator try_emplace(const typename basic_registry_type::entity_type entt, const bool force_back, const void *value) final { + ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); + Type::try_emplace(entt, force_back, value); + construction.publish(*owner, entt); + return Type::find(entt); + } + +public: + /*! @brief Allocator type. */ + using allocator_type = typename Type::allocator_type; + /*! @brief Underlying entity identifier. */ + using entity_type = typename Type::entity_type; + /*! @brief Expected registry type. */ + using registry_type = basic_registry_type; + + /*! @brief Default constructor. */ + sigh_storage_mixin() + : sigh_storage_mixin{allocator_type{}} {} + + /** + * @brief Constructs an empty storage with a given allocator. + * @param allocator The allocator to use. + */ + explicit sigh_storage_mixin(const allocator_type &allocator) + : Type{allocator}, + owner{}, + construction{allocator}, + destruction{allocator}, + update{allocator} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + sigh_storage_mixin(sigh_storage_mixin &&other) noexcept + : Type{std::move(other)}, + owner{other.owner}, + construction{std::move(other.construction)}, + destruction{std::move(other.destruction)}, + update{std::move(other.update)} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + sigh_storage_mixin(sigh_storage_mixin &&other, const allocator_type &allocator) noexcept + : Type{std::move(other), allocator}, + owner{other.owner}, + construction{std::move(other.construction), allocator}, + destruction{std::move(other.destruction), allocator}, + update{std::move(other.update), allocator} {} + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This storage. + */ + sigh_storage_mixin &operator=(sigh_storage_mixin &&other) noexcept { + Type::operator=(std::move(other)); + owner = other.owner; + construction = std::move(other.construction); + destruction = std::move(other.destruction); + update = std::move(other.update); + return *this; + } + + /** + * @brief Exchanges the contents with those of a given storage. + * @param other Storage to exchange the content with. + */ + void swap(sigh_storage_mixin &other) { + using std::swap; + Type::swap(other); + swap(owner, other.owner); + swap(construction, other.construction); + swap(destruction, other.destruction); + swap(update, other.update); + } + + /** + * @brief Returns a sink object. + * + * The sink returned by this function can be used to receive notifications + * whenever a new instance is created and assigned to an entity.
+ * Listeners are invoked after the object has been assigned to the entity. + * + * @sa sink + * + * @return A temporary sink object. + */ + [[nodiscard]] auto on_construct() noexcept { + return sink{construction}; + } + + /** + * @brief Returns a sink object. + * + * The sink returned by this function can be used to receive notifications + * whenever an instance is explicitly updated.
+ * Listeners are invoked after the object has been updated. + * + * @sa sink + * + * @return A temporary sink object. + */ + [[nodiscard]] auto on_update() noexcept { + return sink{update}; + } + + /** + * @brief Returns a sink object. + * + * The sink returned by this function can be used to receive notifications + * whenever an instance is removed from an entity and thus destroyed.
+ * Listeners are invoked before the object has been removed from the entity. + * + * @sa sink + * + * @return A temporary sink object. + */ + [[nodiscard]] auto on_destroy() noexcept { + return sink{destruction}; + } + + /** + * @brief Assigns entities to a storage. + * @tparam Args Types of arguments to use to construct the object. + * @param entt A valid identifier. + * @param args Parameters to use to initialize the object. + * @return A reference to the newly created object. + */ + template + decltype(auto) emplace(const entity_type entt, Args &&...args) { + ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); + Type::emplace(entt, std::forward(args)...); + construction.publish(*owner, entt); + return this->get(entt); + } + + /** + * @brief Patches the given instance for an entity. + * @tparam Func Types of the function objects to invoke. + * @param entt A valid identifier. + * @param func Valid function objects. + * @return A reference to the patched instance. + */ + template + decltype(auto) patch(const entity_type entt, Func &&...func) { + ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); + Type::patch(entt, std::forward(func)...); + update.publish(*owner, entt); + return this->get(entt); + } + + /** + * @brief Assigns entities to a storage. + * @tparam It Type of input iterator. + * @tparam Args Types of arguments to use to construct the objects assigned + * to the entities. + * @param first An iterator to the first element of the range of entities. + * @param last An iterator past the last element of the range of entities. + * @param args Parameters to use to initialize the objects assigned to the + * entities. + */ + template + void insert(It first, It last, Args &&...args) { + ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); + Type::insert(first, last, std::forward(args)...); + + for(auto it = construction.empty() ? last : first; it != last; ++it) { + construction.publish(*owner, *it); + } + } + + /** + * @brief Forwards variables to derived classes, if any. + * @param value A variable wrapped in an opaque container. + */ + void bind(any value) noexcept final { + auto *reg = any_cast(&value); + owner = reg ? reg : owner; + Type::bind(std::move(value)); + } + +private: + basic_registry_type *owner; + sigh_type construction; + sigh_type destruction; + sigh_type update; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/entity/view.hpp b/LiteLoader/third-party/include/entt/entity/view.hpp new file mode 100644 index 0000000..5c732ed --- /dev/null +++ b/LiteLoader/third-party/include/entt/entity/view.hpp @@ -0,0 +1,861 @@ +#ifndef ENTT_ENTITY_VIEW_HPP +#define ENTT_ENTITY_VIEW_HPP + +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/iterator.hpp" +#include "../core/type_traits.hpp" +#include "component.hpp" +#include "entity.hpp" +#include "fwd.hpp" +#include "sparse_set.hpp" +#include "storage.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class view_iterator final { + using iterator_type = typename Type::const_iterator; + + [[nodiscard]] bool valid() const noexcept { + return ((Get != 0u) || (*it != tombstone)) + && std::apply([entt = *it](const auto *...curr) { return (curr->contains(entt) && ...); }, pools) + && std::apply([entt = *it](const auto *...curr) { return (!curr->contains(entt) && ...); }, filter); + } + +public: + using value_type = typename iterator_type::value_type; + using pointer = typename iterator_type::pointer; + using reference = typename iterator_type::reference; + using difference_type = typename iterator_type::difference_type; + using iterator_category = std::forward_iterator_tag; + + constexpr view_iterator() noexcept + : it{}, + last{}, + pools{}, + filter{} {} + + view_iterator(iterator_type curr, iterator_type to, std::array all_of, std::array none_of) noexcept + : it{curr}, + last{to}, + pools{all_of}, + filter{none_of} { + while(it != last && !valid()) { + ++it; + } + } + + view_iterator &operator++() noexcept { + while(++it != last && !valid()) {} + return *this; + } + + view_iterator operator++(int) noexcept { + view_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] pointer operator->() const noexcept { + return &*it; + } + + [[nodiscard]] reference operator*() const noexcept { + return *operator->(); + } + + template + friend constexpr bool operator==(const view_iterator &, const view_iterator &) noexcept; + +private: + iterator_type it; + iterator_type last; + std::array pools; + std::array filter; +}; + +template +[[nodiscard]] constexpr bool operator==(const view_iterator &lhs, const view_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const view_iterator &lhs, const view_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +struct extended_view_iterator final { + using difference_type = std::ptrdiff_t; + using value_type = decltype(std::tuple_cat(std::make_tuple(*std::declval()), std::declval().get_as_tuple({})...)); + using pointer = input_iterator_pointer; + using reference = value_type; + using iterator_category = std::input_iterator_tag; + + constexpr extended_view_iterator() + : it{}, + pools{} {} + + extended_view_iterator(It from, std::tuple storage) + : it{from}, + pools{storage} {} + + extended_view_iterator &operator++() noexcept { + return ++it, *this; + } + + extended_view_iterator operator++(int) noexcept { + extended_view_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] reference operator*() const noexcept { + return std::apply([entt = *it](auto *...curr) { return std::tuple_cat(std::make_tuple(entt), curr->get_as_tuple(entt)...); }, pools); + } + + [[nodiscard]] pointer operator->() const noexcept { + return operator*(); + } + + template + friend bool constexpr operator==(const extended_view_iterator &, const extended_view_iterator &) noexcept; + +private: + It it; + std::tuple pools; +}; + +template +[[nodiscard]] constexpr bool operator==(const extended_view_iterator &lhs, const extended_view_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const extended_view_iterator &lhs, const extended_view_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief View implementation. + * + * Primary template isn't defined on purpose. All the specializations give a + * compile-time error, but for a few reasonable cases. + */ +template +class basic_view; + +/** + * @brief Multi component view. + * + * Multi component views iterate over those entities that are at least in the + * given storage. During initialization, a multi component view looks at the + * number of entities available for each component and uses the smallest set in + * order to get a performance boost when iterating. + * + * @b Important + * + * Iterators aren't invalidated if: + * + * * New elements are added to the storage. + * * The entity currently pointed is modified (for example, components are added + * or removed from it). + * * The entity currently pointed is destroyed. + * + * In all other cases, modifying the pools iterated by the view in any way + * invalidates all the iterators and using them results in undefined behavior. + * + * @tparam Get Types of storage iterated by the view. + * @tparam Exclude Types of storage used to filter the view. + */ +template +class basic_view, exclude_t> { + using underlying_type = std::common_type_t; + using basic_common_type = std::common_type_t; + + template + friend class basic_view; + + template + static constexpr std::size_t index_of = type_list_index_v, type_list>; + + [[nodiscard]] auto opaque_check_set() const noexcept { + std::array other{}; + std::apply([&other, pos = 0u, view = view](const auto *...curr) mutable { ((curr == view ? void() : void(other[pos++] = curr)), ...); }, pools); + return other; + } + + [[nodiscard]] auto filter_as_array() const noexcept { + return std::apply([](const auto *...curr) { return std::array{curr...}; }, filter); + } + + template + [[nodiscard]] auto dispatch_get(const std::tuple &curr) const { + if constexpr(Curr == Other) { + return std::forward_as_tuple(std::get(curr)...); + } else { + return storage().get_as_tuple(std::get<0>(curr)); + } + } + + [[nodiscard]] auto reject(const underlying_type entt) const noexcept { + return std::apply([entt](const auto *...curr) { return (curr->contains(entt) || ...); }, filter); + } + + template + void each(Func &func, std::index_sequence) const { + for(const auto curr: storage().each()) { + if(const auto entt = std::get<0>(curr); ((sizeof...(Get) != 1u) || (entt != tombstone)) && ((Curr == Index || storage().contains(entt)) && ...) && !reject(entt)) { + if constexpr(is_applicable_v{}, std::declval().get({})))>) { + std::apply(func, std::tuple_cat(std::make_tuple(entt), dispatch_get(curr)...)); + } else { + std::apply(func, std::tuple_cat(dispatch_get(curr)...)); + } + } + } + } + + template + void pick_and_each(Func &func, std::index_sequence seq) const { + ((&storage() == view ? each(func, seq) : void()), ...); + } + +public: + /*! @brief Underlying entity identifier. */ + using entity_type = underlying_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = basic_common_type; + /*! @brief Bidirectional iterator type. */ + using iterator = internal::view_iterator; + /*! @brief Iterable view type. */ + using iterable = iterable_adaptor>; + + /*! @brief Default constructor to use to create empty, invalid views. */ + basic_view() noexcept + : pools{}, + filter{}, + view{} {} + + /** + * @brief Constructs a multi-type view from a set of storage classes. + * @param value The storage for the types to iterate. + * @param exclude The storage for the types used to filter the view. + */ + basic_view(Get &...value, Exclude &...exclude) noexcept + : pools{&value...}, + filter{&exclude...}, + view{[](const base_type *first, const auto *...other) { ((first = other->size() < first->size() ? other : first), ...); return first; }(&value...)} {} + + /** + * @brief Constructs a multi-type view from a set of storage classes. + * @param value The storage for the types to iterate. + * @param exclude The storage for the types used to filter the view. + */ + basic_view(std::tuple value, std::tuple exclude = {}) noexcept + : pools{std::apply([](auto &...curr) { return std::make_tuple(&curr...); }, value)}, + filter{std::apply([](auto &...curr) { return std::make_tuple(&curr...); }, exclude)}, + view{std::apply([](const base_type *first, const auto *...other) { ((first = other->size() < first->size() ? other : first), ...); return first; }, pools)} {} + + /** + * @brief Creates a new view driven by a given component in its iterations. + * @tparam Type Type of component used to drive the iteration. + * @return A new view driven by the given component in its iterations. + */ + template + [[nodiscard]] basic_view use() const noexcept { + return use>(); + } + + /** + * @brief Creates a new view driven by a given component in its iterations. + * @tparam Index Index of the component used to drive the iteration. + * @return A new view driven by the given component in its iterations. + */ + template + [[nodiscard]] basic_view use() const noexcept { + basic_view other{*this}; + other.view = &storage(); + return other; + } + + /** + * @brief Updates the internal leading view if required. + * @return A newly created and internally optimized view. + */ + [[nodiscard]] basic_view refresh() const noexcept { + return std::apply([](auto *...elem) { return basic_view{*elem...}; }, std::tuple_cat(pools, filter)); + } + + /** + * @brief Returns the leading storage of a view. + * @return The leading storage of the view. + */ + [[nodiscard]] const base_type &handle() const noexcept { + return *view; + } + + /** + * @brief Returns the storage for a given component type. + * @tparam Comp Type of component of which to return the storage. + * @return The storage for the given component type. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return storage>(); + } + + /** + * @brief Returns the storage for a given index. + * @tparam Index Index of the storage to return. + * @return The storage for the given index. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return *std::get(pools); + } + + /** + * @brief Estimates the number of entities iterated by the view. + * @return Estimated number of entities iterated by the view. + */ + [[nodiscard]] size_type size_hint() const noexcept { + return view->size(); + } + + /** + * @brief Returns an iterator to the first entity of the view. + * + * The returned iterator points to the first entity of the view. If the view + * is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first entity of the view. + */ + [[nodiscard]] iterator begin() const noexcept { + return iterator{view->begin(), view->end(), opaque_check_set(), filter_as_array()}; + } + + /** + * @brief Returns an iterator that is past the last entity of the view. + * + * The returned iterator points to the entity following the last entity of + * the view. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the entity following the last entity of the view. + */ + [[nodiscard]] iterator end() const noexcept { + return iterator{view->end(), view->end(), opaque_check_set(), filter_as_array()}; + } + + /** + * @brief Returns the first entity of the view, if any. + * @return The first entity of the view if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type front() const noexcept { + const auto it = begin(); + return it != end() ? *it : null; + } + + /** + * @brief Returns the last entity of the view, if any. + * @return The last entity of the view if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type back() const noexcept { + auto it = view->rbegin(); + for(const auto last = view->rend(); it != last && !contains(*it); ++it) {} + return it == view->rend() ? null : *it; + } + + /** + * @brief Finds an entity. + * @param entt A valid identifier. + * @return An iterator to the given entity if it's found, past the end + * iterator otherwise. + */ + [[nodiscard]] iterator find(const entity_type entt) const noexcept { + return contains(entt) ? iterator{view->find(entt), view->end(), opaque_check_set(), filter_as_array()} : end(); + } + + /** + * @brief Returns the components assigned to the given entity. + * @param entt A valid identifier. + * @return The components assigned to the given entity. + */ + [[nodiscard]] decltype(auto) operator[](const entity_type entt) const { + return get(entt); + } + + /** + * @brief Checks if a view is properly initialized. + * @return True if the view is properly initialized, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return view != nullptr; + } + + /** + * @brief Checks if a view contains an entity. + * @param entt A valid identifier. + * @return True if the view contains the given entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const noexcept { + return std::apply([entt](const auto *...curr) { return (curr->contains(entt) && ...); }, pools) + && std::apply([entt](const auto *...curr) { return (!curr->contains(entt) && ...); }, filter); + } + + /** + * @brief Returns the components assigned to the given entity. + * + * @warning + * Attempting to use an entity that doesn't belong to the view results in + * undefined behavior. + * + * @tparam Type Types of components to get. + * @param entt A valid identifier. + * @return The components assigned to the entity. + */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + if constexpr(sizeof...(Type) == 0) { + return std::apply([entt](auto *...curr) { return std::tuple_cat(curr->get_as_tuple(entt)...); }, pools); + } else if constexpr(sizeof...(Type) == 1) { + return (storage>().get(entt), ...); + } else { + return std::tuple_cat(storage>().get_as_tuple(entt)...); + } + } + + /** + * @brief Returns the components assigned to the given entity. + * + * @warning + * Attempting to use an entity that doesn't belong to the view results in + * undefined behavior. + * + * @tparam First Index of a component to get. + * @tparam Other Indexes of other components to get. + * @param entt A valid identifier. + * @return The components assigned to the entity. + */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + if constexpr(sizeof...(Other) == 0) { + return storage().get(entt); + } else { + return std::tuple_cat(storage().get_as_tuple(entt), storage().get_as_tuple(entt)...); + } + } + + /** + * @brief Iterates entities and components and applies the given function + * object to them. + * + * The function object is invoked for each entity. It is provided with the + * entity itself and a set of references to non-empty components. The + * _constness_ of the components is as requested.
+ * The signature of the function must be equivalent to one of the following + * forms: + * + * @code{.cpp} + * void(const entity_type, Type &...); + * void(Type &...); + * @endcode + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + pick_and_each(func, std::index_sequence_for{}); + } + + /** + * @brief Returns an iterable object to use to _visit_ a view. + * + * The iterable object returns a tuple that contains the current entity and + * a set of references to its non-empty components. The _constness_ of the + * components is as requested. + * + * @return An iterable object to use to _visit_ the view. + */ + [[nodiscard]] iterable each() const noexcept { + return {internal::extended_view_iterator{begin(), pools}, internal::extended_view_iterator{end(), pools}}; + } + + /** + * @brief Combines two views in a _more specific_ one (friend function). + * @tparam OGet Component list of the view to combine with. + * @tparam OExclude Filter list of the view to combine with. + * @param other The view to combine with. + * @return A more specific view. + */ + template + [[nodiscard]] auto operator|(const basic_view, exclude_t> &other) const noexcept { + return std::make_from_tuple, exclude_t>>( + std::apply([](auto *...curr) { return std::forward_as_tuple(*curr...); }, std::tuple_cat(pools, other.pools, filter, other.filter))); + } + +private: + std::tuple pools; + std::tuple filter; + const base_type *view; +}; + +/** + * @brief Single component view specialization. + * + * Single component views are specialized in order to get a boost in terms of + * performance. This kind of views can access the underlying data structure + * directly and avoid superfluous checks. + * + * @b Important + * + * Iterators aren't invalidated if: + * + * * New elements are added to the storage. + * * The entity currently pointed is modified (for example, components are added + * or removed from it). + * * The entity currently pointed is destroyed. + * + * In all other cases, modifying the pool iterated by the view in any way + * invalidates all the iterators and using them results in undefined behavior. + * + * @tparam Get Type of storage iterated by the view. + */ +template +class basic_view, exclude_t<>, std::void_t::in_place_delete>>> { + template + friend class basic_view; + +public: + /*! @brief Underlying entity identifier. */ + using entity_type = typename Get::entity_type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Common type among all storage types. */ + using base_type = typename Get::base_type; + /*! @brief Random access iterator type. */ + using iterator = typename base_type::iterator; + /*! @brief Reversed iterator type. */ + using reverse_iterator = typename base_type::reverse_iterator; + /*! @brief Iterable view type. */ + using iterable = decltype(std::declval().each()); + + /*! @brief Default constructor to use to create empty, invalid views. */ + basic_view() noexcept + : pools{}, + filter{} {} + + /** + * @brief Constructs a single-type view from a storage class. + * @param ref The storage for the type to iterate. + */ + basic_view(Get &ref) noexcept + : pools{&ref}, + filter{} {} + + /** + * @brief Constructs a single-type view from a storage class. + * @param ref The storage for the type to iterate. + */ + basic_view(std::tuple ref, std::tuple<> = {}) noexcept + : pools{&std::get<0>(ref)}, + filter{} {} + + /** + * @brief Returns the leading storage of a view. + * @return The leading storage of the view. + */ + [[nodiscard]] const base_type &handle() const noexcept { + return storage(); + } + + /** + * @brief Returns the storage for a given component type. + * @tparam Type Type of component of which to return the storage. + * @return The storage for the given component type. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + static_assert(std::is_same_v, typename Get::value_type>, "Invalid component type"); + return storage<0>(); + } + + /** + * @brief Returns the storage for a given index. + * @tparam Index Index of the storage to return. + * @return The storage for the given index. + */ + template + [[nodiscard]] decltype(auto) storage() const noexcept { + return *std::get(pools); + } + + /** + * @brief Returns the number of entities that have the given component. + * @return Number of entities that have the given component. + */ + [[nodiscard]] size_type size() const noexcept { + return handle().size(); + } + + /** + * @brief Checks whether a view is empty. + * @return True if the view is empty, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return handle().empty(); + } + + /** + * @brief Returns an iterator to the first entity of the view. + * + * The returned iterator points to the first entity of the view. If the view + * is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first entity of the view. + */ + [[nodiscard]] iterator begin() const noexcept { + return handle().begin(); + } + + /** + * @brief Returns an iterator that is past the last entity of the view. + * + * The returned iterator points to the entity following the last entity of + * the view. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the entity following the last entity of the view. + */ + [[nodiscard]] iterator end() const noexcept { + return handle().end(); + } + + /** + * @brief Returns an iterator to the first entity of the reversed view. + * + * The returned iterator points to the first entity of the reversed view. If + * the view is empty, the returned iterator will be equal to `rend()`. + * + * @return An iterator to the first entity of the reversed view. + */ + [[nodiscard]] reverse_iterator rbegin() const noexcept { + return handle().rbegin(); + } + + /** + * @brief Returns an iterator that is past the last entity of the reversed + * view. + * + * The returned iterator points to the entity following the last entity of + * the reversed view. Attempting to dereference the returned iterator + * results in undefined behavior. + * + * @return An iterator to the entity following the last entity of the + * reversed view. + */ + [[nodiscard]] reverse_iterator rend() const noexcept { + return handle().rend(); + } + + /** + * @brief Returns the first entity of the view, if any. + * @return The first entity of the view if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type front() const noexcept { + return empty() ? null : *begin(); + } + + /** + * @brief Returns the last entity of the view, if any. + * @return The last entity of the view if one exists, the null entity + * otherwise. + */ + [[nodiscard]] entity_type back() const noexcept { + return empty() ? null : *rbegin(); + } + + /** + * @brief Finds an entity. + * @param entt A valid identifier. + * @return An iterator to the given entity if it's found, past the end + * iterator otherwise. + */ + [[nodiscard]] iterator find(const entity_type entt) const noexcept { + return contains(entt) ? handle().find(entt) : end(); + } + + /** + * @brief Returns the identifier that occupies the given position. + * @param pos Position of the element to return. + * @return The identifier that occupies the given position. + */ + [[nodiscard]] entity_type operator[](const size_type pos) const { + return begin()[pos]; + } + + /** + * @brief Returns the component assigned to the given entity. + * @param entt A valid identifier. + * @return The component assigned to the given entity. + */ + [[nodiscard]] decltype(auto) operator[](const entity_type entt) const { + return storage().get(entt); + } + + /** + * @brief Checks if a view is properly initialized. + * @return True if the view is properly initialized, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return std::get<0>(pools) != nullptr; + } + + /** + * @brief Checks if a view contains an entity. + * @param entt A valid identifier. + * @return True if the view contains the given entity, false otherwise. + */ + [[nodiscard]] bool contains(const entity_type entt) const noexcept { + return handle().contains(entt); + } + + /** + * @brief Returns the component assigned to the given entity. + * + * @warning + * Attempting to use an entity that doesn't belong to the view results in + * undefined behavior. + * + * @tparam Type Type or index of the component to get. + * @param entt A valid identifier. + * @return The component assigned to the entity. + */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + if constexpr(sizeof...(Type) == 0) { + return storage().get_as_tuple(entt); + } else { + static_assert((std::is_same_v, typename Get::value_type> && ...), "Invalid component type"); + return storage().get(entt); + } + } + + /*! @copydoc get */ + template + [[nodiscard]] decltype(auto) get(const entity_type entt) const { + return storage().get(entt); + } + + /** + * @brief Iterates entities and components and applies the given function + * object to them. + * + * The function object is invoked for each entity. It is provided with the + * entity itself and a reference to the component if it's a non-empty one. + * The _constness_ of the component is as requested.
+ * The signature of the function must be equivalent to one of the following + * forms: + * + * @code{.cpp} + * void(const entity_type, Type &); + * void(typename Type &); + * @endcode + * + * @note + * Empty types aren't explicitly instantiated and therefore they are never + * returned during iterations. + * + * @tparam Func Type of the function object to invoke. + * @param func A valid function object. + */ + template + void each(Func func) const { + if constexpr(is_applicable_v) { + for(const auto pack: each()) { + std::apply(func, pack); + } + } else if constexpr(ignore_as_empty_v) { + for(size_type pos{}, last = size(); pos < last; ++pos) { + func(); + } + } else { + for(auto &&component: storage()) { + func(component); + } + } + } + + /** + * @brief Returns an iterable object to use to _visit_ a view. + * + * The iterable object returns a tuple that contains the current entity and + * a reference to its component if it's a non-empty one. The _constness_ of + * the component is as requested. + * + * @return An iterable object to use to _visit_ the view. + */ + [[nodiscard]] iterable each() const noexcept { + return storage().each(); + } + + /** + * @brief Combines two views in a _more specific_ one (friend function). + * @tparam OGet Component list of the view to combine with. + * @tparam OExclude Filter list of the view to combine with. + * @param other The view to combine with. + * @return A more specific view. + */ + template + [[nodiscard]] auto operator|(const basic_view, exclude_t> &other) const noexcept { + return std::make_from_tuple, exclude_t>>( + std::apply([](auto *...curr) { return std::forward_as_tuple(*curr...); }, std::tuple_cat(pools, other.pools, other.filter))); + } + +private: + std::tuple pools; + std::tuple<> filter; +}; + +/** + * @brief Deduction guide. + * @tparam Type Type of storage classes used to create the view. + * @param storage The storage for the types to iterate. + */ +template +basic_view(Type &...storage) -> basic_view, exclude_t<>>; + +/** + * @brief Deduction guide. + * @tparam Get Types of components iterated by the view. + * @tparam Exclude Types of components used to filter the view. + */ +template +basic_view(std::tuple, std::tuple = {}) -> basic_view, exclude_t>; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/entt.hpp b/LiteLoader/third-party/include/entt/entt.hpp similarity index 73% rename from LiteLoader/Header/third-party/entt/entt.hpp rename to LiteLoader/third-party/include/entt/entt.hpp index 5248169..3544fb6 100644 --- a/LiteLoader/Header/third-party/entt/entt.hpp +++ b/LiteLoader/third-party/include/entt/entt.hpp @@ -1,11 +1,21 @@ +// IWYU pragma: begin_exports +#include "config/config.h" +#include "config/macro.h" #include "config/version.h" +#include "container/dense_map.hpp" +#include "container/dense_set.hpp" #include "core/algorithm.hpp" #include "core/any.hpp" #include "core/attribute.h" +#include "core/compressed_pair.hpp" +#include "core/enum.hpp" #include "core/family.hpp" #include "core/hashed_string.hpp" #include "core/ident.hpp" +#include "core/iterator.hpp" +#include "core/memory.hpp" #include "core/monostate.hpp" +#include "core/tuple.hpp" #include "core/type_info.hpp" #include "core/type_traits.hpp" #include "core/utility.hpp" @@ -16,18 +26,20 @@ #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/storage_mixin.hpp" #include "entity/view.hpp" +#include "graph/adjacency_matrix.hpp" +#include "graph/dot.hpp" +#include "graph/flow.hpp" #include "locator/locator.hpp" #include "meta/adl_pointer.hpp" #include "meta/container.hpp" -#include "meta/ctx.hpp" +#include "meta/context.hpp" #include "meta/factory.hpp" #include "meta/meta.hpp" #include "meta/node.hpp" @@ -43,9 +55,10 @@ #include "process/process.hpp" #include "process/scheduler.hpp" #include "resource/cache.hpp" -#include "resource/handle.hpp" #include "resource/loader.hpp" +#include "resource/resource.hpp" #include "signal/delegate.hpp" #include "signal/dispatcher.hpp" #include "signal/emitter.hpp" #include "signal/sigh.hpp" +// IWYU pragma: end_exports diff --git a/LiteLoader/third-party/include/entt/fwd.hpp b/LiteLoader/third-party/include/entt/fwd.hpp new file mode 100644 index 0000000..4b6e60c --- /dev/null +++ b/LiteLoader/third-party/include/entt/fwd.hpp @@ -0,0 +1,11 @@ +// IWYU pragma: begin_exports +#include "container/fwd.hpp" +#include "core/fwd.hpp" +#include "entity/fwd.hpp" +#include "graph/fwd.hpp" +#include "meta/fwd.hpp" +#include "poly/fwd.hpp" +#include "process/fwd.hpp" +#include "resource/fwd.hpp" +#include "signal/fwd.hpp" +// IWYU pragma: end_exports diff --git a/LiteLoader/third-party/include/entt/graph/adjacency_matrix.hpp b/LiteLoader/third-party/include/entt/graph/adjacency_matrix.hpp new file mode 100644 index 0000000..b0b0e25 --- /dev/null +++ b/LiteLoader/third-party/include/entt/graph/adjacency_matrix.hpp @@ -0,0 +1,348 @@ +#ifndef ENTT_GRAPH_ADJACENCY_MATRIX_HPP +#define ENTT_GRAPH_ADJACENCY_MATRIX_HPP + +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/iterator.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class edge_iterator { + using size_type = std::size_t; + +public: + using value_type = std::pair; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr edge_iterator() noexcept + : it{}, + vert{}, + pos{}, + last{}, + offset{} {} + + constexpr edge_iterator(It base, const size_type vertices, const size_type from, const size_type to, const size_type step) noexcept + : it{std::move(base)}, + vert{vertices}, + pos{from}, + last{to}, + offset{step} { + for(; pos != last && !it[pos]; pos += offset) {} + } + + constexpr edge_iterator &operator++() noexcept { + for(pos += offset; pos != last && !it[pos]; pos += offset) {} + return *this; + } + + constexpr edge_iterator operator++(int) noexcept { + edge_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return *operator->(); + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return std::make_pair(pos / vert, pos % vert); + } + + template + friend constexpr bool operator==(const edge_iterator &, const edge_iterator &) noexcept; + +private: + It it; + size_type vert; + size_type pos; + size_type last; + size_type offset{}; +}; + +template +[[nodiscard]] inline constexpr bool operator==(const edge_iterator &lhs, const edge_iterator &rhs) noexcept { + return lhs.pos == rhs.pos; +} + +template +[[nodiscard]] inline constexpr bool operator!=(const edge_iterator &lhs, const edge_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Basic implementation of a directed adjacency matrix. + * @tparam Category Either a directed or undirected category tag. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class adjacency_matrix { + using alloc_traits = std::allocator_traits; + static_assert(std::is_base_of_v, "Invalid graph category"); + static_assert(std::is_same_v, "Invalid value type"); + using container_type = std::vector>; + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Vertex type. */ + using vertex_type = size_type; + /*! @brief Edge type. */ + using edge_type = std::pair; + /*! @brief Vertex iterator type. */ + using vertex_iterator = iota_iterator; + /*! @brief Edge iterator type. */ + using edge_iterator = internal::edge_iterator; + /*! @brief Out edge iterator type. */ + using out_edge_iterator = edge_iterator; + /*! @brief In edge iterator type. */ + using in_edge_iterator = edge_iterator; + /*! @brief Graph category tag. */ + using graph_category = Category; + + /*! @brief Default constructor. */ + adjacency_matrix() noexcept(noexcept(allocator_type{})) + : adjacency_matrix{0u} {} + + /** + * @brief Constructs an empty container with a given allocator. + * @param allocator The allocator to use. + */ + explicit adjacency_matrix(const allocator_type &allocator) noexcept + : adjacency_matrix{0u, allocator} {} + + /** + * @brief Constructs an empty container with a given allocator and user + * supplied number of vertices. + * @param vertices Number of vertices. + * @param allocator The allocator to use. + */ + adjacency_matrix(const size_type vertices, const allocator_type &allocator = allocator_type{}) + : matrix{vertices * vertices, allocator}, + vert{vertices} {} + + /** + * @brief Copy constructor. + * @param other The instance to copy from. + */ + adjacency_matrix(const adjacency_matrix &other) + : adjacency_matrix{other, other.get_allocator()} {} + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + adjacency_matrix(const adjacency_matrix &other, const allocator_type &allocator) + : matrix{other.matrix, allocator}, + vert{other.vert} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + adjacency_matrix(adjacency_matrix &&other) noexcept + : adjacency_matrix{std::move(other), other.get_allocator()} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + adjacency_matrix(adjacency_matrix &&other, const allocator_type &allocator) + : matrix{std::move(other.matrix), allocator}, + vert{std::exchange(other.vert, 0u)} {} + + /** + * @brief Default copy assignment operator. + * @param other The instance to copy from. + * @return This container. + */ + adjacency_matrix &operator=(const adjacency_matrix &other) { + matrix = other.matrix; + vert = other.vert; + return *this; + } + + /** + * @brief Default move assignment operator. + * @param other The instance to move from. + * @return This container. + */ + adjacency_matrix &operator=(adjacency_matrix &&other) noexcept { + matrix = std::move(other.matrix); + vert = std::exchange(other.vert, 0u); + return *this; + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return matrix.get_allocator(); + } + + /*! @brief Clears the adjacency matrix. */ + void clear() noexcept { + matrix.clear(); + vert = {}; + } + + /** + * @brief Exchanges the contents with those of a given adjacency matrix. + * @param other Adjacency matrix to exchange the content with. + */ + void swap(adjacency_matrix &other) { + using std::swap; + swap(matrix, other.matrix); + swap(vert, other.vert); + } + + /** + * @brief Returns the number of vertices. + * @return The number of vertices. + */ + [[nodiscard]] size_type size() const noexcept { + return vert; + } + + /** + * @brief Returns an iterable object to visit all vertices of a matrix. + * @return An iterable object to visit all vertices of a matrix. + */ + [[nodiscard]] iterable_adaptor vertices() const noexcept { + return {0u, vert}; + } + + /** + * @brief Returns an iterable object to visit all edges of a matrix. + * @return An iterable object to visit all edges of a matrix. + */ + [[nodiscard]] iterable_adaptor edges() const noexcept { + const auto it = matrix.cbegin(); + const auto sz = matrix.size(); + return {{it, vert, 0u, sz, 1u}, {it, vert, sz, sz, 1u}}; + } + + /** + * @brief Returns an iterable object to visit all out edges of a vertex. + * @param vertex The vertex of which to return all out edges. + * @return An iterable object to visit all out edges of a vertex. + */ + [[nodiscard]] iterable_adaptor out_edges(const vertex_type vertex) const noexcept { + const auto it = matrix.cbegin(); + const auto from = vertex * vert; + const auto to = vertex * vert + vert; + return {{it, vert, from, to, 1u}, {it, vert, to, to, 1u}}; + } + + /** + * @brief Returns an iterable object to visit all in edges of a vertex. + * @param vertex The vertex of which to return all in edges. + * @return An iterable object to visit all in edges of a vertex. + */ + [[nodiscard]] iterable_adaptor in_edges(const vertex_type vertex) const noexcept { + const auto it = matrix.cbegin(); + const auto from = vertex; + const auto to = vert * (vert - 1u) + vertex; + return {{it, vert, from, to, vert}, {it, vert, to, to, vert}}; + } + + /** + * @brief Resizes an adjacency matrix. + * @param vertices The new number of vertices. + */ + void resize(const size_type vertices) { + adjacency_matrix other{vertices, get_allocator()}; + + for(auto [lhs, rhs]: edges()) { + other.insert(lhs, rhs); + } + + other.swap(*this); + } + + /** + * @brief Inserts an edge into the adjacency matrix, if it does not exist. + * @param lhs The left hand vertex of the edge. + * @param rhs The right hand vertex of the edge. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + std::pair insert(const vertex_type lhs, const vertex_type rhs) { + const auto pos = lhs * vert + rhs; + + if constexpr(std::is_same_v) { + const auto rev = rhs * vert + lhs; + ENTT_ASSERT(matrix[pos] == matrix[rev], "Something went really wrong"); + matrix[rev] = 1u; + } + + const auto inserted = !std::exchange(matrix[pos], 1u); + return {edge_iterator{matrix.cbegin(), vert, pos, matrix.size(), 1u}, inserted}; + } + + /** + * @brief Removes the edge associated with a pair of given vertices. + * @param lhs The left hand vertex of the edge. + * @param rhs The right hand vertex of the edge. + * @return Number of elements removed (either 0 or 1). + */ + size_type erase(const vertex_type lhs, const vertex_type rhs) { + const auto pos = lhs * vert + rhs; + + if constexpr(std::is_same_v) { + const auto rev = rhs * vert + lhs; + ENTT_ASSERT(matrix[pos] == matrix[rev], "Something went really wrong"); + matrix[rev] = 0u; + } + + return std::exchange(matrix[pos], 0u); + } + + /** + * @brief Checks if an adjacency matrix contains a given edge. + * @param lhs The left hand vertex of the edge. + * @param rhs The right hand vertex of the edge. + * @return True if there is such an edge, false otherwise. + */ + [[nodiscard]] bool contains(const vertex_type lhs, const vertex_type rhs) const { + const auto pos = lhs * vert + rhs; + return pos < matrix.size() && matrix[pos]; + } + +private: + container_type matrix; + size_type vert; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/graph/dot.hpp b/LiteLoader/third-party/include/entt/graph/dot.hpp new file mode 100644 index 0000000..1da13e8 --- /dev/null +++ b/LiteLoader/third-party/include/entt/graph/dot.hpp @@ -0,0 +1,58 @@ +#ifndef ENTT_GRAPH_DOT_HPP +#define ENTT_GRAPH_DOT_HPP + +#include +#include +#include "fwd.hpp" + +namespace entt { + +/** + * @brief Outputs a graph in dot format. + * @tparam Graph Graph type, valid as long as it exposes edges and vertices. + * @tparam Writer Vertex decorator type. + * @param out A standard output stream. + * @param graph The graph to output. + * @param writer Vertex decorator object. + */ +template +void dot(std::ostream &out, const Graph &graph, Writer writer) { + static_assert(std::is_base_of_v, "Invalid graph category"); + + if constexpr(std::is_same_v) { + out << "graph{"; + } else { + out << "digraph{"; + } + + for(auto &&vertex: graph.vertices()) { + out << vertex << "["; + writer(out, vertex); + out << "];"; + } + + for(auto [lhs, rhs]: graph.edges()) { + if constexpr(std::is_same_v) { + out << lhs << "--" << rhs << ";"; + } else { + out << lhs << "->" << rhs << ";"; + } + } + + out << "}"; +} + +/** + * @brief Outputs a graph in dot format. + * @tparam Graph Graph type, valid as long as it exposes edges and vertices. + * @param out A standard output stream. + * @param graph The graph to output. + */ +template +void dot(std::ostream &out, const Graph &graph) { + return dot(out, graph, [](auto &&...) {}); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/graph/flow.hpp b/LiteLoader/third-party/include/entt/graph/flow.hpp new file mode 100644 index 0000000..d121f50 --- /dev/null +++ b/LiteLoader/third-party/include/entt/graph/flow.hpp @@ -0,0 +1,327 @@ +#ifndef ENTT_GRAPH_FLOW_HPP +#define ENTT_GRAPH_FLOW_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../container/dense_map.hpp" +#include "../container/dense_set.hpp" +#include "../core/compressed_pair.hpp" +#include "../core/fwd.hpp" +#include "../core/iterator.hpp" +#include "../core/utility.hpp" +#include "adjacency_matrix.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @brief Utility class for creating task graphs. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_flow { + using alloc_traits = std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using task_container_type = dense_set, typename alloc_traits::template rebind_alloc>; + using ro_rw_container_type = std::vector, typename alloc_traits::template rebind_alloc>>; + using deps_container_type = dense_map, typename alloc_traits::template rebind_alloc>>; + + void emplace(const id_type res, const bool is_rw) { + ENTT_ASSERT(index.first() < vertices.size(), "Invalid node"); + + if(!deps.contains(res) && sync_on != vertices.size()) { + deps[res].emplace_back(sync_on, true); + } + + deps[res].emplace_back(index.first(), is_rw); + } + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Iterable task list. */ + using iterable = iterable_adaptor; + + /*! @brief Default constructor. */ + basic_flow() + : basic_flow{allocator_type{}} {} + + /** + * @brief Constructs a flow builder with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_flow(const allocator_type &allocator) + : index{0u, allocator}, + vertices{}, + deps{}, + sync_on{} {} + + /*! @brief Default copy constructor. */ + basic_flow(const basic_flow &) = default; + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + basic_flow(const basic_flow &other, const allocator_type &allocator) + : index{other.index.first(), allocator}, + vertices{other.vertices, allocator}, + deps{other.deps, allocator}, + sync_on{other.sync_on} {} + + /*! @brief Default move constructor. */ + basic_flow(basic_flow &&) noexcept = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_flow(basic_flow &&other, const allocator_type &allocator) + : index{other.index.first(), allocator}, + vertices{std::move(other.vertices), allocator}, + deps{std::move(other.deps), allocator}, + sync_on{other.sync_on} {} + + /** + * @brief Default copy assignment operator. + * @return This flow builder. + */ + basic_flow &operator=(const basic_flow &) = default; + + /** + * @brief Default move assignment operator. + * @return This flow builder. + */ + basic_flow &operator=(basic_flow &&) noexcept = default; + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return allocator_type{index.second()}; + } + + /** + * @brief Returns the identifier at specified location. + * @param pos Position of the identifier to return. + * @return The requested identifier. + */ + [[nodiscard]] id_type operator[](const size_type pos) const { + return vertices.cbegin()[pos]; + } + + /*! @brief Clears the flow builder. */ + void clear() noexcept { + index.first() = sync_on = {}; + vertices.clear(); + deps.clear(); + } + + /** + * @brief Exchanges the contents with those of a given flow builder. + * @param other Flow builder to exchange the content with. + */ + void swap(basic_flow &other) { + using std::swap; + std::swap(index, other.index); + std::swap(vertices, other.vertices); + std::swap(deps, other.deps); + std::swap(sync_on, other.sync_on); + } + + /** + * @brief Returns the number of tasks. + * @return The number of tasks. + */ + [[nodiscard]] size_type size() const noexcept { + return vertices.size(); + } + + /** + * @brief Binds a task to a flow builder. + * @param value Task identifier. + * @return This flow builder. + */ + basic_flow &bind(const id_type value) { + sync_on += (sync_on == vertices.size()); + const auto it = vertices.emplace(value).first; + index.first() = size_type(it - vertices.begin()); + return *this; + } + + /** + * @brief Turns the current task into a sync point. + * @return This flow builder. + */ + basic_flow &sync() { + ENTT_ASSERT(index.first() < vertices.size(), "Invalid node"); + sync_on = index.first(); + + for(const auto &elem: deps) { + elem.second.emplace_back(sync_on, true); + } + + return *this; + } + + /** + * @brief Assigns a resource to the current task with a given access mode. + * @param res Resource identifier. + * @param is_rw Access mode. + * @return This flow builder. + */ + basic_flow &set(const id_type res, bool is_rw = false) { + emplace(res, is_rw); + return *this; + } + + /** + * @brief Assigns a read-only resource to the current task. + * @param res Resource identifier. + * @return This flow builder. + */ + basic_flow &ro(const id_type res) { + emplace(res, false); + return *this; + } + + /** + * @brief Assigns a range of read-only resources to the current task. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + * @return This flow builder. + */ + template + std::enable_if_t::value_type>, id_type>, basic_flow &> + ro(It first, It last) { + for(; first != last; ++first) { + emplace(*first, false); + } + + return *this; + } + + /** + * @brief Assigns a writable resource to the current task. + * @param res Resource identifier. + * @return This flow builder. + */ + basic_flow &rw(const id_type res) { + emplace(res, true); + return *this; + } + + /** + * @brief Assigns a range of writable resources to the current task. + * @tparam It Type of input iterator. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + * @return This flow builder. + */ + template + std::enable_if_t::value_type>, id_type>, basic_flow &> + rw(It first, It last) { + for(; first != last; ++first) { + emplace(*first, true); + } + + return *this; + } + + /** + * @brief Generates a task graph for the current content. + * @return The adjacency matrix of the task graph. + */ + [[nodiscard]] adjacency_matrix graph() const { + const auto length = vertices.size(); + adjacency_matrix matrix{length}; + + // creates the adjacency matrix + for(const auto &elem: deps) { + const auto last = elem.second.cend(); + auto it = elem.second.cbegin(); + + while(it != last) { + if(it->second) { + // rw item + if(auto curr = it++; it != last) { + if(it->second) { + matrix.insert(curr->first, it->first); + } else if(const auto next = std::find_if(it, last, [](const auto &value) { return value.second; }); next != last) { + for(; it != next; ++it) { + matrix.insert(curr->first, it->first); + matrix.insert(it->first, next->first); + } + } else { + for(; it != next; ++it) { + matrix.insert(curr->first, it->first); + } + } + } + } else { + // ro item (first iteration only) + if(const auto next = std::find_if(it, last, [](const auto &value) { return value.second; }); next != last) { + for(; it != next; ++it) { + matrix.insert(it->first, next->first); + } + } else { + it = last; + } + } + } + } + + // computes the transitive closure + for(std::size_t vk{}; vk < length; ++vk) { + for(std::size_t vi{}; vi < length; ++vi) { + for(std::size_t vj{}; vj < length; ++vj) { + if(matrix.contains(vi, vk) && matrix.contains(vk, vj)) { + matrix.insert(vi, vj); + } + } + } + } + + // applies the transitive reduction + for(std::size_t vert{}; vert < length; ++vert) { + matrix.erase(vert, vert); + } + + for(std::size_t vj{}; vj < length; ++vj) { + for(std::size_t vi{}; vi < length; ++vi) { + if(matrix.contains(vi, vj)) { + for(std::size_t vk{}; vk < length; ++vk) { + if(matrix.contains(vj, vk)) { + matrix.erase(vi, vk); + } + } + } + } + } + + return matrix; + } + +private: + compressed_pair index; + task_container_type vertices; + deps_container_type deps; + size_type sync_on; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/graph/fwd.hpp b/LiteLoader/third-party/include/entt/graph/fwd.hpp new file mode 100644 index 0000000..963082f --- /dev/null +++ b/LiteLoader/third-party/include/entt/graph/fwd.hpp @@ -0,0 +1,27 @@ +#ifndef ENTT_GRAPH_FWD_HPP +#define ENTT_GRAPH_FWD_HPP + +#include +#include +#include "../core/fwd.hpp" + +namespace entt { + +/*! @brief Undirected graph category tag. */ +struct directed_tag {}; + +/*! @brief Directed graph category tag. */ +struct undirected_tag: directed_tag {}; + +template> +class adjacency_matrix; + +template> +class basic_flow; + +/*! @brief Alias declaration for the most common use case. */ +using flow = basic_flow<>; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/locator/locator.hpp b/LiteLoader/third-party/include/entt/locator/locator.hpp new file mode 100644 index 0000000..e33377a --- /dev/null +++ b/LiteLoader/third-party/include/entt/locator/locator.hpp @@ -0,0 +1,135 @@ +#ifndef ENTT_LOCATOR_LOCATOR_HPP +#define ENTT_LOCATOR_LOCATOR_HPP + +#include +#include +#include "../config/config.h" + +namespace entt { + +/** + * @brief Service locator, nothing more. + * + * A service locator is used to do what it promises: locate services.
+ * Usually service locators are tightly bound to the services they expose and + * thus it's hard to define a general purpose class to do that. This tiny class + * tries to fill the gap and to get rid of the burden of defining a different + * specific locator for each application. + * + * @note + * Users shouldn't retain references to a service. The recommended way is to + * retrieve the service implementation currently set each and every time the + * need for it arises. The risk is to incur in unexpected behaviors otherwise. + * + * @tparam Service Service type. + */ +template +class locator final { + class service_handle { + friend class locator; + std::shared_ptr value{}; + }; + +public: + /*! @brief Service type. */ + using type = Service; + /*! @brief Service node type. */ + using node_type = service_handle; + + /*! @brief Default constructor, deleted on purpose. */ + locator() = delete; + /*! @brief Default destructor, deleted on purpose. */ + ~locator() = delete; + + /** + * @brief Checks whether a service locator contains a value. + * @return True if the service locator contains a value, false otherwise. + */ + [[nodiscard]] static bool has_value() noexcept { + return (service != nullptr); + } + + /** + * @brief Returns a reference to a valid service, if any. + * + * @warning + * Invoking this function can result in undefined behavior if the service + * hasn't been set yet. + * + * @return A reference to the service currently set, if any. + */ + [[nodiscard]] static Service &value() noexcept { + ENTT_ASSERT(has_value(), "Service not available"); + return *service; + } + + /** + * @brief Returns a service if available or sets it from a fallback type. + * + * Arguments are used only if a service doesn't already exist. In all other + * cases, they are discarded. + * + * @tparam Args Types of arguments to use to construct the fallback service. + * @tparam Impl Fallback service type. + * @param args Parameters to use to construct the fallback service. + * @return A reference to a valid service. + */ + template + [[nodiscard]] static Service &value_or(Args &&...args) { + return service ? *service : emplace(std::forward(args)...); + } + + /** + * @brief Sets or replaces a service. + * @tparam Impl Service type. + * @tparam Args Types of arguments to use to construct the service. + * @param args Parameters to use to construct the service. + * @return A reference to a valid service. + */ + template + static Service &emplace(Args &&...args) { + service = std::make_shared(std::forward(args)...); + return *service; + } + + /** + * @brief Sets or replaces a service using a given allocator. + * @tparam Impl Service type. + * @tparam Allocator Type of allocator used to manage memory and elements. + * @tparam Args Types of arguments to use to construct the service. + * @param alloc The allocator to use. + * @param args Parameters to use to construct the service. + * @return A reference to a valid service. + */ + template + static Service &allocate_emplace(Allocator alloc, Args &&...args) { + service = std::allocate_shared(alloc, std::forward(args)...); + return *service; + } + + /** + * @brief Returns a handle to the underlying service. + * @return A handle to the underlying service. + */ + static node_type handle() noexcept { + node_type node{}; + node.value = service; + return node; + } + + /** + * @brief Resets or replaces a service. + * @param other Optional handle with which to replace the service. + */ + static void reset(const node_type &other = {}) noexcept { + service = other.value; + } + +private: + // std::shared_ptr because of its type erased allocator which is useful here + inline static std::shared_ptr service{}; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/meta/adl_pointer.hpp b/LiteLoader/third-party/include/entt/meta/adl_pointer.hpp similarity index 97% rename from LiteLoader/Header/third-party/entt/meta/adl_pointer.hpp rename to LiteLoader/third-party/include/entt/meta/adl_pointer.hpp index 39e747b..5bb768a 100644 --- a/LiteLoader/Header/third-party/entt/meta/adl_pointer.hpp +++ b/LiteLoader/third-party/include/entt/meta/adl_pointer.hpp @@ -1,10 +1,8 @@ #ifndef ENTT_META_ADL_POINTER_HPP #define ENTT_META_ADL_POINTER_HPP - namespace entt { - /** * @brief ADL based lookup function for dereferencing meta pointer-like types. * @tparam Type Element type. @@ -16,7 +14,6 @@ decltype(auto) dereference_meta_pointer_like(const Type &value) { return *value; } - /** * @brief Fake ADL based lookup function for meta pointer-like types. * @tparam Type Element type. @@ -33,8 +30,6 @@ struct adl_meta_pointer_like { } }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/meta/container.hpp b/LiteLoader/third-party/include/entt/meta/container.hpp new file mode 100644 index 0000000..dc8a173 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/container.hpp @@ -0,0 +1,247 @@ +#ifndef ENTT_META_CONTAINER_HPP +#define ENTT_META_CONTAINER_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../container/dense_map.hpp" +#include "../container/dense_set.hpp" +#include "context.hpp" +#include "meta.hpp" +#include "type_traits.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct is_dynamic_sequence_container: std::false_type {}; + +template +struct is_dynamic_sequence_container>: std::true_type {}; + +template +struct is_key_only_meta_associative_container: std::true_type {}; + +template +struct is_key_only_meta_associative_container>: std::false_type {}; + +template +struct basic_meta_sequence_container_traits { + using iterator = meta_sequence_container::iterator; + using size_type = std::size_t; + + [[nodiscard]] static size_type size(const any &container) noexcept { + return any_cast(container).size(); + } + + [[nodiscard]] static bool resize([[maybe_unused]] any &container, [[maybe_unused]] size_type sz) { + if constexpr(is_dynamic_sequence_container::value) { + if(auto *const cont = any_cast(&container); cont) { + cont->resize(sz); + return true; + } + } + + return false; + } + + [[nodiscard]] static iterator iter(const meta_ctx &ctx, any &container, const bool as_end) { + if(auto *const cont = any_cast(&container); cont) { + return iterator{ctx, as_end ? cont->end() : cont->begin()}; + } + + const Type &as_const = any_cast(container); + return iterator{ctx, as_end ? as_const.end() : as_const.begin()}; + } + + [[nodiscard]] static iterator insert_or_erase([[maybe_unused]] const meta_ctx &ctx, [[maybe_unused]] any &container, [[maybe_unused]] const any &handle, [[maybe_unused]] meta_any &value) { + if constexpr(is_dynamic_sequence_container::value) { + if(auto *const cont = any_cast(&container); cont) { + typename Type::const_iterator it{}; + + if(auto *non_const = any_cast(&handle); non_const) { + it = *non_const; + } else { + it = any_cast(handle); + } + + if(value) { + // this abomination is necessary because only on macos value_type and const_reference are different types for std::vector + if(value.allow_cast() || value.allow_cast()) { + const auto *element = value.try_cast>(); + return iterator{ctx, cont->insert(it, element ? *element : value.cast())}; + } + } else { + return iterator{ctx, cont->erase(it)}; + } + } + } + + return iterator{}; + } +}; + +template +struct basic_meta_associative_container_traits { + using iterator = meta_associative_container::iterator; + using size_type = std::size_t; + + static constexpr auto key_only = is_key_only_meta_associative_container::value; + + [[nodiscard]] static size_type size(const any &container) noexcept { + return any_cast(container).size(); + } + + [[nodiscard]] static bool clear(any &container) { + if(auto *const cont = any_cast(&container); cont) { + cont->clear(); + return true; + } + + return false; + } + + [[nodiscard]] static iterator iter(const meta_ctx &ctx, any &container, const bool as_end) { + if(auto *const cont = any_cast(&container); cont) { + return iterator{ctx, std::bool_constant{}, as_end ? cont->end() : cont->begin()}; + } + + const auto &as_const = any_cast(container); + return iterator{ctx, std::bool_constant{}, as_end ? as_const.end() : as_const.begin()}; + } + + [[nodiscard]] static size_type insert_or_erase(any &container, meta_any &key, meta_any &value) { + if(auto *const cont = any_cast(&container); cont && key.allow_cast()) { + if(value) { + if constexpr(key_only) { + return cont->insert(key.cast()).second; + } else { + return value.allow_cast() && cont->emplace(key.cast(), value.cast()).second; + } + } else { + return cont->erase(key.cast()); + } + } + + return 0u; + } + + [[nodiscard]] static iterator find(const meta_ctx &ctx, any &container, meta_any &key) { + if(key.allow_cast()) { + if(auto *const cont = any_cast(&container); cont) { + return iterator{ctx, std::bool_constant{}, cont->find(key.cast())}; + } + + return iterator{ctx, std::bool_constant{}, any_cast(container).find(key.cast())}; + } + + return iterator{}; + } +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Meta sequence container traits for `std::vector`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_sequence_container_traits> + : internal::basic_meta_sequence_container_traits> {}; + +/** + * @brief Meta sequence container traits for `std::array`s of any type. + * @tparam Type Template arguments for the container. + * @tparam N Template arguments for the container. + */ +template +struct meta_sequence_container_traits> + : internal::basic_meta_sequence_container_traits> {}; + +/** + * @brief Meta sequence container traits for `std::list`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_sequence_container_traits> + : internal::basic_meta_sequence_container_traits> {}; + +/** + * @brief Meta sequence container traits for `std::deque`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_sequence_container_traits> + : internal::basic_meta_sequence_container_traits> {}; + +/** + * @brief Meta associative container traits for `std::map`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +/** + * @brief Meta associative container traits for `std::unordered_map`s of any + * type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +/** + * @brief Meta associative container traits for `std::set`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +/** + * @brief Meta associative container traits for `std::unordered_set`s of any + * type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +/** + * @brief Meta associative container traits for `dense_map`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +/** + * @brief Meta associative container traits for `dense_set`s of any type. + * @tparam Args Template arguments for the container. + */ +template +struct meta_associative_container_traits> + : internal::basic_meta_associative_container_traits> {}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/context.hpp b/LiteLoader/third-party/include/entt/meta/context.hpp new file mode 100644 index 0000000..d9ea622 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/context.hpp @@ -0,0 +1,67 @@ +#ifndef ENTT_META_CTX_HPP +#define ENTT_META_CTX_HPP + +#include "../container/dense_map.hpp" +#include "../core/fwd.hpp" +#include "../core/utility.hpp" + +namespace entt { + +class meta_ctx; + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +struct meta_type_node; + +struct meta_context { + dense_map value{}; + + static inline meta_context &from(meta_ctx &ctx); + static inline const meta_context &from(const meta_ctx &ctx); +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/*! @brief Disambiguation tag for constructors and the like. */ +class meta_ctx_arg_t final {}; + +/*! @brief Constant of type meta_context_arg_t used to disambiguate calls. */ +inline constexpr meta_ctx_arg_t meta_ctx_arg{}; + +/*! @brief Opaque meta context type. */ +class meta_ctx: private internal::meta_context { + /*! @brief Attorney idiom like model to access the base class. */ + friend struct internal::meta_context; +}; + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +inline internal::meta_context &internal::meta_context::from(meta_ctx &ctx) { + return ctx; +} + +inline const internal::meta_context &internal::meta_context::from(const meta_ctx &ctx) { + return ctx; +} + +/** + * Internal details not to be documented. + * @endcond + */ + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/factory.hpp b/LiteLoader/third-party/include/entt/meta/factory.hpp new file mode 100644 index 0000000..b548ec8 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/factory.hpp @@ -0,0 +1,643 @@ +#ifndef ENTT_META_FACTORY_HPP +#define ENTT_META_FACTORY_HPP + +#include +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/fwd.hpp" +#include "../core/type_info.hpp" +#include "../core/type_traits.hpp" +#include "../locator/locator.hpp" +#include "context.hpp" +#include "meta.hpp" +#include "node.hpp" +#include "policy.hpp" +#include "range.hpp" +#include "resolve.hpp" +#include "utility.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +inline decltype(auto) owner(meta_ctx &ctx, const type_info &info) { + auto &&context = internal::meta_context::from(ctx); + ENTT_ASSERT(context.value.contains(info.hash()), "Type not available"); + return context.value[info.hash()]; +} + +inline meta_base_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_base_node node) { + return parent.details->base.insert_or_assign(id, std::move(node)).first->second; +} + +inline meta_conv_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_conv_node node) { + return parent.details->conv.insert_or_assign(id, std::move(node)).first->second; +} + +inline meta_ctor_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_ctor_node node) { + return parent.details->ctor.insert_or_assign(id, std::move(node)).first->second; +} + +inline meta_dtor_node &meta_extend(internal::meta_type_node &parent, meta_dtor_node node) { + return (parent.dtor = std::move(node)); +} + +inline meta_data_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_data_node node) { + return parent.details->data.insert_or_assign(id, std::move(node)).first->second; +} + +inline meta_func_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_func_node node) { + if(auto it = parent.details->func.find(id); it != parent.details->func.end()) { + for(auto *curr = &it->second; curr; curr = curr->next.get()) { + if(curr->invoke == node.invoke) { + node.next = std::move(curr->next); + *curr = std::move(node); + return *curr; + } + } + + // locally overloaded function + node.next = std::make_shared(std::move(parent.details->func[id])); + } + + return parent.details->func.insert_or_assign(id, std::move(node)).first->second; +} + +inline meta_prop_node &meta_extend(dense_map &prop, const id_type id, meta_prop_node node) { + return (prop[id] = std::move(node)); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Basic meta factory to be used for reflection purposes. + * @tparam Type Reflected type for which the factory was created. + */ +template +class meta_factory { + template + void data(const id_type id, std::index_sequence) noexcept { + using data_type = std::invoke_result_t; + using args_type = type_list)>::args_type...>; + static_assert(Policy::template value, "Invalid return type for the given policy"); + + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_data_node{ + /* this is never static */ + (std::is_member_object_pointer_v)> && ... && std::is_const_v>) ? internal::meta_traits::is_const : internal::meta_traits::is_none, + Setter::size, + &internal::resolve>>, + &meta_arg::size != 1u, type_list_element_t>...>>, + +[](meta_handle instance, meta_any value) { return (meta_setter>(*instance.operator->(), value.as_ref()) || ...); }, + &meta_getter}); + + bucket = &elem.prop; + } + +public: + /*! @brief Default constructor. */ + meta_factory() noexcept + : meta_factory{locator::value_or()} {} + + /** + * @brief Context aware constructor. + * @param area The context into which to construct meta types. + */ + meta_factory(meta_ctx &area) noexcept + : ctx{&area}, + bucket{}, + info{&type_id()} { + auto &&elem = internal::owner(*ctx, *info); + + if(!elem.details) { + elem.details = std::make_shared(); + } + + bucket = &elem.details->prop; + } + + /** + * @brief Assigns a custom unique identifier to a meta type. + * @param id A custom unique identifier. + * @return An extended meta factory for the given type. + */ + auto type(const id_type id) noexcept { + auto &&elem = internal::owner(*ctx, *info); + ENTT_ASSERT(elem.id == id || !resolve(*ctx, id), "Duplicate identifier"); + bucket = &elem.details->prop; + elem.id = id; + return *this; + } + + /** + * @brief Assigns a meta base to a meta type. + * + * A reflected base class must be a real base class of the reflected type. + * + * @tparam Base Type of the base class to assign to the meta type. + * @return A meta factory for the parent type. + */ + template + auto base() noexcept { + static_assert(!std::is_same_v && std::is_base_of_v, "Invalid base type"); + + internal::meta_extend( + internal::owner(*ctx, *info), + type_id().hash(), + internal::meta_base_node{ + &internal::resolve, + +[](const void *instance) noexcept { + return static_cast(static_cast(static_cast(instance))); + }}); + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta conversion function to a meta type. + * + * Conversion functions can be either free functions or member + * functions.
+ * In case of free functions, they must accept a const reference to an + * instance of the parent type as an argument. In case of member functions, + * they should have no arguments at all. + * + * @tparam Candidate The actual function to use for the conversion. + * @return A meta factory for the parent type. + */ + template + auto conv() noexcept { + using conv_type = std::remove_cv_t>>; + + internal::meta_extend( + internal::owner(*ctx, *info), + type_id().hash(), + internal::meta_conv_node{ + +[](const meta_ctx &area, const void *instance) { + return forward_as_meta(area, std::invoke(Candidate, *static_cast(instance))); + }}); + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta conversion function to a meta type. + * + * The given type must be such that an instance of the reflected type can be + * converted to it. + * + * @tparam To Type of the conversion function to assign to the meta type. + * @return A meta factory for the parent type. + */ + template + auto conv() noexcept { + using conv_type = std::remove_cv_t>; + + internal::meta_extend( + internal::owner(*ctx, *info), + type_id().hash(), + internal::meta_conv_node{ + +[](const meta_ctx &area, const void *instance) { + return forward_as_meta(area, static_cast(*static_cast(instance))); + }}); + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta constructor to a meta type. + * + * Both member functions and free function can be assigned to meta types in + * the role of constructors. All that is required is that they return an + * instance of the underlying type.
+ * From a client's point of view, nothing changes if a constructor of a meta + * type is a built-in one or not. + * + * @tparam Candidate The actual function to use as a constructor. + * @tparam Policy Optional policy (no policy set by default). + * @return An extended meta factory for the parent type. + */ + template + auto ctor() noexcept { + using descriptor = meta_function_helper_t; + static_assert(Policy::template value, "Invalid return type for the given policy"); + static_assert(std::is_same_v>, Type>, "The function doesn't return an object of the required type"); + + internal::meta_extend( + internal::owner(*ctx, *info), + type_id().hash(), + internal::meta_ctor_node{ + descriptor::args_type::size, + &meta_arg, + &meta_construct}); + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta constructor to a meta type. + * + * A meta constructor is uniquely identified by the types of its arguments + * and is such that there exists an actual constructor of the underlying + * type that can be invoked with parameters whose types are those given. + * + * @tparam Args Types of arguments to use to construct an instance. + * @return An extended meta factory for the parent type. + */ + template + auto ctor() noexcept { + // default constructor is already implicitly generated, no need for redundancy + if constexpr(sizeof...(Args) != 0u) { + using descriptor = meta_function_helper_t; + + internal::meta_extend( + internal::owner(*ctx, *info), + type_id().hash(), + internal::meta_ctor_node{ + descriptor::args_type::size, + &meta_arg, + &meta_construct}); + } + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta destructor to a meta type. + * + * Both free functions and member functions can be assigned to meta types in + * the role of destructors.
+ * The signature of a free function should be identical to the following: + * + * @code{.cpp} + * void(Type &); + * @endcode + * + * Member functions should not take arguments instead.
+ * The purpose is to give users the ability to free up resources that + * require special treatment before an object is actually destroyed. + * + * @tparam Func The actual function to use as a destructor. + * @return A meta factory for the parent type. + */ + template + auto dtor() noexcept { + static_assert(std::is_invocable_v, "The function doesn't accept an object of the type provided"); + + internal::meta_extend( + internal::owner(*ctx, *info), + internal::meta_dtor_node{ + +[](void *instance) { std::invoke(Func, *static_cast(instance)); }}); + + bucket = nullptr; + return *this; + } + + /** + * @brief Assigns a meta data to a meta type. + * + * Both data members and static and global variables, as well as constants + * of any kind, can be assigned to a meta type.
+ * From a client's point of view, all the variables associated with the + * reflected object will appear as if they were part of the type itself. + * + * @tparam Data The actual variable to attach to the meta type. + * @tparam Policy Optional policy (no policy set by default). + * @param id Unique identifier. + * @return An extended meta factory for the parent type. + */ + template + auto data(const id_type id) noexcept { + if constexpr(std::is_member_object_pointer_v) { + using data_type = std::remove_reference_t>; + + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_data_node{ + /* this is never static */ + std::is_const_v ? internal::meta_traits::is_const : internal::meta_traits::is_none, + 1u, + &internal::resolve>, + &meta_arg>>, + &meta_setter, + &meta_getter}); + + bucket = &elem.prop; + } else { + using data_type = std::remove_reference_t>; + + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_data_node{ + ((std::is_same_v> || std::is_const_v) ? internal::meta_traits::is_const : internal::meta_traits::is_none) | internal::meta_traits::is_static, + 1u, + &internal::resolve>, + &meta_arg>>, + &meta_setter, + &meta_getter}); + + bucket = &elem.prop; + } + + return *this; + } + + /** + * @brief Assigns a meta data to a meta type by means of its setter and + * getter. + * + * Setters and getters can be either free functions, member functions or a + * mix of them.
+ * In case of free functions, setters and getters must accept a reference to + * an instance of the parent type as their first argument. A setter has then + * an extra argument of a type convertible to that of the parameter to + * set.
+ * In case of member functions, getters have no arguments at all, while + * setters has an argument of a type convertible to that of the parameter to + * set. + * + * @tparam Setter The actual function to use as a setter. + * @tparam Getter The actual function to use as a getter. + * @tparam Policy Optional policy (no policy set by default). + * @param id Unique identifier. + * @return An extended meta factory for the parent type. + */ + template + auto data(const id_type id) noexcept { + using data_type = std::invoke_result_t; + static_assert(Policy::template value, "Invalid return type for the given policy"); + + if constexpr(std::is_same_v) { + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_data_node{ + /* this is never static */ + internal::meta_traits::is_const, + 0u, + &internal::resolve>>, + &meta_arg>, + &meta_setter, + &meta_getter}); + + bucket = &elem.prop; + } else { + using args_type = typename meta_function_helper_t::args_type; + + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_data_node{ + /* this is never static nor const */ + internal::meta_traits::is_none, + 1u, + &internal::resolve>>, + &meta_arg>>, + &meta_setter, + &meta_getter}); + + bucket = &elem.prop; + } + + return *this; + } + + /** + * @brief Assigns a meta data to a meta type by means of its setters and + * getter. + * + * Multi-setter support for meta data members. All setters are tried in the + * order of definition before returning to the caller.
+ * Setters can be either free functions, member functions or a mix of them + * and are provided via a `value_list` type. + * + * @sa data + * + * @tparam Setter The actual functions to use as setters. + * @tparam Getter The actual getter function. + * @tparam Policy Optional policy (no policy set by default). + * @param id Unique identifier. + * @return An extended meta factory for the parent type. + */ + template + auto data(const id_type id) noexcept { + data(id, std::make_index_sequence{}); + return *this; + } + + /** + * @brief Assigns a meta function to a meta type. + * + * Both member functions and free functions can be assigned to a meta + * type.
+ * From a client's point of view, all the functions associated with the + * reflected object will appear as if they were part of the type itself. + * + * @tparam Candidate The actual function to attach to the meta type. + * @tparam Policy Optional policy (no policy set by default). + * @param id Unique identifier. + * @return An extended meta factory for the parent type. + */ + template + auto func(const id_type id) noexcept { + using descriptor = meta_function_helper_t; + static_assert(Policy::template value, "Invalid return type for the given policy"); + + auto &&elem = internal::meta_extend( + internal::owner(*ctx, *info), + id, + internal::meta_func_node{ + (descriptor::is_const ? internal::meta_traits::is_const : internal::meta_traits::is_none) | (descriptor::is_static ? internal::meta_traits::is_static : internal::meta_traits::is_none), + descriptor::args_type::size, + &internal::resolve, void, std::remove_cv_t>>>, + &meta_arg, + &meta_invoke}); + + bucket = &elem.prop; + return *this; + } + + /** + * @brief Assigns a property to the last meta object created. + * + * Both the key and the value (if any) must be at least copy constructible. + * + * @tparam Value Optional type of the property value. + * @param id Property key. + * @param value Optional property value. + * @return An extended meta factory for the given type. + */ + template + meta_factory prop(id_type id, [[maybe_unused]] Value &&...value) { + ENTT_ASSERT(bucket != nullptr, "Meta object does not support properties"); + + if constexpr(sizeof...(Value) == 0u) { + internal::meta_extend( + *bucket, + id, + internal::meta_prop_node{ + &internal::resolve}); + } else { + internal::meta_extend( + *bucket, + id, + internal::meta_prop_node{ + &internal::resolve>..., + std::make_shared>(std::forward(value))...}); + } + + return *this; + } + +private: + meta_ctx *ctx; + dense_map *bucket; + const type_info *info; +}; + +/** + * @brief Utility function to use for reflection. + * + * This is the point from which everything starts.
+ * By invoking this function with a type that is not yet reflected, a meta type + * is created to which it will be possible to attach meta objects through a + * dedicated factory. + * + * @tparam Type Type to reflect. + * @param ctx The context into which to construct meta types. + * @return A meta factory for the given type. + */ +template +[[nodiscard]] auto meta(meta_ctx &ctx) noexcept { + auto &&context = internal::meta_context::from(ctx); + // make sure the type exists in the context before returning a factory + context.value.try_emplace(type_id().hash(), internal::resolve(context)); + return meta_factory{ctx}; +} + +/** + * @brief Utility function to use for reflection. + * + * This is the point from which everything starts.
+ * By invoking this function with a type that is not yet reflected, a meta type + * is created to which it will be possible to attach meta objects through a + * dedicated factory. + * + * @tparam Type Type to reflect. + * @return A meta factory for the given type. + */ +template +[[nodiscard]] auto meta() noexcept { + return meta(locator::value_or()); +} + +/** + * @brief Resets a type and all its parts. + * + * Resets a type and all its data members, member functions and properties, as + * well as its constructors, destructors and conversion functions if any.
+ * Base classes aren't reset but the link between the two types is removed. + * + * The type is also removed from the set of searchable types. + * + * @param id Unique identifier. + * @param ctx The context from which to reset meta types. + */ +inline void meta_reset(meta_ctx &ctx, const id_type id) noexcept { + auto &&context = internal::meta_context::from(ctx); + + for(auto it = context.value.begin(); it != context.value.end();) { + if(it->second.id == id) { + it = context.value.erase(it); + } else { + ++it; + } + } +} + +/** + * @brief Resets a type and all its parts. + * + * Resets a type and all its data members, member functions and properties, as + * well as its constructors, destructors and conversion functions if any.
+ * Base classes aren't reset but the link between the two types is removed. + * + * The type is also removed from the set of searchable types. + * + * @param id Unique identifier. + */ +inline void meta_reset(const id_type id) noexcept { + meta_reset(locator::value_or(), id); +} + +/** + * @brief Resets a type and all its parts. + * + * @sa meta_reset + * + * @tparam Type Type to reset. + * @param ctx The context from which to reset meta types. + */ +template +void meta_reset(meta_ctx &ctx) noexcept { + internal::meta_context::from(ctx).value.erase(type_id().hash()); +} + +/** + * @brief Resets a type and all its parts. + * + * @sa meta_reset + * + * @tparam Type Type to reset. + */ +template +void meta_reset() noexcept { + meta_reset(locator::value_or()); +} + +/** + * @brief Resets all meta types. + * + * @sa meta_reset + * + * @param ctx The context from which to reset meta types. + */ +inline void meta_reset(meta_ctx &ctx) noexcept { + internal::meta_context::from(ctx).value.clear(); +} + +/** + * @brief Resets all meta types. + * + * @sa meta_reset + */ +inline void meta_reset() noexcept { + meta_reset(locator::value_or()); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/fwd.hpp b/LiteLoader/third-party/include/entt/meta/fwd.hpp new file mode 100644 index 0000000..fa0c57a --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/fwd.hpp @@ -0,0 +1,24 @@ +#ifndef ENTT_META_FWD_HPP +#define ENTT_META_FWD_HPP + +namespace entt { + +class meta_sequence_container; + +class meta_associative_container; + +class meta_any; + +struct meta_handle; + +struct meta_prop; + +struct meta_data; + +struct meta_func; + +class meta_type; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/meta.hpp b/LiteLoader/third-party/include/entt/meta/meta.hpp new file mode 100644 index 0000000..f8cb917 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/meta.hpp @@ -0,0 +1,1949 @@ +#ifndef ENTT_META_META_HPP +#define ENTT_META_META_HPP + +#include +#include +#include +#include +#include +#include "../config/config.h" +#include "../core/any.hpp" +#include "../core/fwd.hpp" +#include "../core/iterator.hpp" +#include "../core/type_info.hpp" +#include "../core/type_traits.hpp" +#include "../core/utility.hpp" +#include "../locator/locator.hpp" +#include "adl_pointer.hpp" +#include "context.hpp" +#include "fwd.hpp" +#include "node.hpp" +#include "range.hpp" +#include "type_traits.hpp" + +namespace entt { + +class meta_any; +class meta_type; + +/*! @brief Proxy object for sequence containers. */ +class meta_sequence_container { + class meta_iterator; + +public: + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Meta iterator type. */ + using iterator = meta_iterator; + + /** + * @brief Context aware constructor. + * @param area The context from which to search for meta types. + */ + meta_sequence_container(const meta_ctx &area = locator::value_or()) noexcept + : ctx{&area} {} + + /** + * @brief Rebinds a proxy object to a sequence container type. + * @tparam Type Type of container to wrap. + * @param instance The container to wrap. + */ + template + void rebind(any instance) noexcept { + value_type_node = &internal::resolve; + size_fn = &meta_sequence_container_traits::size; + resize_fn = &meta_sequence_container_traits::resize; + iter_fn = &meta_sequence_container_traits::iter; + insert_or_erase_fn = &meta_sequence_container_traits::insert_or_erase; + storage = std::move(instance); + } + + [[nodiscard]] inline meta_type value_type() const noexcept; + [[nodiscard]] inline size_type size() const noexcept; + inline bool resize(const size_type); + inline bool clear(); + [[nodiscard]] inline iterator begin(); + [[nodiscard]] inline iterator end(); + inline iterator insert(iterator, meta_any); + inline iterator erase(iterator); + [[nodiscard]] inline meta_any operator[](const size_type); + [[nodiscard]] inline explicit operator bool() const noexcept; + +private: + const meta_ctx *ctx{}; + internal::meta_type_node (*value_type_node)(const internal::meta_context &){}; + size_type (*size_fn)(const any &) noexcept {}; + bool (*resize_fn)(any &, size_type){}; + iterator (*iter_fn)(const meta_ctx &, any &, const bool){}; + iterator (*insert_or_erase_fn)(const meta_ctx &, any &, const any &, meta_any &){}; + any storage{}; +}; + +/*! @brief Proxy object for associative containers. */ +class meta_associative_container { + class meta_iterator; + +public: + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Meta iterator type. */ + using iterator = meta_iterator; + + /** + * @brief Context aware constructor. + * @param area The context from which to search for meta types. + */ + meta_associative_container(const meta_ctx &area = locator::value_or()) noexcept + : ctx{&area} {} + + /** + * @brief Rebinds a proxy object to an associative container type. + * @tparam Type Type of container to wrap. + * @param instance The container to wrap. + */ + template + void rebind(any instance) noexcept { + if constexpr(!meta_associative_container_traits::key_only) { + mapped_type_node = &internal::resolve; + } + + key_only_container = meta_associative_container_traits::key_only; + key_type_node = &internal::resolve; + value_type_node = &internal::resolve; + size_fn = &meta_associative_container_traits::size; + clear_fn = &meta_associative_container_traits::clear; + iter_fn = &meta_associative_container_traits::iter; + insert_or_erase_fn = &meta_associative_container_traits::insert_or_erase; + find_fn = &meta_associative_container_traits::find; + storage = std::move(instance); + } + + [[nodiscard]] inline bool key_only() const noexcept; + [[nodiscard]] inline meta_type key_type() const noexcept; + [[nodiscard]] inline meta_type mapped_type() const noexcept; + [[nodiscard]] inline meta_type value_type() const noexcept; + [[nodiscard]] inline size_type size() const noexcept; + inline bool clear(); + [[nodiscard]] inline iterator begin(); + [[nodiscard]] inline iterator end(); + inline bool insert(meta_any); + inline bool insert(meta_any, meta_any); + inline size_type erase(meta_any); + [[nodiscard]] inline iterator find(meta_any); + [[nodiscard]] inline explicit operator bool() const noexcept; + +private: + const meta_ctx *ctx{}; + bool key_only_container{}; + internal::meta_type_node (*key_type_node)(const internal::meta_context &){}; + internal::meta_type_node (*mapped_type_node)(const internal::meta_context &){}; + internal::meta_type_node (*value_type_node)(const internal::meta_context &){}; + size_type (*size_fn)(const any &) noexcept {}; + bool (*clear_fn)(any &){}; + iterator (*iter_fn)(const meta_ctx &, any &, const bool){}; + size_type (*insert_or_erase_fn)(any &, meta_any &, meta_any &){}; + iterator (*find_fn)(const meta_ctx &, any &, meta_any &){}; + any storage{}; +}; + +/*! @brief Opaque wrapper for values of any type. */ +class meta_any { + enum class operation : std::uint8_t { + deref, + seq, + assoc + }; + + using vtable_type = void(const operation, const any &, void *); + + template + static void basic_vtable([[maybe_unused]] const operation op, [[maybe_unused]] const any &value, [[maybe_unused]] void *other) { + static_assert(std::is_same_v>, Type>, "Invalid type"); + + if constexpr(!std::is_void_v) { + switch(op) { + case operation::deref: + if constexpr(is_meta_pointer_like_v) { + if constexpr(std::is_function_v::element_type>) { + static_cast(other)->emplace(any_cast(value)); + } else if constexpr(!std::is_same_v::element_type>, void>) { + using in_place_type = decltype(adl_meta_pointer_like::dereference(any_cast(value))); + + if constexpr(std::is_constructible_v) { + if(const auto &pointer_like = any_cast(value); pointer_like) { + static_cast(other)->emplace(adl_meta_pointer_like::dereference(pointer_like)); + } + } else { + static_cast(other)->emplace(adl_meta_pointer_like::dereference(any_cast(value))); + } + } + } + break; + case operation::seq: + if constexpr(is_complete_v>) { + static_cast(other)->rebind(std::move(const_cast(value))); + } + break; + case operation::assoc: + if constexpr(is_complete_v>) { + static_cast(other)->rebind(std::move(const_cast(value))); + } + break; + } + } + } + + void release() { + if(node.dtor.dtor && owner()) { + node.dtor.dtor(storage.data()); + } + } + + meta_any(const meta_ctx &area, const meta_any &other, any ref) noexcept + : storage{std::move(ref)}, + ctx{&area}, + node{storage ? other.node : internal::meta_type_node{}}, + vtable{storage ? other.vtable : &basic_vtable} {} + +public: + /*! Default constructor. */ + meta_any() noexcept + : meta_any{meta_ctx_arg, locator::value_or()} {} + + /** + * @brief Context aware constructor. + * @param area The context from which to search for meta types. + */ + meta_any(meta_ctx_arg_t, const meta_ctx &area) noexcept + : storage{}, + ctx{&area}, + node{}, + vtable{&basic_vtable} {} + + /** + * @brief Constructs a wrapper by directly initializing the new object. + * @tparam Type Type of object to use to initialize the wrapper. + * @tparam Args Types of arguments to use to construct the new instance. + * @param args Parameters to use to construct the instance. + */ + template + explicit meta_any(std::in_place_type_t, Args &&...args) + : meta_any{locator::value_or(), std::in_place_type, std::forward(args)...} {} + + /** + * @brief Constructs a wrapper by directly initializing the new object. + * @tparam Type Type of object to use to initialize the wrapper. + * @tparam Args Types of arguments to use to construct the new instance. + * @param area The context from which to search for meta types. + * @param args Parameters to use to construct the instance. + */ + template + explicit meta_any(const meta_ctx &area, std::in_place_type_t, Args &&...args) + : storage{std::in_place_type, std::forward(args)...}, + ctx{&area}, + node{internal::resolve>>(internal::meta_context::from(*ctx))}, + vtable{&basic_vtable>>} {} + + /** + * @brief Constructs a wrapper from a given value. + * @tparam Type Type of object to use to initialize the wrapper. + * @param value An instance of an object to use to initialize the wrapper. + */ + template, meta_any>>> + meta_any(Type &&value) + : meta_any{locator::value_or(), std::forward(value)} {} + + /** + * @brief Constructs a wrapper from a given value. + * @tparam Type Type of object to use to initialize the wrapper. + * @param area The context from which to search for meta types. + * @param value An instance of an object to use to initialize the wrapper. + */ + template, meta_any>>> + meta_any(const meta_ctx &area, Type &&value) + : meta_any{area, std::in_place_type>, std::forward(value)} {} + + /** + * @brief Context aware copy constructor. + * @param area The context from which to search for meta types. + * @param other The instance to copy from. + */ + meta_any(const meta_ctx &area, const meta_any &other) + : meta_any{other} { + ctx = &area; + node = node.resolve ? node.resolve(internal::meta_context::from(*ctx)) : node; + } + + /** + * @brief Context aware move constructor. + * @param area The context from which to search for meta types. + * @param other The instance to move from. + */ + meta_any(const meta_ctx &area, meta_any &&other) + : meta_any{std::move(other)} { + ctx = &area; + node = node.resolve ? node.resolve(internal::meta_context::from(*ctx)) : node; + } + + /** + * @brief Copy constructor. + * @param other The instance to copy from. + */ + meta_any(const meta_any &other) = default; + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + meta_any(meta_any &&other) noexcept + : storage{std::move(other.storage)}, + ctx{other.ctx}, + node{std::exchange(other.node, internal::meta_type_node{})}, + vtable{std::exchange(other.vtable, &basic_vtable)} {} + + /*! @brief Frees the internal storage, whatever it means. */ + ~meta_any() { + release(); + } + + /** + * @brief Copy assignment operator. + * @param other The instance to copy from. + * @return This meta any object. + */ + meta_any &operator=(const meta_any &other) { + release(); + storage = other.storage; + ctx = other.ctx; + node = other.node; + vtable = other.vtable; + return *this; + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This meta any object. + */ + meta_any &operator=(meta_any &&other) noexcept { + release(); + storage = std::move(other.storage); + ctx = other.ctx; + node = std::exchange(other.node, internal::meta_type_node{}); + vtable = std::exchange(other.vtable, &basic_vtable); + return *this; + } + + /** + * @brief Value assignment operator. + * @tparam Type Type of object to use to initialize the wrapper. + * @param value An instance of an object to use to initialize the wrapper. + * @return This meta any object. + */ + template + std::enable_if_t, meta_any>, meta_any &> + operator=(Type &&value) { + emplace>(std::forward(value)); + return *this; + } + + /*! @copydoc any::type */ + [[nodiscard]] inline meta_type type() const noexcept; + + /*! @copydoc any::data */ + [[nodiscard]] const void *data() const noexcept { + return storage.data(); + } + + /*! @copydoc any::data */ + [[nodiscard]] void *data() noexcept { + return storage.data(); + } + + /** + * @brief Invokes the underlying function, if possible. + * @tparam Args Types of arguments to use to invoke the function. + * @param id Unique identifier. + * @param args Parameters to use to invoke the function. + * @return A wrapper containing the returned value, if any. + */ + template + meta_any invoke(const id_type id, Args &&...args) const; + + /*! @copydoc invoke */ + template + meta_any invoke(const id_type id, Args &&...args); + + /** + * @brief Sets the value of a given variable. + * @tparam Type Type of value to assign. + * @param id Unique identifier. + * @param value Parameter to use to set the underlying variable. + * @return True in case of success, false otherwise. + */ + template + bool set(const id_type id, Type &&value); + + /** + * @brief Gets the value of a given variable. + * @param id Unique identifier. + * @return A wrapper containing the value of the underlying variable. + */ + [[nodiscard]] meta_any get(const id_type id) const; + + /*! @copydoc get */ + [[nodiscard]] meta_any get(const id_type id); + + /** + * @brief Tries to cast an instance to a given type. + * @tparam Type Type to which to cast the instance. + * @return A (possibly null) pointer to the contained instance. + */ + template + [[nodiscard]] const Type *try_cast() const { + const auto other = internal::resolve>(internal::meta_context::from(*ctx)); + return static_cast(internal::try_cast(internal::meta_context::from(*ctx), node, other, data())); + } + + /*! @copydoc try_cast */ + template + [[nodiscard]] Type *try_cast() { + if constexpr(std::is_const_v) { + return std::as_const(*this).try_cast>(); + } else { + const auto other = internal::resolve>(internal::meta_context::from(*ctx)); + return static_cast(const_cast(internal::try_cast(internal::meta_context::from(*ctx), node, other, data()))); + } + } + + /** + * @brief Tries to cast an instance to a given type. + * + * @warning + * Attempting to perform an invalid cast results is undefined behavior. + * + * @tparam Type Type to which to cast the instance. + * @return A reference to the contained instance. + */ + template + [[nodiscard]] Type cast() const { + auto *const instance = try_cast>(); + ENTT_ASSERT(instance, "Invalid instance"); + return static_cast(*instance); + } + + /*! @copydoc cast */ + template + [[nodiscard]] Type cast() { + // forces const on non-reference types to make them work also with wrappers for const references + auto *const instance = try_cast>(); + ENTT_ASSERT(instance, "Invalid instance"); + return static_cast(*instance); + } + + /** + * @brief Converts an object in such a way that a given cast becomes viable. + * @param type Meta type to which the cast is requested. + * @return A valid meta any object if there exists a viable conversion, an + * invalid one otherwise. + */ + [[nodiscard]] meta_any allow_cast(const meta_type &type) const; + + /** + * @brief Converts an object in such a way that a given cast becomes viable. + * @param type Meta type to which the cast is requested. + * @return True if there exists a viable conversion, false otherwise. + */ + [[nodiscard]] bool allow_cast(const meta_type &type) { + if(auto other = std::as_const(*this).allow_cast(type); other) { + if(other.owner()) { + std::swap(*this, other); + } + + return true; + } + + return false; + } + + /** + * @brief Converts an object in such a way that a given cast becomes viable. + * @tparam Type Type to which the cast is requested. + * @return A valid meta any object if there exists a viable conversion, an + * invalid one otherwise. + */ + template + [[nodiscard]] meta_any allow_cast() const { + if constexpr(std::is_reference_v && !std::is_const_v>) { + return meta_any{meta_ctx_arg, *ctx}; + } else { + auto other = internal::resolve>>(internal::meta_context::from(*ctx)); + return allow_cast(meta_type{*ctx, other}); + } + } + + /** + * @brief Converts an object in such a way that a given cast becomes viable. + * @tparam Type Type to which the cast is requested. + * @return True if there exists a viable conversion, false otherwise. + */ + template + bool allow_cast() { + auto other = internal::resolve>>(internal::meta_context::from(*ctx)); + return allow_cast(meta_type{*ctx, other}) && (!(std::is_reference_v && !std::is_const_v>) || storage.data() != nullptr); + } + + /*! @copydoc any::emplace */ + template + void emplace(Args &&...args) { + release(); + storage.emplace(std::forward(args)...); + node = internal::resolve>>(internal::meta_context::from(*ctx)); + vtable = &basic_vtable>>; + } + + /*! @copydoc any::assign */ + bool assign(const meta_any &other); + + /*! @copydoc any::assign */ + bool assign(meta_any &&other); + + /*! @copydoc any::reset */ + void reset() { + release(); + storage.reset(); + node = {}; + vtable = &basic_vtable; + } + + /** + * @brief Returns a sequence container proxy. + * @return A sequence container proxy for the underlying object. + */ + [[nodiscard]] meta_sequence_container as_sequence_container() noexcept { + any detached = storage.as_ref(); + meta_sequence_container proxy{*ctx}; + vtable(operation::seq, detached, &proxy); + return proxy; + } + + /*! @copydoc as_sequence_container */ + [[nodiscard]] meta_sequence_container as_sequence_container() const noexcept { + any detached = storage.as_ref(); + meta_sequence_container proxy{*ctx}; + vtable(operation::seq, detached, &proxy); + return proxy; + } + + /** + * @brief Returns an associative container proxy. + * @return An associative container proxy for the underlying object. + */ + [[nodiscard]] meta_associative_container as_associative_container() noexcept { + any detached = storage.as_ref(); + meta_associative_container proxy{*ctx}; + vtable(operation::assoc, detached, &proxy); + return proxy; + } + + /*! @copydoc as_associative_container */ + [[nodiscard]] meta_associative_container as_associative_container() const noexcept { + any detached = storage.as_ref(); + meta_associative_container proxy{*ctx}; + vtable(operation::assoc, detached, &proxy); + return proxy; + } + + /** + * @brief Indirection operator for dereferencing opaque objects. + * @return A wrapper that shares a reference to an unmanaged object if the + * wrapped element is dereferenceable, an invalid meta any otherwise. + */ + [[nodiscard]] meta_any operator*() const noexcept { + meta_any ret{meta_ctx_arg, *ctx}; + vtable(operation::deref, storage, &ret); + return ret; + } + + /** + * @brief Returns false if a wrapper is invalid, true otherwise. + * @return False if the wrapper is invalid, true otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return !(node.info == nullptr); + } + + /*! @copydoc any::operator== */ + [[nodiscard]] bool operator==(const meta_any &other) const noexcept { + return (ctx == other.ctx) && ((!node.info && !other.node.info) || (node.info && other.node.info && *node.info == *other.node.info && storage == other.storage)); + } + + /*! @copydoc any::operator!= */ + [[nodiscard]] bool operator!=(const meta_any &other) const noexcept { + return !(*this == other); + } + + /*! @copydoc any::as_ref */ + [[nodiscard]] meta_any as_ref() noexcept { + return meta_any{*ctx, *this, storage.as_ref()}; + } + + /*! @copydoc any::as_ref */ + [[nodiscard]] meta_any as_ref() const noexcept { + return meta_any{*ctx, *this, storage.as_ref()}; + } + + /*! @copydoc any::owner */ + [[nodiscard]] bool owner() const noexcept { + return storage.owner(); + } + +private: + any storage; + const meta_ctx *ctx; + internal::meta_type_node node; + vtable_type *vtable; +}; + +/** + * @brief Forwards its argument and avoids copies for lvalue references. + * @tparam Type Type of argument to use to construct the new instance. + * @param value Parameter to use to construct the instance. + * @param ctx The context from which to search for meta types. + * @return A properly initialized and not necessarily owning wrapper. + */ +template +meta_any forward_as_meta(const meta_ctx &ctx, Type &&value) { + return meta_any{ctx, std::in_place_type, std::forward(value)}; +} + +/** + * @brief Forwards its argument and avoids copies for lvalue references. + * @tparam Type Type of argument to use to construct the new instance. + * @param value Parameter to use to construct the instance. + * @return A properly initialized and not necessarily owning wrapper. + */ +template +meta_any forward_as_meta(Type &&value) { + return forward_as_meta(locator::value_or(), std::forward(value)); +} + +/** + * @brief Opaque pointers to instances of any type. + * + * A handle doesn't perform copies and isn't responsible for the contained + * object. It doesn't prolong the lifetime of the pointed instance.
+ * Handles are used to generate references to actual objects when needed. + */ +struct meta_handle { + /*! Default constructor. */ + meta_handle() noexcept + : meta_handle{meta_ctx_arg, locator::value_or()} {} + + /** + * @brief Context aware constructor. + * @param area The context from which to search for meta types. + */ + meta_handle(meta_ctx_arg_t, const meta_ctx &area) noexcept + : any{meta_ctx_arg, area} {} + + /** + * @brief Creates a handle that points to an unmanaged object. + * @param value An instance of an object to use to initialize the handle. + */ + meta_handle(meta_any &value) noexcept + : any{value.as_ref()} {} + + /** + * @brief Creates a handle that points to an unmanaged object. + * @param value An instance of an object to use to initialize the handle. + */ + meta_handle(const meta_any &value) noexcept + : any{value.as_ref()} {} + + /** + * @brief Creates a handle that points to an unmanaged object. + * @tparam Type Type of object to use to initialize the handle. + * @param ctx The context from which to search for meta types. + * @param value An instance of an object to use to initialize the handle. + */ + template, meta_handle>>> + meta_handle(const meta_ctx &ctx, Type &value) noexcept + : any{ctx, std::in_place_type, value} {} + + /** + * @brief Creates a handle that points to an unmanaged object. + * @tparam Type Type of object to use to initialize the handle. + * @param value An instance of an object to use to initialize the handle. + */ + template, meta_handle>>> + meta_handle(Type &value) noexcept + : meta_handle{locator::value_or(), value} {} + + /** + * @brief Context aware copy constructor. + * @param area The context from which to search for meta types. + * @param other The instance to copy from. + */ + meta_handle(const meta_ctx &area, const meta_handle &other) + : any{area, other.any} {} + + /** + * @brief Context aware move constructor. + * @param area The context from which to search for meta types. + * @param other The instance to move from. + */ + meta_handle(const meta_ctx &area, meta_handle &&other) + : any{area, std::move(other.any)} {} + + /*! @brief Default copy constructor, deleted on purpose. */ + meta_handle(const meta_handle &) = delete; + + /*! @brief Default move constructor. */ + meta_handle(meta_handle &&) = default; + + /** + * @brief Default copy assignment operator, deleted on purpose. + * @return This meta handle. + */ + meta_handle &operator=(const meta_handle &) = delete; + + /** + * @brief Default move assignment operator. + * @return This meta handle. + */ + meta_handle &operator=(meta_handle &&) = default; + + /** + * @brief Returns false if a handle is invalid, true otherwise. + * @return False if the handle is invalid, true otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return static_cast(any); + } + + /** + * @brief Access operator for accessing the contained opaque object. + * @return A wrapper that shares a reference to an unmanaged object. + */ + [[nodiscard]] meta_any *operator->() { + return &any; + } + + /*! @copydoc operator-> */ + [[nodiscard]] const meta_any *operator->() const { + return &any; + } + +private: + meta_any any; +}; + +/*! @brief Opaque wrapper for properties of any type. */ +struct meta_prop { + /*! @brief Default constructor. */ + meta_prop() noexcept + : node{}, + ctx{} {} + + /** + * @brief Context aware constructor for meta objects. + * @param area The context from which to search for meta types. + * @param curr The underlying node with which to construct the instance. + */ + meta_prop(const meta_ctx &area, const internal::meta_prop_node &curr) noexcept + : node{&curr}, + ctx{&area} {} + + /** + * @brief Returns the stored value by copy. + * @return A wrapper containing the value stored with the property. + */ + [[nodiscard]] meta_any value() const { + return node->value ? node->type(internal::meta_context::from(*ctx)).from_void(*ctx, nullptr, node->value.get()) : meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @brief Returns true if an object is valid, false otherwise. + * @return True if the object is valid, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return (node != nullptr); + } + +private: + const internal::meta_prop_node *node; + const meta_ctx *ctx; +}; + +/*! @brief Opaque wrapper for data members. */ +struct meta_data { + /*! @brief Unsigned integer type. */ + using size_type = typename internal::meta_data_node::size_type; + + /*! @brief Default constructor. */ + meta_data() noexcept + : node{}, + ctx{} {} + + /** + * @brief Context aware constructor for meta objects. + * @param area The context from which to search for meta types. + * @param curr The underlying node with which to construct the instance. + */ + meta_data(const meta_ctx &area, const internal::meta_data_node &curr) noexcept + : node{&curr}, + ctx{&area} {} + + /** + * @brief Returns the number of setters available. + * @return The number of setters available. + */ + [[nodiscard]] size_type arity() const noexcept { + return node->arity; + } + + /** + * @brief Indicates whether a data member is constant or not. + * @return True if the data member is constant, false otherwise. + */ + [[nodiscard]] bool is_const() const noexcept { + return static_cast(node->traits & internal::meta_traits::is_const); + } + + /** + * @brief Indicates whether a data member is static or not. + * @return True if the data member is static, false otherwise. + */ + [[nodiscard]] bool is_static() const noexcept { + return static_cast(node->traits & internal::meta_traits::is_static); + } + + /*! @copydoc meta_any::type */ + [[nodiscard]] inline meta_type type() const noexcept; + + /** + * @brief Sets the value of a given variable. + * @tparam Type Type of value to assign. + * @param instance An opaque instance of the underlying type. + * @param value Parameter to use to set the underlying variable. + * @return True in case of success, false otherwise. + */ + template + bool set(meta_handle instance, Type &&value) const { + return node->set && node->set(meta_handle{*ctx, std::move(instance)}, meta_any{*ctx, std::forward(value)}); + } + + /** + * @brief Gets the value of a given variable. + * @param instance An opaque instance of the underlying type. + * @return A wrapper containing the value of the underlying variable. + */ + [[nodiscard]] meta_any get(meta_handle instance) const { + return node->get(*ctx, meta_handle{*ctx, std::move(instance)}); + } + + /** + * @brief Returns the type accepted by the i-th setter. + * @param index Index of the setter of which to return the accepted type. + * @return The type accepted by the i-th setter. + */ + [[nodiscard]] inline meta_type arg(const size_type index) const noexcept; + + /** + * @brief Returns a range to visit registered meta properties. + * @return An iterable range to visit registered meta properties. + */ + [[nodiscard]] meta_range prop() const noexcept { + return {{*ctx, node->prop.cbegin()}, {*ctx, node->prop.cend()}}; + } + + /** + * @brief Lookup utility for meta properties. + * @param key The key to use to search for a property. + * @return The registered meta property for the given key, if any. + */ + [[nodiscard]] meta_prop prop(const id_type key) const { + const auto it = node->prop.find(key); + return it != node->prop.cend() ? meta_prop{*ctx, it->second} : meta_prop{}; + } + + /** + * @brief Returns true if an object is valid, false otherwise. + * @return True if the object is valid, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return (node != nullptr); + } + +private: + const internal::meta_data_node *node; + const meta_ctx *ctx; +}; + +/*! @brief Opaque wrapper for member functions. */ +struct meta_func { + /*! @brief Unsigned integer type. */ + using size_type = typename internal::meta_func_node::size_type; + + /*! @brief Default constructor. */ + meta_func() noexcept + : node{}, + ctx{} {} + + /** + * @brief Context aware constructor for meta objects. + * @param area The context from which to search for meta types. + * @param curr The underlying node with which to construct the instance. + */ + meta_func(const meta_ctx &area, const internal::meta_func_node &curr) noexcept + : node{&curr}, + ctx{&area} {} + + /** + * @brief Returns the number of arguments accepted by a member function. + * @return The number of arguments accepted by the member function. + */ + [[nodiscard]] size_type arity() const noexcept { + return node->arity; + } + + /** + * @brief Indicates whether a member function is constant or not. + * @return True if the member function is constant, false otherwise. + */ + [[nodiscard]] bool is_const() const noexcept { + return static_cast(node->traits & internal::meta_traits::is_const); + } + + /** + * @brief Indicates whether a member function is static or not. + * @return True if the member function is static, false otherwise. + */ + [[nodiscard]] bool is_static() const noexcept { + return static_cast(node->traits & internal::meta_traits::is_static); + } + + /** + * @brief Returns the return type of a member function. + * @return The return type of the member function. + */ + [[nodiscard]] inline meta_type ret() const noexcept; + + /** + * @brief Returns the type of the i-th argument of a member function. + * @param index Index of the argument of which to return the type. + * @return The type of the i-th argument of a member function. + */ + [[nodiscard]] inline meta_type arg(const size_type index) const noexcept; + + /** + * @brief Invokes the underlying function, if possible. + * + * @warning + * The context of the arguments is **not** changed.
+ * It's up to the caller to bind them to the right context(s). + * + * @param instance An opaque instance of the underlying type. + * @param args Parameters to use to invoke the function. + * @param sz Number of parameters to use to invoke the function. + * @return A wrapper containing the returned value, if any. + */ + meta_any invoke(meta_handle instance, meta_any *const args, const size_type sz) const { + return sz == arity() ? node->invoke(*ctx, meta_handle{*ctx, std::move(instance)}, args) : meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @copybrief invoke + * @tparam Args Types of arguments to use to invoke the function. + * @param instance An opaque instance of the underlying type. + * @param args Parameters to use to invoke the function. + * @return A wrapper containing the returned value, if any. + */ + template + meta_any invoke(meta_handle instance, Args &&...args) const { + meta_any arguments[sizeof...(Args) + 1u]{{*ctx, std::forward(args)}...}; + return invoke(meta_handle{*ctx, std::move(instance)}, arguments, sizeof...(Args)); + } + + /*! @copydoc meta_data::prop */ + [[nodiscard]] meta_range prop() const noexcept { + return {{*ctx, node->prop.cbegin()}, {*ctx, node->prop.cend()}}; + } + + /** + * @brief Lookup utility for meta properties. + * @param key The key to use to search for a property. + * @return The registered meta property for the given key, if any. + */ + [[nodiscard]] meta_prop prop(const id_type key) const { + const auto it = node->prop.find(key); + return it != node->prop.cend() ? meta_prop{*ctx, it->second} : meta_prop{}; + } + + /** + * @brief Returns the next overload of a given function, if any. + * @return The next overload of the given function, if any. + */ + [[nodiscard]] meta_func next() const { + return node->next ? meta_func{*ctx, *node->next} : meta_func{}; + } + + /** + * @brief Returns true if an object is valid, false otherwise. + * @return True if the object is valid, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return (node != nullptr); + } + +private: + const internal::meta_func_node *node; + const meta_ctx *ctx; +}; + +/*! @brief Opaque wrapper for types. */ +class meta_type { + template + [[nodiscard]] auto lookup(meta_any *const args, const typename internal::meta_type_node::size_type sz, [[maybe_unused]] bool constness, Func next) const { + decltype(next()) candidate = nullptr; + size_type same{}; + bool ambiguous{}; + + for(auto curr = next(); curr; curr = next()) { + if constexpr(std::is_same_v, internal::meta_func_node>) { + if(constness && !static_cast(curr->traits & internal::meta_traits::is_const)) { + continue; + } + } + + if(curr->arity == sz) { + size_type match{}; + size_type pos{}; + + for(; pos < sz && args[pos]; ++pos) { + const auto other = curr->arg(*ctx, pos); + const auto type = args[pos].type(); + + if(const auto &info = other.info(); info == type.info()) { + ++match; + } else if(!((type.node.details && (type.node.details->base.contains(info.hash()) || type.node.details->conv.contains(info.hash()))) || (type.node.conversion_helper && other.node.conversion_helper))) { + break; + } + } + + if(pos == sz) { + if(!candidate || match > same) { + candidate = curr; + same = match; + ambiguous = false; + } else if(match == same) { + if constexpr(std::is_same_v, internal::meta_func_node>) { + if(static_cast(curr->traits & internal::meta_traits::is_const) != static_cast(candidate->traits & internal::meta_traits::is_const)) { + candidate = static_cast(candidate->traits & internal::meta_traits::is_const) ? curr : candidate; + ambiguous = false; + continue; + } + } + + ambiguous = true; + } + } + } + } + + return ambiguous ? nullptr : candidate; + } + +public: + /*! @brief Unsigned integer type. */ + using size_type = typename internal::meta_type_node::size_type; + + /*! @brief Default constructor. */ + meta_type() noexcept + : node{}, + ctx{} {} + + /** + * @brief Context aware constructor for meta objects. + * @param area The context from which to search for meta types. + * @param curr The underlying node with which to construct the instance. + */ + meta_type(const meta_ctx &area, const internal::meta_type_node &curr) noexcept + : node{curr}, + ctx{&area} {} + + /** + * @brief Context aware constructor for meta objects. + * @param area The context from which to search for meta types. + * @param curr The underlying node with which to construct the instance. + */ + meta_type(const meta_ctx &area, const internal::meta_base_node &curr) noexcept + : meta_type{area, curr.type(internal::meta_context::from(area))} {} + + /** + * @brief Returns the type info object of the underlying type. + * @return The type info object of the underlying type. + */ + [[nodiscard]] const type_info &info() const noexcept { + return *node.info; + } + + /** + * @brief Returns the identifier assigned to a type. + * @return The identifier assigned to the type. + */ + [[nodiscard]] id_type id() const noexcept { + return node.id; + } + + /** + * @brief Returns the size of the underlying type if known. + * @return The size of the underlying type if known, 0 otherwise. + */ + [[nodiscard]] size_type size_of() const noexcept { + return node.size_of; + } + + /** + * @brief Checks whether a type refers to an arithmetic type or not. + * @return True if the underlying type is an arithmetic type, false + * otherwise. + */ + [[nodiscard]] bool is_arithmetic() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_arithmetic); + } + + /** + * @brief Checks whether a type refers to an integral type or not. + * @return True if the underlying type is an integral type, false otherwise. + */ + [[nodiscard]] bool is_integral() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_integral); + } + + /** + * @brief Checks whether a type refers to a signed type or not. + * @return True if the underlying type is a signed type, false otherwise. + */ + [[nodiscard]] bool is_signed() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_signed); + } + + /** + * @brief Checks whether a type refers to an array type or not. + * @return True if the underlying type is an array type, false otherwise. + */ + [[nodiscard]] bool is_array() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_array); + } + + /** + * @brief Checks whether a type refers to an enum or not. + * @return True if the underlying type is an enum, false otherwise. + */ + [[nodiscard]] bool is_enum() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_enum); + } + + /** + * @brief Checks whether a type refers to a class or not. + * @return True if the underlying type is a class, false otherwise. + */ + [[nodiscard]] bool is_class() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_class); + } + + /** + * @brief Checks whether a type refers to a pointer or not. + * @return True if the underlying type is a pointer, false otherwise. + */ + [[nodiscard]] bool is_pointer() const noexcept { + return node.info && (node.info->hash() != remove_pointer().info().hash()); + } + + /** + * @brief Provides the type for which the pointer is defined. + * @return The type for which the pointer is defined or this type if it + * doesn't refer to a pointer type. + */ + [[nodiscard]] meta_type remove_pointer() const noexcept { + return {*ctx, node.remove_pointer(internal::meta_context::from(*ctx))}; + } + + /** + * @brief Checks whether a type is a pointer-like type or not. + * @return True if the underlying type is a pointer-like one, false + * otherwise. + */ + [[nodiscard]] bool is_pointer_like() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_meta_pointer_like); + } + + /** + * @brief Checks whether a type refers to a sequence container or not. + * @return True if the type is a sequence container, false otherwise. + */ + [[nodiscard]] bool is_sequence_container() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_meta_sequence_container); + } + + /** + * @brief Checks whether a type refers to an associative container or not. + * @return True if the type is an associative container, false otherwise. + */ + [[nodiscard]] bool is_associative_container() const noexcept { + return static_cast(node.traits & internal::meta_traits::is_meta_associative_container); + } + + /** + * @brief Checks whether a type refers to a recognized class template + * specialization or not. + * @return True if the type is a recognized class template specialization, + * false otherwise. + */ + [[nodiscard]] bool is_template_specialization() const noexcept { + return (node.templ.arity != 0u); + } + + /** + * @brief Returns the number of template arguments. + * @return The number of template arguments. + */ + [[nodiscard]] size_type template_arity() const noexcept { + return node.templ.arity; + } + + /** + * @brief Returns a tag for the class template of the underlying type. + * @return The tag for the class template of the underlying type. + */ + [[nodiscard]] inline meta_type template_type() const noexcept { + return node.templ.type ? meta_type{*ctx, node.templ.type(internal::meta_context::from(*ctx))} : meta_type{}; + } + + /** + * @brief Returns the type of the i-th template argument of a type. + * @param index Index of the template argument of which to return the type. + * @return The type of the i-th template argument of a type. + */ + [[nodiscard]] inline meta_type template_arg(const size_type index) const noexcept { + return index < template_arity() ? meta_type{*ctx, node.templ.arg(internal::meta_context::from(*ctx), index)} : meta_type{}; + } + + /** + * @brief Returns a range to visit registered top-level base meta types. + * @return An iterable range to visit registered top-level base meta types. + */ + [[nodiscard]] meta_range base() const noexcept { + using range_type = meta_range; + return node.details ? range_type{{*ctx, node.details->base.cbegin()}, {*ctx, node.details->base.cend()}} : range_type{}; + } + + /** + * @brief Returns a range to visit registered top-level meta data. + * @return An iterable range to visit registered top-level meta data. + */ + [[nodiscard]] meta_range data() const noexcept { + using range_type = meta_range; + return node.details ? range_type{{*ctx, node.details->data.cbegin()}, {*ctx, node.details->data.cend()}} : range_type{}; + } + + /** + * @brief Lookup utility for meta data (bases are also visited). + * @param id Unique identifier. + * @return The registered meta data for the given identifier, if any. + */ + [[nodiscard]] meta_data data(const id_type id) const { + if(node.details) { + if(const auto it = node.details->data.find(id); it != node.details->data.cend()) { + return meta_data{*ctx, it->second}; + } + } + + for(auto &&curr: base()) { + if(auto elem = curr.second.data(id); elem) { + return elem; + } + } + + return meta_data{}; + } + + /** + * @brief Returns a range to visit registered top-level functions. + * @return An iterable range to visit registered top-level functions. + */ + [[nodiscard]] meta_range func() const noexcept { + using return_type = meta_range; + return node.details ? return_type{{*ctx, node.details->func.cbegin()}, {*ctx, node.details->func.cend()}} : return_type{}; + } + + /** + * @brief Lookup utility for meta functions (bases are also visited). + * + * In case of overloaded functions, the first one with the required + * identifier is returned. + * + * @param id Unique identifier. + * @return The registered meta function for the given identifier, if any. + */ + [[nodiscard]] meta_func func(const id_type id) const { + if(node.details) { + if(const auto it = node.details->func.find(id); it != node.details->func.cend()) { + return meta_func{*ctx, it->second}; + } + } + + for(auto &&curr: base()) { + if(auto elem = curr.second.func(id); elem) { + return elem; + } + } + + return meta_func{}; + } + + /** + * @brief Creates an instance of the underlying type, if possible. + * + * If suitable, the implicitly generated default constructor is used. + * + * @warning + * The context of the arguments is **not** changed.
+ * It's up to the caller to bind them to the right context(s). + * + * @param args Parameters to use to construct the instance. + * @param sz Number of parameters to use to construct the instance. + * @return A wrapper containing the new instance, if any. + */ + [[nodiscard]] meta_any construct(meta_any *const args, const size_type sz) const { + if(node.details) { + if(const auto *candidate = lookup(args, sz, false, [first = node.details->ctor.cbegin(), last = node.details->ctor.cend()]() mutable { return first == last ? nullptr : &(first++)->second; }); candidate) { + return candidate->invoke(*ctx, args); + } + } + + if(sz == 0u && node.default_constructor) { + return node.default_constructor(*ctx); + } + + return meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @copybrief construct + * @tparam Args Types of arguments to use to construct the instance. + * @param args Parameters to use to construct the instance. + * @return A wrapper containing the new instance, if any. + */ + template + [[nodiscard]] meta_any construct(Args &&...args) const { + meta_any arguments[sizeof...(Args) + 1u]{{*ctx, std::forward(args)}...}; + return construct(arguments, sizeof...(Args)); + } + + /** + * @brief Wraps an opaque element of the underlying type. + * @param element A valid pointer to an element of the underlying type. + * @return A wrapper that references the given instance. + */ + meta_any from_void(void *element) const { + return (element && node.from_void) ? node.from_void(*ctx, element, nullptr) : meta_any{meta_ctx_arg, *ctx}; + } + + /*! @copydoc from_void */ + meta_any from_void(const void *element) const { + return (element && node.from_void) ? node.from_void(*ctx, nullptr, element) : meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @brief Invokes a function given an identifier, if possible. + * + * @warning + * The context of the arguments is **not** changed.
+ * It's up to the caller to bind them to the right context(s). + * + * @param id Unique identifier. + * @param instance An opaque instance of the underlying type. + * @param args Parameters to use to invoke the function. + * @param sz Number of parameters to use to invoke the function. + * @return A wrapper containing the returned value, if any. + */ + meta_any invoke(const id_type id, meta_handle instance, meta_any *const args, const size_type sz) const { + if(node.details) { + if(auto it = node.details->func.find(id); it != node.details->func.cend()) { + if(const auto *candidate = lookup(args, sz, (instance->data() == nullptr), [curr = &it->second]() mutable { return curr ? std::exchange(curr, curr->next.get()) : nullptr; }); candidate) { + return candidate->invoke(*ctx, meta_handle{*ctx, std::move(instance)}, args); + } + } + } + + for(auto &&curr: base()) { + if(auto elem = curr.second.invoke(id, *instance.operator->(), args, sz); elem) { + return elem; + } + } + + return meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @copybrief invoke + * + * @param id Unique identifier. + * @tparam Args Types of arguments to use to invoke the function. + * @param instance An opaque instance of the underlying type. + * @param args Parameters to use to invoke the function. + * @return A wrapper containing the returned value, if any. + */ + template + meta_any invoke(const id_type id, meta_handle instance, Args &&...args) const { + meta_any arguments[sizeof...(Args) + 1u]{{*ctx, std::forward(args)}...}; + return invoke(id, meta_handle{*ctx, std::move(instance)}, arguments, sizeof...(Args)); + } + + /** + * @brief Sets the value of a given variable. + * @tparam Type Type of value to assign. + * @param id Unique identifier. + * @param instance An opaque instance of the underlying type. + * @param value Parameter to use to set the underlying variable. + * @return True in case of success, false otherwise. + */ + template + bool set(const id_type id, meta_handle instance, Type &&value) const { + const auto candidate = data(id); + return candidate && candidate.set(std::move(instance), std::forward(value)); + } + + /** + * @brief Gets the value of a given variable. + * @param id Unique identifier. + * @param instance An opaque instance of the underlying type. + * @return A wrapper containing the value of the underlying variable. + */ + [[nodiscard]] meta_any get(const id_type id, meta_handle instance) const { + const auto candidate = data(id); + return candidate ? candidate.get(std::move(instance)) : meta_any{meta_ctx_arg, *ctx}; + } + + /** + * @brief Returns a range to visit registered top-level meta properties. + * @return An iterable range to visit registered top-level meta properties. + */ + [[nodiscard]] meta_range prop() const noexcept { + using range_type = meta_range; + return node.details ? range_type{{*ctx, node.details->prop.cbegin()}, {*ctx, node.details->prop.cend()}} : range_type{}; + } + + /** + * @brief Lookup utility for meta properties (bases are also visited). + * @param key The key to use to search for a property. + * @return The registered meta property for the given key, if any. + */ + [[nodiscard]] meta_prop prop(const id_type key) const { + if(node.details) { + if(const auto it = node.details->prop.find(key); it != node.details->prop.cend()) { + return meta_prop{*ctx, it->second}; + } + } + + for(auto &&curr: base()) { + if(auto elem = curr.second.prop(key); elem) { + return elem; + } + } + + return meta_prop{}; + } + + /** + * @brief Returns true if an object is valid, false otherwise. + * @return True if the object is valid, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return !(ctx == nullptr); + } + + /** + * @brief Checks if two objects refer to the same type. + * @param other The object with which to compare. + * @return True if the objects refer to the same type, false otherwise. + */ + [[nodiscard]] bool operator==(const meta_type &other) const noexcept { + return (ctx == other.ctx) && ((!node.info && !other.node.info) || (node.info && other.node.info && *node.info == *other.node.info)); + } + +private: + internal::meta_type_node node; + const meta_ctx *ctx; +}; + +/** + * @brief Checks if two objects refer to the same type. + * @param lhs An object, either valid or not. + * @param rhs An object, either valid or not. + * @return False if the objects refer to the same node, true otherwise. + */ +[[nodiscard]] inline bool operator!=(const meta_type &lhs, const meta_type &rhs) noexcept { + return !(lhs == rhs); +} + +[[nodiscard]] inline meta_type meta_any::type() const noexcept { + return node.info ? meta_type{*ctx, node} : meta_type{}; +} + +template +meta_any meta_any::invoke(const id_type id, Args &&...args) const { + return type().invoke(id, *this, std::forward(args)...); +} + +template +meta_any meta_any::invoke(const id_type id, Args &&...args) { + return type().invoke(id, *this, std::forward(args)...); +} + +template +bool meta_any::set(const id_type id, Type &&value) { + return type().set(id, *this, std::forward(value)); +} + +[[nodiscard]] inline meta_any meta_any::get(const id_type id) const { + return type().get(id, *this); +} + +[[nodiscard]] inline meta_any meta_any::get(const id_type id) { + return type().get(id, *this); +} + +[[nodiscard]] inline meta_any meta_any::allow_cast(const meta_type &type) const { + if(node.info && *node.info == type.info()) { + return as_ref(); + } + + if(const auto *value = data(); node.details) { + if(auto it = node.details->conv.find(type.info().hash()); it != node.details->conv.cend()) { + return it->second.conv(*ctx, data()); + } + + for(auto &&curr: node.details->base) { + const auto &as_const = curr.second.type(internal::meta_context::from(*ctx)).from_void(*ctx, nullptr, curr.second.cast(value)); + + if(auto other = as_const.allow_cast(type); other) { + return other; + } + } + } + + if(node.conversion_helper && (type.is_arithmetic() || type.is_enum())) { + // exploits the fact that arithmetic types and enums are also default constructible + auto other = type.construct(); + ENTT_ASSERT(other.node.conversion_helper, "Conversion helper not found"); + const auto value = node.conversion_helper(nullptr, storage.data()); + other.node.conversion_helper(other.storage.data(), &value); + return other; + } + + return meta_any{meta_ctx_arg, *ctx}; +} + +inline bool meta_any::assign(const meta_any &other) { + auto value = other.allow_cast({*ctx, node}); + return value && storage.assign(std::move(value.storage)); +} + +inline bool meta_any::assign(meta_any &&other) { + if(*node.info == *other.node.info) { + return storage.assign(std::move(other.storage)); + } + + return assign(std::as_const(other)); +} + +[[nodiscard]] inline meta_type meta_data::type() const noexcept { + return meta_type{*ctx, node->type(internal::meta_context::from(*ctx))}; +} + +[[nodiscard]] inline meta_type meta_data::arg(const size_type index) const noexcept { + return index < arity() ? node->arg(*ctx, index) : meta_type{}; +} + +[[nodiscard]] inline meta_type meta_func::ret() const noexcept { + return meta_type{*ctx, node->ret(internal::meta_context::from(*ctx))}; +} + +[[nodiscard]] inline meta_type meta_func::arg(const size_type index) const noexcept { + return index < arity() ? node->arg(*ctx, index) : meta_type{}; +} + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +class meta_sequence_container::meta_iterator final { + friend class meta_sequence_container; + + enum class operation : std::uint8_t { + incr, + deref + }; + + using vtable_type = void(const operation, const any &, const std::ptrdiff_t, meta_any *); + + template + static void basic_vtable(const operation op, const any &value, const std::ptrdiff_t offset, meta_any *other) { + switch(op) { + case operation::incr: { + auto &it = any_cast(const_cast(value)); + it = std::next(it, offset); + } break; + case operation::deref: { + const auto &it = any_cast(value); + other->emplace(*it); + } break; + } + } + +public: + using difference_type = std::ptrdiff_t; + using value_type = meta_any; + using pointer = input_iterator_pointer; + using reference = value_type; + using iterator_category = std::input_iterator_tag; + + constexpr meta_iterator() noexcept + : ctx{}, + vtable{}, + handle{} {} + + template + explicit meta_iterator(const meta_ctx &area, It iter) noexcept + : ctx{&area}, + vtable{&basic_vtable}, + handle{std::move(iter)} {} + + meta_iterator &operator++() noexcept { + vtable(operation::incr, handle, 1, nullptr); + return *this; + } + + meta_iterator operator++(int value) noexcept { + meta_iterator orig = *this; + vtable(operation::incr, handle, ++value, nullptr); + return orig; + } + + meta_iterator &operator--() noexcept { + vtable(operation::incr, handle, -1, nullptr); + return *this; + } + + meta_iterator operator--(int value) noexcept { + meta_iterator orig = *this; + vtable(operation::incr, handle, --value, nullptr); + return orig; + } + + [[nodiscard]] reference operator*() const { + reference other{meta_ctx_arg, *ctx}; + vtable(operation::deref, handle, 0, &other); + return other; + } + + [[nodiscard]] pointer operator->() const { + return operator*(); + } + + [[nodiscard]] explicit operator bool() const noexcept { + return static_cast(handle); + } + + [[nodiscard]] bool operator==(const meta_iterator &other) const noexcept { + return handle == other.handle; + } + + [[nodiscard]] bool operator!=(const meta_iterator &other) const noexcept { + return !(*this == other); + } + +private: + const meta_ctx *ctx; + vtable_type *vtable; + any handle; +}; + +class meta_associative_container::meta_iterator final { + enum class operation : std::uint8_t { + incr, + deref + }; + + using vtable_type = void(const operation, const any &, std::pair *); + + template + static void basic_vtable(const operation op, const any &value, std::pair *other) { + switch(op) { + case operation::incr: + ++any_cast(const_cast(value)); + break; + case operation::deref: + const auto &it = any_cast(value); + if constexpr(KeyOnly) { + other->first.emplace(*it); + } else { + other->first.emplacefirst))>(it->first); + other->second.emplacesecond))>(it->second); + } + break; + } + } + +public: + using difference_type = std::ptrdiff_t; + using value_type = std::pair; + using pointer = input_iterator_pointer; + using reference = value_type; + using iterator_category = std::input_iterator_tag; + + constexpr meta_iterator() noexcept + : ctx{}, + vtable{}, + handle{} {} + + template + meta_iterator(const meta_ctx &area, std::integral_constant, It iter) noexcept + : ctx{&area}, + vtable{&basic_vtable}, + handle{std::move(iter)} {} + + meta_iterator &operator++() noexcept { + vtable(operation::incr, handle, nullptr); + return *this; + } + + meta_iterator operator++(int) noexcept { + meta_iterator orig = *this; + return ++(*this), orig; + } + + [[nodiscard]] reference operator*() const { + reference other{{meta_ctx_arg, *ctx}, {meta_ctx_arg, *ctx}}; + vtable(operation::deref, handle, &other); + return other; + } + + [[nodiscard]] pointer operator->() const { + return operator*(); + } + + [[nodiscard]] explicit operator bool() const noexcept { + return static_cast(handle); + } + + [[nodiscard]] bool operator==(const meta_iterator &other) const noexcept { + return handle == other.handle; + } + + [[nodiscard]] bool operator!=(const meta_iterator &other) const noexcept { + return !(*this == other); + } + +private: + const meta_ctx *ctx; + vtable_type *vtable; + any handle; +}; + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Returns the meta value type of a container. + * @return The meta value type of the container. + */ +[[nodiscard]] inline meta_type meta_sequence_container::value_type() const noexcept { + return value_type_node ? meta_type{*ctx, value_type_node(internal::meta_context::from(*ctx))} : meta_type{}; +} + +/** + * @brief Returns the size of a container. + * @return The size of the container. + */ +[[nodiscard]] inline meta_sequence_container::size_type meta_sequence_container::size() const noexcept { + return size_fn(storage); +} + +/** + * @brief Resizes a container to contain a given number of elements. + * @param sz The new size of the container. + * @return True in case of success, false otherwise. + */ +inline bool meta_sequence_container::resize(const size_type sz) { + return resize_fn(storage, sz); +} + +/** + * @brief Clears the content of a container. + * @return True in case of success, false otherwise. + */ +inline bool meta_sequence_container::clear() { + return resize_fn(storage, 0u); +} + +/** + * @brief Returns an iterator to the first element of a container. + * @return An iterator to the first element of the container. + */ +[[nodiscard]] inline meta_sequence_container::iterator meta_sequence_container::begin() { + return iter_fn(*ctx, storage, false); +} + +/** + * @brief Returns an iterator that is past the last element of a container. + * @return An iterator that is past the last element of the container. + */ +[[nodiscard]] inline meta_sequence_container::iterator meta_sequence_container::end() { + return iter_fn(*ctx, storage, true); +} + +/** + * @brief Inserts an element at a specified location of a container. + * @param it Iterator before which the element will be inserted. + * @param value Element value to insert. + * @return A possibly invalid iterator to the inserted element. + */ +inline meta_sequence_container::iterator meta_sequence_container::insert(iterator it, meta_any value) { + return insert_or_erase_fn(*ctx, storage, it.handle, value); +} + +/** + * @brief Removes a given element from a container. + * @param it Iterator to the element to remove. + * @return A possibly invalid iterator following the last removed element. + */ +inline meta_sequence_container::iterator meta_sequence_container::erase(iterator it) { + return insert(std::move(it), {}); +} + +/** + * @brief Returns a reference to the element at a given location of a container + * (no bounds checking is performed). + * @param pos The position of the element to return. + * @return A reference to the requested element properly wrapped. + */ +[[nodiscard]] inline meta_any meta_sequence_container::operator[](const size_type pos) { + auto it = begin(); + it.operator++(static_cast(pos) - 1); + return *it; +} + +/** + * @brief Returns false if a proxy is invalid, true otherwise. + * @return False if the proxy is invalid, true otherwise. + */ +[[nodiscard]] inline meta_sequence_container::operator bool() const noexcept { + return static_cast(storage); +} + +/** + * @brief Returns true if a container is also key-only, false otherwise. + * @return True if the associative container is also key-only, false otherwise. + */ +[[nodiscard]] inline bool meta_associative_container::key_only() const noexcept { + return key_only_container; +} + +/** + * @brief Returns the meta key type of a container. + * @return The meta key type of the a container. + */ +[[nodiscard]] inline meta_type meta_associative_container::key_type() const noexcept { + return key_type_node ? meta_type{*ctx, key_type_node(internal::meta_context::from(*ctx))} : meta_type{}; +} + +/** + * @brief Returns the meta mapped type of a container. + * @return The meta mapped type of the a container. + */ +[[nodiscard]] inline meta_type meta_associative_container::mapped_type() const noexcept { + return mapped_type_node ? meta_type{*ctx, mapped_type_node(internal::meta_context::from(*ctx))} : meta_type{}; +} + +/*! @copydoc meta_sequence_container::value_type */ +[[nodiscard]] inline meta_type meta_associative_container::value_type() const noexcept { + return value_type_node ? meta_type{*ctx, value_type_node(internal::meta_context::from(*ctx))} : meta_type{}; +} + +/*! @copydoc meta_sequence_container::size */ +[[nodiscard]] inline meta_associative_container::size_type meta_associative_container::size() const noexcept { + return size_fn(storage); +} + +/*! @copydoc meta_sequence_container::clear */ +inline bool meta_associative_container::clear() { + return clear_fn(storage); +} + +/*! @copydoc meta_sequence_container::begin */ +[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::begin() { + return iter_fn(*ctx, storage, false); +} + +/*! @copydoc meta_sequence_container::end */ +[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::end() { + return iter_fn(*ctx, storage, true); +} + +/** + * @brief Inserts a key only element into a container. + * @param key The key of the element to insert. + * @return A bool denoting whether the insertion took place. + */ +inline bool meta_associative_container::insert(meta_any key) { + meta_any value{*ctx, std::in_place_type}; + return (insert_or_erase_fn(storage, key, value) != 0u); +} + +/** + * @brief Inserts a key/value element into a container. + * @param key The key of the element to insert. + * @param value The value of the element to insert. + * @return A bool denoting whether the insertion took place. + */ +inline bool meta_associative_container::insert(meta_any key, meta_any value) { + return (insert_or_erase_fn(storage, key, value) != 0u); +} + +/** + * @brief Removes the specified element from a container. + * @param key The key of the element to remove. + * @return A bool denoting whether the removal took place. + */ +inline meta_associative_container::size_type meta_associative_container::erase(meta_any key) { + return insert(std::move(key), meta_any{meta_ctx_arg, *ctx}); +} + +/** + * @brief Returns an iterator to the element with a given key, if any. + * @param key The key of the element to search. + * @return An iterator to the element with the given key, if any. + */ +[[nodiscard]] inline meta_associative_container::iterator meta_associative_container::find(meta_any key) { + return find_fn(*ctx, storage, key); +} + +/** + * @brief Returns false if a proxy is invalid, true otherwise. + * @return False if the proxy is invalid, true otherwise. + */ +[[nodiscard]] inline meta_associative_container::operator bool() const noexcept { + return static_cast(storage); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/node.hpp b/LiteLoader/third-party/include/entt/meta/node.hpp new file mode 100644 index 0000000..4dfdd54 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/node.hpp @@ -0,0 +1,236 @@ +#ifndef ENTT_META_NODE_HPP +#define ENTT_META_NODE_HPP + +#include +#include +#include +#include +#include "../config/config.h" +#include "../container/dense_map.hpp" +#include "../core/attribute.h" +#include "../core/enum.hpp" +#include "../core/fwd.hpp" +#include "../core/type_info.hpp" +#include "../core/type_traits.hpp" +#include "../core/utility.hpp" +#include "context.hpp" +#include "type_traits.hpp" + +namespace entt { + +class meta_any; +class meta_type; +struct meta_handle; + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +enum class meta_traits : std::uint32_t { + is_none = 0x0000, + is_const = 0x0001, + is_static = 0x0002, + is_arithmetic = 0x0004, + is_integral = 0x0008, + is_signed = 0x0010, + is_array = 0x0020, + is_enum = 0x0040, + is_class = 0x0080, + is_meta_pointer_like = 0x0100, + is_meta_sequence_container = 0x0200, + is_meta_associative_container = 0x0400, + _entt_enum_as_bitmask +}; + +struct meta_type_node; + +struct meta_prop_node { + meta_type_node (*type)(const meta_context &) noexcept {}; + std::shared_ptr value{}; +}; + +struct meta_base_node { + meta_type_node (*type)(const meta_context &) noexcept {}; + const void *(*cast)(const void *) noexcept {}; +}; + +struct meta_conv_node { + meta_any (*conv)(const meta_ctx &, const void *){}; +}; + +struct meta_ctor_node { + using size_type = std::size_t; + + size_type arity{0u}; + meta_type (*arg)(const meta_ctx &, const size_type) noexcept {}; + meta_any (*invoke)(const meta_ctx &, meta_any *const){}; +}; + +struct meta_dtor_node { + void (*dtor)(void *){}; +}; + +struct meta_data_node { + using size_type = std::size_t; + + meta_traits traits{meta_traits::is_none}; + size_type arity{0u}; + meta_type_node (*type)(const meta_context &) noexcept {}; + meta_type (*arg)(const meta_ctx &, const size_type) noexcept {}; + bool (*set)(meta_handle, meta_any){}; + meta_any (*get)(const meta_ctx &, meta_handle){}; + dense_map prop{}; +}; + +struct meta_func_node { + using size_type = std::size_t; + + meta_traits traits{meta_traits::is_none}; + size_type arity{0u}; + meta_type_node (*ret)(const meta_context &) noexcept {}; + meta_type (*arg)(const meta_ctx &, const size_type) noexcept {}; + meta_any (*invoke)(const meta_ctx &, meta_handle, meta_any *const){}; + std::shared_ptr next{}; + dense_map prop{}; +}; + +struct meta_template_node { + using size_type = std::size_t; + + size_type arity{0u}; + meta_type_node (*type)(const meta_context &) noexcept {}; + meta_type_node (*arg)(const meta_context &, const size_type) noexcept {}; +}; + +struct meta_type_descriptor { + dense_map ctor{}; + dense_map base{}; + dense_map conv{}; + dense_map data{}; + dense_map func{}; + dense_map prop{}; +}; + +struct meta_type_node { + using size_type = std::size_t; + + const type_info *info{}; + id_type id{}; + meta_traits traits{meta_traits::is_none}; + size_type size_of{0u}; + meta_type_node (*resolve)(const meta_context &) noexcept {}; + meta_type_node (*remove_pointer)(const meta_context &) noexcept {}; + meta_any (*default_constructor)(const meta_ctx &){}; + double (*conversion_helper)(void *, const void *){}; + meta_any (*from_void)(const meta_ctx &, void *, const void *){}; + meta_template_node templ{}; + meta_dtor_node dtor{}; + std::shared_ptr details{}; +}; + +template +meta_type_node resolve(const meta_context &) noexcept; + +template +[[nodiscard]] auto meta_arg_node(const meta_context &context, type_list, [[maybe_unused]] const std::size_t index) noexcept { + std::size_t pos{}; + meta_type_node (*value)(const meta_context &) noexcept = nullptr; + ((value = (pos++ == index ? &resolve>> : value)), ...); + ENTT_ASSERT(value != nullptr, "Out of bounds"); + return value(context); +} + +[[nodiscard]] inline const void *try_cast(const meta_context &context, const meta_type_node &from, const meta_type_node &to, const void *instance) noexcept { + if(from.info && to.info && *from.info == *to.info) { + return instance; + } + + if(from.details) { + for(auto &&curr: from.details->base) { + if(const void *elem = try_cast(context, curr.second.type(context), to, curr.second.cast(instance)); elem) { + return elem; + } + } + } + + return nullptr; +} + +[[nodiscard]] inline const meta_type_node *try_resolve(const meta_context &context, const type_info &info) noexcept { + const auto it = context.value.find(info.hash()); + return it != context.value.end() ? &it->second : nullptr; +} + +template +[[nodiscard]] meta_type_node resolve(const meta_context &context) noexcept { + static_assert(std::is_same_v>>, "Invalid type"); + + if(auto *elem = try_resolve(context, type_id()); elem) { + return *elem; + } + + meta_type_node node{ + &type_id(), + type_id().hash(), + (std::is_arithmetic_v ? meta_traits::is_arithmetic : meta_traits::is_none) + | (std::is_integral_v ? meta_traits::is_integral : meta_traits::is_none) + | (std::is_signed_v ? meta_traits::is_signed : meta_traits::is_none) + | (std::is_array_v ? meta_traits::is_array : meta_traits::is_none) + | (std::is_enum_v ? meta_traits::is_enum : meta_traits::is_none) + | (std::is_class_v ? meta_traits::is_class : meta_traits::is_none) + | (is_meta_pointer_like_v ? meta_traits::is_meta_pointer_like : meta_traits::is_none) + | (is_complete_v> ? meta_traits::is_meta_sequence_container : meta_traits::is_none) + | (is_complete_v> ? meta_traits::is_meta_associative_container : meta_traits::is_none), + size_of_v, + &resolve, + &resolve>>}; + + if constexpr(std::is_default_constructible_v) { + node.default_constructor = +[](const meta_ctx &ctx) { + return meta_any{ctx, std::in_place_type}; + }; + } + + if constexpr(std::is_arithmetic_v) { + node.conversion_helper = +[](void *bin, const void *value) { + return bin ? static_cast(*static_cast(bin) = static_cast(*static_cast(value))) : static_cast(*static_cast(value)); + }; + } else if constexpr(std::is_enum_v) { + node.conversion_helper = +[](void *bin, const void *value) { + return bin ? static_cast(*static_cast(bin) = static_cast(static_cast>(*static_cast(value)))) : static_cast(*static_cast(value)); + }; + } + + if constexpr(!std::is_same_v && !std::is_function_v) { + node.from_void = +[](const meta_ctx &ctx, void *element, const void *as_const) { + if(element) { + return meta_any{ctx, std::in_place_type &>, *static_cast *>(element)}; + } + + return meta_any{ctx, std::in_place_type &>, *static_cast *>(as_const)}; + }; + } + + if constexpr(is_complete_v>) { + node.templ = meta_template_node{ + meta_template_traits::args_type::size, + &resolve::class_type>, + +[](const meta_context &area, const std::size_t index) noexcept { return meta_arg_node(area, typename meta_template_traits::args_type{}, index); }}; + } + + return node; +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/meta/pointer.hpp b/LiteLoader/third-party/include/entt/meta/pointer.hpp similarity index 86% rename from LiteLoader/Header/third-party/entt/meta/pointer.hpp rename to LiteLoader/third-party/include/entt/meta/pointer.hpp index 62a2453..58d2f10 100644 --- a/LiteLoader/Header/third-party/entt/meta/pointer.hpp +++ b/LiteLoader/third-party/include/entt/meta/pointer.hpp @@ -1,24 +1,19 @@ #ifndef ENTT_META_POINTER_HPP #define ENTT_META_POINTER_HPP - #include #include #include "type_traits.hpp" - namespace entt { - /** * @brief Makes plain pointers pointer-like types for the meta system. * @tparam Type Element type. */ template struct is_meta_pointer_like - : std::true_type -{}; - + : std::true_type {}; /** * @brief Partial specialization used to reject pointers to arrays. @@ -26,10 +21,8 @@ struct is_meta_pointer_like * @tparam N Number of elements of the array. */ template -struct is_meta_pointer_like - : std::false_type -{}; - +struct is_meta_pointer_like + : std::false_type {}; /** * @brief Makes `std::shared_ptr`s of any type pointer-like types for the meta @@ -38,9 +31,7 @@ struct is_meta_pointer_like */ template struct is_meta_pointer_like> - : std::true_type -{}; - + : std::true_type {}; /** * @brief Makes `std::unique_ptr`s of any type pointer-like types for the meta @@ -50,11 +41,8 @@ struct is_meta_pointer_like> */ template struct is_meta_pointer_like> - : std::true_type -{}; - - -} + : std::true_type {}; +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/meta/policy.hpp b/LiteLoader/third-party/include/entt/meta/policy.hpp new file mode 100644 index 0000000..0744816 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/policy.hpp @@ -0,0 +1,86 @@ +#ifndef ENTT_META_POLICY_HPP +#define ENTT_META_POLICY_HPP + +#include + +namespace entt { + +/*! @brief Empty class type used to request the _as ref_ policy. */ +struct as_ref_t final { + /** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + template + static constexpr bool value = std::is_reference_v && !std::is_const_v>; + /** + * Internal details not to be documented. + * @endcond + */ +}; + +/*! @brief Empty class type used to request the _as cref_ policy. */ +struct as_cref_t final { + /** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + template + static constexpr bool value = std::is_reference_v; + /** + * Internal details not to be documented. + * @endcond + */ +}; + +/*! @brief Empty class type used to request the _as-is_ policy. */ +struct as_is_t final { + /** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + template + static constexpr bool value = true; + /** + * Internal details not to be documented. + * @endcond + */ +}; + +/*! @brief Empty class type used to request the _as void_ policy. */ +struct as_void_t final { + /** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + template + static constexpr bool value = true; + /** + * Internal details not to be documented. + * @endcond + */ +}; + +/** + * @brief Provides the member constant `value` to true if a type also is a meta + * policy, false otherwise. + * @tparam Type Type to check. + */ +template +struct is_meta_policy + : std::disjunction< + std::is_same, + std::is_same, + std::is_same, + std::is_same> {}; + +/** + * @brief Helper variable template. + * @tparam Type Type to check. + */ +template +inline constexpr bool is_meta_policy_v = is_meta_policy::value; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/range.hpp b/LiteLoader/third-party/include/entt/meta/range.hpp new file mode 100644 index 0000000..e3d8154 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/range.hpp @@ -0,0 +1,150 @@ +#ifndef ENTT_META_RANGE_HPP +#define ENTT_META_RANGE_HPP + +#include +#include +#include +#include "../core/fwd.hpp" +#include "../core/iterator.hpp" +#include "context.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +struct meta_range_iterator final { + using difference_type = std::ptrdiff_t; + using value_type = std::pair; + using pointer = input_iterator_pointer; + using reference = value_type; + using iterator_category = std::input_iterator_tag; + + meta_range_iterator() noexcept + : it{}, + ctx{} {} + + meta_range_iterator(const meta_ctx &area, const It iter) noexcept + : it{iter}, + ctx{&area} {} + + meta_range_iterator &operator++() noexcept { + return ++it, *this; + } + + meta_range_iterator operator++(int) noexcept { + meta_range_iterator orig = *this; + return ++(*this), orig; + } + + constexpr meta_range_iterator &operator--() noexcept { + return --it, *this; + } + + constexpr meta_range_iterator operator--(int) noexcept { + meta_range_iterator orig = *this; + return operator--(), orig; + } + + constexpr meta_range_iterator &operator+=(const difference_type value) noexcept { + it += value; + return *this; + } + + constexpr meta_range_iterator operator+(const difference_type value) const noexcept { + meta_range_iterator copy = *this; + return (copy += value); + } + + constexpr meta_range_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr meta_range_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return {it[value].first, Type{*ctx, it[value].second}}; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return {it->first, Type{*ctx, it->second}}; + } + + template + friend constexpr std::ptrdiff_t operator-(const meta_range_iterator &, const meta_range_iterator &) noexcept; + + template + friend constexpr bool operator==(const meta_range_iterator &, const meta_range_iterator &) noexcept; + + template + friend constexpr bool operator<(const meta_range_iterator &, const meta_range_iterator &) noexcept; + +private: + It it; + const meta_ctx *ctx; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return lhs.it - rhs.it; +} + +template +[[nodiscard]] constexpr bool operator==(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return lhs.it < rhs.it; +} + +template +[[nodiscard]] constexpr bool operator>(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return rhs < lhs; +} + +template +[[nodiscard]] constexpr bool operator<=(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const meta_range_iterator &lhs, const meta_range_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Iterable range to use to iterate all types of meta objects. + * @tparam Type Type of meta objects returned. + * @tparam It Type of forward iterator. + */ +template +using meta_range = iterable_adaptor>; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/meta/resolve.hpp b/LiteLoader/third-party/include/entt/meta/resolve.hpp new file mode 100644 index 0000000..9360db5 --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/resolve.hpp @@ -0,0 +1,102 @@ +#ifndef ENTT_META_RESOLVE_HPP +#define ENTT_META_RESOLVE_HPP + +#include +#include "../core/type_info.hpp" +#include "../locator/locator.hpp" +#include "context.hpp" +#include "meta.hpp" +#include "node.hpp" +#include "range.hpp" + +namespace entt { + +/** + * @brief Returns the meta type associated with a given type. + * @tparam Type Type to use to search for a meta type. + * @param ctx The context from which to search for meta types. + * @return The meta type associated with the given type, if any. + */ +template +[[nodiscard]] meta_type resolve(const meta_ctx &ctx) noexcept { + auto &&context = internal::meta_context::from(ctx); + return {ctx, internal::resolve>>(context)}; +} + +/** + * @brief Returns the meta type associated with a given type. + * @tparam Type Type to use to search for a meta type. + * @return The meta type associated with the given type, if any. + */ +template +[[nodiscard]] meta_type resolve() noexcept { + return resolve(locator::value_or()); +} + +/** + * @brief Returns a range to use to visit all meta types. + * @param ctx The context from which to search for meta types. + * @return An iterable range to use to visit all meta types. + */ +[[nodiscard]] inline meta_range resolve(const meta_ctx &ctx) noexcept { + auto &&context = internal::meta_context::from(ctx); + return {{ctx, context.value.cbegin()}, {ctx, context.value.cend()}}; +} + +/** + * @brief Returns a range to use to visit all meta types. + * @return An iterable range to use to visit all meta types. + */ +[[nodiscard]] inline meta_range resolve() noexcept { + return resolve(locator::value_or()); +} + +/** + * @brief Returns the meta type associated with a given identifier, if any. + * @param ctx The context from which to search for meta types. + * @param id Unique identifier. + * @return The meta type associated with the given identifier, if any. + */ +[[nodiscard]] inline meta_type resolve(const meta_ctx &ctx, const id_type id) noexcept { + for(auto &&curr: resolve(ctx)) { + if(curr.second.id() == id) { + return curr.second; + } + } + + return meta_type{}; +} + +/** + * @brief Returns the meta type associated with a given identifier, if any. + * @param id Unique identifier. + * @return The meta type associated with the given identifier, if any. + */ +[[nodiscard]] inline meta_type resolve(const id_type id) noexcept { + return resolve(locator::value_or(), id); +} + +/** + * @brief Returns the meta type associated with a given type info object. + * @param ctx The context from which to search for meta types. + * @param info The type info object of the requested type. + * @return The meta type associated with the given type info object, if any. + */ +[[nodiscard]] inline meta_type resolve(const meta_ctx &ctx, const type_info &info) noexcept { + auto &&context = internal::meta_context::from(ctx); + const auto *elem = internal::try_resolve(context, info); + return elem ? meta_type{ctx, *elem} : meta_type{}; +} + +/** + * @brief Returns the meta type associated with a given type info object. + * @param info The type info object of the requested type. + * @return The meta type associated with the given type info object, if any. + */ +[[nodiscard]] inline meta_type resolve(const type_info &info) noexcept { + return resolve(locator::value_or(), info); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/meta/template.hpp b/LiteLoader/third-party/include/entt/meta/template.hpp similarity index 84% rename from LiteLoader/Header/third-party/entt/meta/template.hpp rename to LiteLoader/third-party/include/entt/meta/template.hpp index 11f1d25..0009b51 100644 --- a/LiteLoader/Header/third-party/entt/meta/template.hpp +++ b/LiteLoader/third-party/include/entt/meta/template.hpp @@ -1,24 +1,20 @@ #ifndef ENTT_META_TEMPLATE_HPP #define ENTT_META_TEMPLATE_HPP - #include "../core/type_traits.hpp" - namespace entt { - /*! @brief Utility class to disambiguate class templates. */ -template typename> +template class> struct meta_class_template_tag {}; - /** * @brief General purpose traits class for generating meta template information. * @tparam Clazz Type of class template. * @tparam Args Types of template arguments. */ -template typename Clazz, typename... Args> +template class Clazz, typename... Args> struct meta_template_traits> { /*! @brief Wrapped class template. */ using class_type = meta_class_template_tag; @@ -26,8 +22,6 @@ struct meta_template_traits> { using args_type = type_list; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/meta/type_traits.hpp b/LiteLoader/third-party/include/entt/meta/type_traits.hpp similarity index 61% rename from LiteLoader/Header/third-party/entt/meta/type_traits.hpp rename to LiteLoader/third-party/include/entt/meta/type_traits.hpp index 8fe91aa..51b69f6 100644 --- a/LiteLoader/Header/third-party/entt/meta/type_traits.hpp +++ b/LiteLoader/third-party/include/entt/meta/type_traits.hpp @@ -1,13 +1,11 @@ #ifndef ENTT_META_TYPE_TRAITS_HPP #define ENTT_META_TYPE_TRAITS_HPP - #include - +#include namespace entt { - /** * @brief Traits class template to be specialized to enable support for meta * template information. @@ -15,7 +13,6 @@ namespace entt { template struct meta_template_traits; - /** * @brief Traits class template to be specialized to enable support for meta * sequence containers. @@ -23,7 +20,6 @@ struct meta_template_traits; template struct meta_sequence_container_traits; - /** * @brief Traits class template to be specialized to enable support for meta * associative containers. @@ -31,31 +27,6 @@ struct meta_sequence_container_traits; template struct meta_associative_container_traits; - -/** - * @brief Provides the member constant `value` to true if a meta associative - * container claims to wrap a key-only type, false otherwise. - * @tparam Type Potentially key-only meta associative container type. - */ -template -struct is_key_only_meta_associative_container: std::true_type {}; - - -/*! @copydoc is_key_only_meta_associative_container */ -template -struct is_key_only_meta_associative_container::type::mapped_type>> - : std::false_type -{}; - - -/** - * @brief Helper variable template. - * @tparam Type Potentially key-only meta associative container type. - */ -template -inline constexpr auto is_key_only_meta_associative_container_v = is_key_only_meta_associative_container::value; - - /** * @brief Provides the member constant `value` to true if a given type is a * pointer-like type from the point of view of the meta system, false otherwise. @@ -64,7 +35,6 @@ inline constexpr auto is_key_only_meta_associative_container_v = is_key_only_met template struct is_meta_pointer_like: std::false_type {}; - /** * @brief Partial specialization to ensure that const pointer-like types are * also accepted. @@ -73,7 +43,6 @@ struct is_meta_pointer_like: std::false_type {}; template struct is_meta_pointer_like: is_meta_pointer_like {}; - /** * @brief Helper variable template. * @tparam Type Potentially pointer-like type. @@ -81,8 +50,6 @@ struct is_meta_pointer_like: is_meta_pointer_like {}; template inline constexpr auto is_meta_pointer_like_v = is_meta_pointer_like::value; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/meta/utility.hpp b/LiteLoader/third-party/include/entt/meta/utility.hpp new file mode 100644 index 0000000..3ee98ee --- /dev/null +++ b/LiteLoader/third-party/include/entt/meta/utility.hpp @@ -0,0 +1,539 @@ +#ifndef ENTT_META_UTILITY_HPP +#define ENTT_META_UTILITY_HPP + +#include +#include +#include +#include +#include "../core/type_traits.hpp" +#include "../locator/locator.hpp" +#include "meta.hpp" +#include "node.hpp" +#include "policy.hpp" + +namespace entt { + +/** + * @brief Meta function descriptor traits. + * @tparam Ret Function return type. + * @tparam Args Function arguments. + * @tparam Static Function staticness. + * @tparam Const Function constness. + */ +template +struct meta_function_descriptor_traits { + /*! @brief Meta function return type. */ + using return_type = Ret; + /*! @brief Meta function arguments. */ + using args_type = Args; + + /*! @brief True if the meta function is static, false otherwise. */ + static constexpr bool is_static = Static; + /*! @brief True if the meta function is const, false otherwise. */ + static constexpr bool is_const = Const; +}; + +/*! @brief Primary template isn't defined on purpose. */ +template +struct meta_function_descriptor; + +/** + * @brief Meta function descriptor. + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Ret Function return type. + * @tparam Class Actual owner of the member function. + * @tparam Args Function arguments. + */ +template +struct meta_function_descriptor + : meta_function_descriptor_traits< + Ret, + std::conditional_t, type_list, type_list>, + !std::is_base_of_v, + true> {}; + +/** + * @brief Meta function descriptor. + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Ret Function return type. + * @tparam Class Actual owner of the member function. + * @tparam Args Function arguments. + */ +template +struct meta_function_descriptor + : meta_function_descriptor_traits< + Ret, + std::conditional_t, type_list, type_list>, + !std::is_base_of_v, + false> {}; + +/** + * @brief Meta function descriptor. + * @tparam Type Reflected type to which the meta data is associated. + * @tparam Class Actual owner of the data member. + * @tparam Ret Data member type. + */ +template +struct meta_function_descriptor + : meta_function_descriptor_traits< + Ret &, + std::conditional_t, type_list<>, type_list>, + !std::is_base_of_v, + false> {}; + +/** + * @brief Meta function descriptor. + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Ret Function return type. + * @tparam MaybeType First function argument. + * @tparam Args Other function arguments. + */ +template +struct meta_function_descriptor + : meta_function_descriptor_traits< + Ret, + std::conditional_t>, Type>, type_list, type_list>, + !std::is_base_of_v>, Type>, + std::is_base_of_v>, Type> && std::is_const_v>> {}; + +/** + * @brief Meta function descriptor. + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Ret Function return type. + */ +template +struct meta_function_descriptor + : meta_function_descriptor_traits< + Ret, + type_list<>, + true, + false> {}; + +/** + * @brief Meta function helper. + * + * Converts a function type to be associated with a reflected type into its meta + * function descriptor. + * + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Candidate The actual function to associate with the reflected type. + */ +template +class meta_function_helper { + template + static constexpr meta_function_descriptor get_rid_of_noexcept(Ret (Class::*)(Args...) const); + + template + static constexpr meta_function_descriptor get_rid_of_noexcept(Ret (Class::*)(Args...)); + + template + static constexpr meta_function_descriptor get_rid_of_noexcept(Ret Class::*); + + template + static constexpr meta_function_descriptor get_rid_of_noexcept(Ret (*)(Args...)); + + template + static constexpr meta_function_descriptor get_rid_of_noexcept(Class); + +public: + /*! @brief The meta function descriptor of the given function. */ + using type = decltype(get_rid_of_noexcept(std::declval())); +}; + +/** + * @brief Helper type. + * @tparam Type Reflected type to which the meta function is associated. + * @tparam Candidate The actual function to associate with the reflected type. + */ +template +using meta_function_helper_t = typename meta_function_helper::type; + +/** + * @brief Wraps a value depending on the given policy. + * + * This function always returns a wrapped value in the requested context.
+ * Therefore, if the passed value is itself a wrapped object with a different + * context, it undergoes a rebinding to the requested context. + * + * @tparam Policy Optional policy (no policy set by default). + * @tparam Type Type of value to wrap. + * @param ctx The context from which to search for meta types. + * @param value Value to wrap. + * @return A meta any containing the returned value, if any. + */ +template +std::enable_if_t, meta_any> meta_dispatch(const meta_ctx &ctx, [[maybe_unused]] Type &&value) { + if constexpr(std::is_same_v) { + return meta_any{ctx, std::in_place_type}; + } else if constexpr(std::is_same_v) { + return meta_any{ctx, std::in_place_type, value}; + } else if constexpr(std::is_same_v) { + static_assert(std::is_lvalue_reference_v, "Invalid type"); + return meta_any{ctx, std::in_place_type &>, std::as_const(value)}; + } else { + return meta_any{ctx, std::forward(value)}; + } +} + +/** + * @brief Wraps a value depending on the given policy. + * @tparam Policy Optional policy (no policy set by default). + * @tparam Type Type of value to wrap. + * @param value Value to wrap. + * @return A meta any containing the returned value, if any. + */ +template +std::enable_if_t, meta_any> meta_dispatch(Type &&value) { + return meta_dispatch(locator::value_or(), std::forward(value)); +} + +/** + * @brief Returns the meta type of the i-th element of a list of arguments. + * @tparam Type Type list of the actual types of arguments. + * @param ctx The context from which to search for meta types. + * @param index The index of the element for which to return the meta type. + * @return The meta type of the i-th element of the list of arguments. + */ +template +[[nodiscard]] static meta_type meta_arg(const meta_ctx &ctx, const std::size_t index) noexcept { + auto &&context = internal::meta_context::from(ctx); + return {ctx, internal::meta_arg_node(context, Type{}, index)}; +} + +/** + * @brief Returns the meta type of the i-th element of a list of arguments. + * @tparam Type Type list of the actual types of arguments. + * @param index The index of the element for which to return the meta type. + * @return The meta type of the i-th element of the list of arguments. + */ +template +[[nodiscard]] static meta_type meta_arg(const std::size_t index) noexcept { + return meta_arg(locator::value_or(), index); +} + +/** + * @brief Sets the value of a given variable. + * @tparam Type Reflected type to which the variable is associated. + * @tparam Data The actual variable to set. + * @param instance An opaque instance of the underlying type, if required. + * @param value Parameter to use to set the variable. + * @return True in case of success, false otherwise. + */ +template +[[nodiscard]] bool meta_setter([[maybe_unused]] meta_handle instance, [[maybe_unused]] meta_any value) { + if constexpr(!std::is_same_v && !std::is_same_v) { + if constexpr(std::is_member_function_pointer_v || std::is_function_v>>) { + using descriptor = meta_function_helper_t; + using data_type = type_list_element_t; + + if(auto *const clazz = instance->try_cast(); clazz && value.allow_cast()) { + std::invoke(Data, *clazz, value.cast()); + return true; + } + } else if constexpr(std::is_member_object_pointer_v) { + using data_type = std::remove_reference_t::return_type>; + + if constexpr(!std::is_array_v && !std::is_const_v) { + if(auto *const clazz = instance->try_cast(); clazz && value.allow_cast()) { + std::invoke(Data, *clazz) = value.cast(); + return true; + } + } + } else { + using data_type = std::remove_reference_t; + + if constexpr(!std::is_array_v && !std::is_const_v) { + if(value.allow_cast()) { + *Data = value.cast(); + return true; + } + } + } + } + + return false; +} + +/** + * @brief Gets the value of a given variable. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Reflected type to which the variable is associated. + * @tparam Data The actual variable to get. + * @tparam Policy Optional policy (no policy set by default). + * @param ctx The context from which to search for meta types. + * @param instance An opaque instance of the underlying type, if required. + * @return A meta any containing the value of the underlying variable. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_getter(const meta_ctx &ctx, [[maybe_unused]] meta_handle instance) { + if constexpr(std::is_member_pointer_v || std::is_function_v>>) { + if constexpr(!std::is_array_v>>>) { + if constexpr(std::is_invocable_v) { + if(auto *clazz = instance->try_cast(); clazz) { + return meta_dispatch(ctx, std::invoke(Data, *clazz)); + } + } + + if constexpr(std::is_invocable_v) { + if(auto *fallback = instance->try_cast(); fallback) { + return meta_dispatch(ctx, std::invoke(Data, *fallback)); + } + } + } + + return meta_any{meta_ctx_arg, ctx}; + } else if constexpr(std::is_pointer_v) { + if constexpr(std::is_array_v>) { + return meta_any{meta_ctx_arg, ctx}; + } else { + return meta_dispatch(ctx, *Data); + } + } else { + return meta_dispatch(ctx, Data); + } +} + +/** + * @brief Gets the value of a given variable. + * @tparam Type Reflected type to which the variable is associated. + * @tparam Data The actual variable to get. + * @tparam Policy Optional policy (no policy set by default). + * @param instance An opaque instance of the underlying type, if required. + * @return A meta any containing the value of the underlying variable. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_getter(meta_handle instance) { + return meta_getter(locator::value_or(), std::move(instance)); +} + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +[[nodiscard]] meta_any meta_invoke_with_args(const meta_ctx &ctx, Candidate &&candidate, Args &&...args) { + if constexpr(std::is_same_v(candidate), args...)), void>) { + std::invoke(std::forward(candidate), args...); + return meta_any{ctx, std::in_place_type}; + } else { + return meta_dispatch(ctx, std::invoke(std::forward(candidate), args...)); + } +} + +template +[[nodiscard]] meta_any meta_invoke(const meta_ctx &ctx, [[maybe_unused]] meta_handle instance, Candidate &&candidate, [[maybe_unused]] meta_any *args, std::index_sequence) { + using descriptor = meta_function_helper_t>; + + if constexpr(std::is_invocable_v, const Type &, type_list_element_t...>) { + if(const auto *const clazz = instance->try_cast(); clazz && ((args + Index)->allow_cast>() && ...)) { + return meta_invoke_with_args(ctx, std::forward(candidate), *clazz, (args + Index)->cast>()...); + } + } else if constexpr(std::is_invocable_v, Type &, type_list_element_t...>) { + if(auto *const clazz = instance->try_cast(); clazz && ((args + Index)->allow_cast>() && ...)) { + return meta_invoke_with_args(ctx, std::forward(candidate), *clazz, (args + Index)->cast>()...); + } + } else { + if(((args + Index)->allow_cast>() && ...)) { + return meta_invoke_with_args(ctx, std::forward(candidate), (args + Index)->cast>()...); + } + } + + return meta_any{meta_ctx_arg, ctx}; +} + +template +[[nodiscard]] meta_any meta_construct(const meta_ctx &ctx, meta_any *const args, std::index_sequence) { + if(((args + Index)->allow_cast() && ...)) { + return meta_any{ctx, std::in_place_type, (args + Index)->cast()...}; + } + + return meta_any{meta_ctx_arg, ctx}; +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Tries to _invoke_ an object given a list of erased parameters. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Reflected type to which the object to _invoke_ is associated. + * @tparam Policy Optional policy (no policy set by default). + * @param ctx The context from which to search for meta types. + * @tparam Candidate The type of the actual object to _invoke_. + * @param instance An opaque instance of the underlying type, if required. + * @param candidate The actual object to _invoke_. + * @param args Parameters to use to _invoke_ the object. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_invoke(const meta_ctx &ctx, meta_handle instance, Candidate &&candidate, meta_any *const args) { + return internal::meta_invoke(ctx, std::move(instance), std::forward(candidate), args, std::make_index_sequence>::args_type::size>{}); +} + +/** + * @brief Tries to _invoke_ an object given a list of erased parameters. + * @tparam Type Reflected type to which the object to _invoke_ is associated. + * @tparam Policy Optional policy (no policy set by default). + * @tparam Candidate The type of the actual object to _invoke_. + * @param instance An opaque instance of the underlying type, if required. + * @param candidate The actual object to _invoke_. + * @param args Parameters to use to _invoke_ the object. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_invoke(meta_handle instance, Candidate &&candidate, meta_any *const args) { + return meta_invoke(locator::value_or(), std::move(instance), std::forward(candidate), args); +} + +/** + * @brief Tries to invoke a function given a list of erased parameters. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Reflected type to which the function is associated. + * @tparam Candidate The actual function to invoke. + * @tparam Policy Optional policy (no policy set by default). + * @param ctx The context from which to search for meta types. + * @param instance An opaque instance of the underlying type, if required. + * @param args Parameters to use to invoke the function. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_invoke(const meta_ctx &ctx, meta_handle instance, meta_any *const args) { + return internal::meta_invoke(ctx, std::move(instance), Candidate, args, std::make_index_sequence>::args_type::size>{}); +} + +/** + * @brief Tries to invoke a function given a list of erased parameters. + * @tparam Type Reflected type to which the function is associated. + * @tparam Candidate The actual function to invoke. + * @tparam Policy Optional policy (no policy set by default). + * @param instance An opaque instance of the underlying type, if required. + * @param args Parameters to use to invoke the function. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_invoke(meta_handle instance, meta_any *const args) { + return meta_invoke(locator::value_or(), std::move(instance), args); +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Actual type of the instance to construct. + * @tparam Args Types of arguments expected. + * @param ctx The context from which to search for meta types. + * @param args Parameters to use to construct the instance. + * @return A meta any containing the new instance, if any. + */ +template +[[nodiscard]] meta_any meta_construct(const meta_ctx &ctx, meta_any *const args) { + return internal::meta_construct(ctx, args, std::index_sequence_for{}); +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * @tparam Type Actual type of the instance to construct. + * @tparam Args Types of arguments expected. + * @param args Parameters to use to construct the instance. + * @return A meta any containing the new instance, if any. + */ +template +[[nodiscard]] meta_any meta_construct(meta_any *const args) { + return meta_construct(locator::value_or(), args); +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Reflected type to which the object to _invoke_ is associated. + * @tparam Policy Optional policy (no policy set by default). + * @tparam Candidate The type of the actual object to _invoke_. + * @param ctx The context from which to search for meta types. + * @param candidate The actual object to _invoke_. + * @param args Parameters to use to _invoke_ the object. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] meta_any meta_construct(const meta_ctx &ctx, Candidate &&candidate, meta_any *const args) { + if constexpr(meta_function_helper_t::is_static || std::is_class_v>>) { + return internal::meta_invoke(ctx, {}, std::forward(candidate), args, std::make_index_sequence>::args_type::size>{}); + } else { + return internal::meta_invoke(ctx, *args, std::forward(candidate), args + 1u, std::make_index_sequence>::args_type::size>{}); + } +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * @tparam Type Reflected type to which the object to _invoke_ is associated. + * @tparam Policy Optional policy (no policy set by default). + * @tparam Candidate The type of the actual object to _invoke_. + * @param candidate The actual object to _invoke_. + * @param args Parameters to use to _invoke_ the object. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_construct(Candidate &&candidate, meta_any *const args) { + return meta_construct(locator::value_or(), std::forward(candidate), args); +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * + * @warning + * The context provided is used only for the return type.
+ * It's up to the caller to bind the arguments to the right context(s). + * + * @tparam Type Reflected type to which the function is associated. + * @tparam Candidate The actual function to invoke. + * @tparam Policy Optional policy (no policy set by default). + * @param ctx The context from which to search for meta types. + * @param args Parameters to use to invoke the function. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_construct(const meta_ctx &ctx, meta_any *const args) { + return meta_construct(ctx, Candidate, args); +} + +/** + * @brief Tries to construct an instance given a list of erased parameters. + * @tparam Type Reflected type to which the function is associated. + * @tparam Candidate The actual function to invoke. + * @tparam Policy Optional policy (no policy set by default). + * @param args Parameters to use to invoke the function. + * @return A meta any containing the returned value, if any. + */ +template +[[nodiscard]] std::enable_if_t, meta_any> meta_construct(meta_any *const args) { + return meta_construct(locator::value_or(), args); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/platform/android-ndk-r17.hpp b/LiteLoader/third-party/include/entt/platform/android-ndk-r17.hpp similarity index 86% rename from LiteLoader/Header/third-party/entt/platform/android-ndk-r17.hpp rename to LiteLoader/third-party/include/entt/platform/android-ndk-r17.hpp index 8527f3e..5696123 100644 --- a/LiteLoader/Header/third-party/entt/platform/android-ndk-r17.hpp +++ b/LiteLoader/third-party/include/entt/platform/android-ndk-r17.hpp @@ -1,37 +1,29 @@ #ifndef ENTT_PLATFORM_ANDROID_NDK_R17_HPP #define ENTT_PLATFORM_ANDROID_NDK_R17_HPP - /** * @cond TURN_OFF_DOXYGEN * Internal details not to be documented. */ - #ifdef __ANDROID__ -#include -#if __NDK_MAJOR__ == 17 - - -#include -#include -#include +# include +# if __NDK_MAJOR__ == 17 +# include +# include +# include namespace std { - namespace internal { - template constexpr auto is_invocable(int) -> decltype(std::invoke(std::declval(), std::declval()...), std::true_type{}); - template constexpr std::false_type is_invocable(...); - template constexpr auto is_invocable_r(int) -> std::enable_if_t(), std::declval()...)), Ret>, std::true_type>; @@ -40,47 +32,36 @@ constexpr auto is_invocable_r(int) template constexpr std::false_type is_invocable_r(...); - -} - +} // namespace internal template struct is_invocable: decltype(internal::is_invocable(0)) {}; - template inline constexpr bool is_invocable_v = std::is_invocable::value; - template struct is_invocable_r: decltype(internal::is_invocable_r(0)) {}; - template inline constexpr bool is_invocable_r_v = std::is_invocable_r::value; - -template +template struct invoke_result { using type = decltype(std::invoke(std::declval(), std::declval()...)); }; - template using invoke_result_t = typename std::invoke_result::type; +} // namespace std -} - - +# endif #endif -#endif - /** * Internal details not to be documented. * @endcond */ - #endif diff --git a/LiteLoader/Header/third-party/entt/poly/fwd.hpp b/LiteLoader/third-party/include/entt/poly/fwd.hpp similarity index 55% rename from LiteLoader/Header/third-party/entt/poly/fwd.hpp rename to LiteLoader/third-party/include/entt/poly/fwd.hpp index 32023e2..f24cdf2 100644 --- a/LiteLoader/Header/third-party/entt/poly/fwd.hpp +++ b/LiteLoader/third-party/include/entt/poly/fwd.hpp @@ -1,26 +1,20 @@ #ifndef ENTT_POLY_FWD_HPP #define ENTT_POLY_FWD_HPP - -#include - +#include namespace entt { - -template)> +template class basic_poly; - /** * @brief Alias declaration for the most common use case. * @tparam Concept Concept descriptor. */ template -using poly = basic_poly; - - -} +using poly = basic_poly; +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/poly/poly.hpp b/LiteLoader/third-party/include/entt/poly/poly.hpp similarity index 67% rename from LiteLoader/Header/third-party/entt/poly/poly.hpp rename to LiteLoader/third-party/include/entt/poly/poly.hpp index d9d10a7..f10419e 100644 --- a/LiteLoader/Header/third-party/entt/poly/poly.hpp +++ b/LiteLoader/third-party/include/entt/poly/poly.hpp @@ -1,29 +1,25 @@ #ifndef ENTT_POLY_POLY_HPP #define ENTT_POLY_POLY_HPP - #include #include #include #include #include -#include "../config/config.h" #include "../core/any.hpp" #include "../core/type_info.hpp" #include "../core/type_traits.hpp" #include "fwd.hpp" - namespace entt { - /*! @brief Inspector class used to infer the type of the virtual table. */ struct poly_inspector { /** * @brief Generic conversion operator (definition only). * @tparam Type Type to which conversion is requested. */ - template + template operator Type &&() const; /** @@ -33,15 +29,14 @@ struct poly_inspector { * @param args The arguments to pass to the function. * @return A poly inspector convertible to any type. */ - template - poly_inspector invoke(Args &&... args) const; + template + poly_inspector invoke(Args &&...args) const; /*! @copydoc invoke */ - template - poly_inspector invoke(Args &&... args); + template + poly_inspector invoke(Args &&...args); }; - /** * @brief Static virtual table factory. * @tparam Concept Concept descriptor. @@ -53,35 +48,35 @@ class poly_vtable { using inspector = typename Concept::template type; template - static auto vtable_entry(Ret(*)(inspector &, Args...)) -> Ret(*)(basic_any &, Args...); + static auto vtable_entry(Ret (*)(inspector &, Args...)) -> Ret (*)(basic_any &, Args...); template - static auto vtable_entry(Ret(*)(const inspector &, Args...)) -> Ret(*)(const basic_any &, Args...); + static auto vtable_entry(Ret (*)(const inspector &, Args...)) -> Ret (*)(const basic_any &, Args...); template - static auto vtable_entry(Ret(*)(Args...)) -> Ret(*)(const basic_any &, Args...); + static auto vtable_entry(Ret (*)(Args...)) -> Ret (*)(const basic_any &, Args...); template - static auto vtable_entry(Ret(inspector:: *)(Args...)) -> Ret(*)(basic_any &, Args...); + static auto vtable_entry(Ret (inspector::*)(Args...)) -> Ret (*)(basic_any &, Args...); template - static auto vtable_entry(Ret(inspector:: *)(Args...) const) -> Ret(*)(const basic_any &, Args...); + static auto vtable_entry(Ret (inspector::*)(Args...) const) -> Ret (*)(const basic_any &, Args...); template - static auto make_vtable(value_list) - -> decltype(std::make_tuple(vtable_entry(Candidate)...)); + static auto make_vtable(value_list) noexcept + -> decltype(std::make_tuple(vtable_entry(Candidate)...)); template - [[nodiscard]] static constexpr auto make_vtable(type_list) { - if constexpr(sizeof...(Func) == 0) { + [[nodiscard]] static constexpr auto make_vtable(type_list) noexcept { + if constexpr(sizeof...(Func) == 0u) { return decltype(make_vtable(typename Concept::template impl{})){}; } else if constexpr((std::is_function_v && ...)) { - return decltype(std::make_tuple(vtable_entry(std::declval())...)){}; + return decltype(std::make_tuple(vtable_entry(std::declval())...)){}; } } template - static void fill_vtable_entry(Ret(* &entry)(Any &, Args...)) { + static void fill_vtable_entry(Ret (*&entry)(Any &, Args...)) noexcept { if constexpr(std::is_invocable_r_v) { entry = +[](Any &, Args... args) -> Ret { return std::invoke(Candidate, std::forward(args)...); @@ -94,15 +89,18 @@ class poly_vtable { } template - [[nodiscard]] static auto fill_vtable(std::index_sequence) { - type impl{}; + [[nodiscard]] static auto fill_vtable(std::index_sequence) noexcept { + vtable_type impl{}; (fill_vtable_entry>>(std::get(impl)), ...); return impl; } + using vtable_type = decltype(make_vtable(Concept{})); + static constexpr bool is_mono_v = std::tuple_size_v == 1u; + public: /*! @brief Virtual table type. */ - using type = decltype(make_vtable(Concept{})); + using type = std::conditional_t, const vtable_type *>; /** * @brief Returns a static virtual table for a specific concept and type. @@ -110,14 +108,18 @@ public: * @return A static virtual table for the given concept and type. */ template - [[nodiscard]] static const auto * instance() { + [[nodiscard]] static type instance() noexcept { static_assert(std::is_same_v>, "Type differs from its decayed form"); - static const auto vtable = fill_vtable(std::make_index_sequence::size>{}); - return &vtable; + static const vtable_type vtable = fill_vtable(std::make_index_sequence::size>{}); + + if constexpr(is_mono_v) { + return std::get<0>(vtable); + } else { + return &vtable; + } } }; - /** * @brief Poly base class used to inject functionalities into concepts. * @tparam Poly The outermost poly class. @@ -132,21 +134,31 @@ struct poly_base { * @param args The arguments to pass to the function. * @return The return value of the invoked function, if any. */ - template - [[nodiscard]] decltype(auto) invoke(const poly_base &self, Args &&... args) const { + template + [[nodiscard]] decltype(auto) invoke(const poly_base &self, Args &&...args) const { const auto &poly = static_cast(self); - return std::get(*poly.vtable)(poly.storage, std::forward(args)...); + + if constexpr(std::is_function_v>) { + return poly.vtable(poly.storage, std::forward(args)...); + } else { + return std::get(*poly.vtable)(poly.storage, std::forward(args)...); + } } /*! @copydoc invoke */ - template - [[nodiscard]] decltype(auto) invoke(poly_base &self, Args &&... args) { + template + [[nodiscard]] decltype(auto) invoke(poly_base &self, Args &&...args) { auto &poly = static_cast(self); - return std::get(*poly.vtable)(poly.storage, std::forward(args)...); + + if constexpr(std::is_function_v>) { + static_assert(Member == 0u, "Unknown member"); + return poly.vtable(poly.storage, std::forward(args)...); + } else { + return std::get(*poly.vtable)(poly.storage, std::forward(args)...); + } } }; - /** * @brief Shortcut for calling `poly_base::invoke`. * @tparam Member Index of the function to invoke. @@ -156,12 +168,11 @@ struct poly_base { * @param args The arguments to pass to the function. * @return The return value of the invoked function, if any. */ -template -decltype(auto) poly_call(Poly &&self, Args &&... args) { +template +decltype(auto) poly_call(Poly &&self, Args &&...args) { return std::forward(self).template invoke(self, std::forward(args)...); } - /** * @brief Static polymorphism made simple and within everyone's reach. * @@ -182,17 +193,16 @@ class basic_poly: private Concept::template type; - using vtable_type = typename poly_vtable::type; - public: /*! @brief Concept type. */ using concept_type = typename Concept::template type>; + /*! @brief Virtual table type. */ + using vtable_type = typename poly_vtable::type; /*! @brief Default constructor. */ - basic_poly() ENTT_NOEXCEPT + basic_poly() noexcept : storage{}, - vtable{} - {} + vtable{} {} /** * @brief Constructs a poly by directly initializing the new object. @@ -201,10 +211,9 @@ public: * @param args Parameters to use to construct the instance. */ template - explicit basic_poly(std::in_place_type_t, Args &&... args) + explicit basic_poly(std::in_place_type_t, Args &&...args) : storage{std::in_place_type, std::forward(args)...}, - vtable{poly_vtable::template instance>>()} - {} + vtable{poly_vtable::template instance>>()} {} /** * @brief Constructs a poly from a given value. @@ -212,41 +221,14 @@ public: * @param value An instance of an object to use to initialize the poly. */ template>, basic_poly>>> - basic_poly(Type &&value) ENTT_NOEXCEPT - : basic_poly{std::in_place_type>>, std::forward(value)} - {} + basic_poly(Type &&value) noexcept + : basic_poly{std::in_place_type>>, std::forward(value)} {} /** - * @brief Copy constructor. - * @param other The instance to copy from. + * @brief Returns the object type if any, `type_id()` otherwise. + * @return The object type if any, `type_id()` otherwise. */ - basic_poly(const basic_poly &other) = default; - - /** - * @brief Move constructor. - * @param other The instance to move from. - */ - basic_poly(basic_poly &&other) ENTT_NOEXCEPT - : basic_poly{} - { - swap(*this, other); - } - - /** - * @brief Assignment operator. - * @param other The instance to assign from. - * @return This poly object. - */ - basic_poly & operator=(basic_poly other) { - swap(other, *this); - return *this; - } - - /** - * @brief Returns the type of the contained object. - * @return The type of the contained object, if any. - */ - [[nodiscard]] type_info type() const ENTT_NOEXCEPT { + [[nodiscard]] const type_info &type() const noexcept { return storage.type(); } @@ -254,12 +236,12 @@ public: * @brief Returns an opaque pointer to the contained instance. * @return An opaque pointer the contained instance, if any. */ - [[nodiscard]] const void * data() const ENTT_NOEXCEPT { + [[nodiscard]] const void *data() const noexcept { return storage.data(); } /*! @copydoc data */ - [[nodiscard]] void * data() ENTT_NOEXCEPT { + [[nodiscard]] void *data() noexcept { return storage.data(); } @@ -270,59 +252,51 @@ public: * @param args Parameters to use to construct the instance. */ template - void emplace(Args &&... args) { - *this = basic_poly{std::in_place_type, std::forward(args)...}; + void emplace(Args &&...args) { + storage.template emplace(std::forward(args)...); + vtable = poly_vtable::template instance>>(); } /*! @brief Destroys contained object */ void reset() { - *this = basic_poly{}; + storage.reset(); + vtable = {}; } /** * @brief Returns false if a poly is empty, true otherwise. * @return False if the poly is empty, true otherwise. */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - return !(vtable == nullptr); + [[nodiscard]] explicit operator bool() const noexcept { + return static_cast(storage); } /** * @brief Returns a pointer to the underlying concept. * @return A pointer to the underlying concept. */ - [[nodiscard]] concept_type * operator->() ENTT_NOEXCEPT { + [[nodiscard]] concept_type *operator->() noexcept { return this; } /*! @copydoc operator-> */ - [[nodiscard]] const concept_type * operator->() const ENTT_NOEXCEPT { + [[nodiscard]] const concept_type *operator->() const noexcept { return this; } - /** - * @brief Swaps two poly objects. - * @param lhs A valid poly object. - * @param rhs A valid poly object. - */ - friend void swap(basic_poly &lhs, basic_poly &rhs) { - using std::swap; - swap(lhs.storage, rhs.storage); - swap(lhs.vtable, rhs.vtable); - } - /** * @brief Aliasing constructor. * @return A poly that shares a reference to an unmanaged object. */ - [[nodiscard]] basic_poly as_ref() ENTT_NOEXCEPT { - basic_poly ref = std::as_const(*this).as_ref(); + [[nodiscard]] basic_poly as_ref() noexcept { + basic_poly ref{}; ref.storage = storage.as_ref(); + ref.vtable = vtable; return ref; } /*! @copydoc as_ref */ - [[nodiscard]] basic_poly as_ref() const ENTT_NOEXCEPT { + [[nodiscard]] basic_poly as_ref() const noexcept { basic_poly ref{}; ref.storage = storage.as_ref(); ref.vtable = vtable; @@ -331,11 +305,9 @@ public: private: basic_any storage; - const vtable_type *vtable; + vtable_type vtable; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/process/fwd.hpp b/LiteLoader/third-party/include/entt/process/fwd.hpp new file mode 100644 index 0000000..a0dc53f --- /dev/null +++ b/LiteLoader/third-party/include/entt/process/fwd.hpp @@ -0,0 +1,14 @@ +#ifndef ENTT_PROCESS_FWD_HPP +#define ENTT_PROCESS_FWD_HPP + +namespace entt { + +template +class process; + +template +class scheduler; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/process/process.hpp b/LiteLoader/third-party/include/entt/process/process.hpp similarity index 73% rename from LiteLoader/Header/third-party/entt/process/process.hpp rename to LiteLoader/third-party/include/entt/process/process.hpp index 93a0c4b..b0d3a86 100644 --- a/LiteLoader/Header/third-party/entt/process/process.hpp +++ b/LiteLoader/third-party/include/entt/process/process.hpp @@ -1,15 +1,12 @@ #ifndef ENTT_PROCESS_PROCESS_HPP #define ENTT_PROCESS_PROCESS_HPP - -#include +#include #include -#include "../config/config.h" - +#include namespace entt { - /** * @brief Base class for processes. * @@ -71,48 +68,48 @@ namespace entt { */ template class process { - enum class state: unsigned int { - UNINITIALIZED = 0, - RUNNING, - PAUSED, - SUCCEEDED, - FAILED, - ABORTED, - FINISHED, - REJECTED + enum class state : std::uint8_t { + uninitialized = 0, + running, + paused, + succeeded, + failed, + aborted, + finished, + rejected }; template - auto next(std::integral_constant) - -> decltype(std::declval().init(), void()) { + auto next(std::integral_constant) + -> decltype(std::declval().init(), void()) { static_cast(this)->init(); } template - auto next(std::integral_constant, Delta delta, void *data) - -> decltype(std::declval().update(delta, data), void()) { + auto next(std::integral_constant, Delta delta, void *data) + -> decltype(std::declval().update(delta, data), void()) { static_cast(this)->update(delta, data); } template - auto next(std::integral_constant) - -> decltype(std::declval().succeeded(), void()) { + auto next(std::integral_constant) + -> decltype(std::declval().succeeded(), void()) { static_cast(this)->succeeded(); } template - auto next(std::integral_constant) - -> decltype(std::declval().failed(), void()) { + auto next(std::integral_constant) + -> decltype(std::declval().failed(), void()) { static_cast(this)->failed(); } template - auto next(std::integral_constant) - -> decltype(std::declval().aborted(), void()) { + auto next(std::integral_constant) + -> decltype(std::declval().aborted(), void()) { static_cast(this)->aborted(); } - void next(...) const ENTT_NOEXCEPT {} + void next(...) const noexcept {} protected: /** @@ -121,9 +118,9 @@ protected: * The function is idempotent and it does nothing if the process isn't * alive. */ - void succeed() ENTT_NOEXCEPT { + void succeed() noexcept { if(alive()) { - current = state::SUCCEEDED; + current = state::succeeded; } } @@ -133,9 +130,9 @@ protected: * The function is idempotent and it does nothing if the process isn't * alive. */ - void fail() ENTT_NOEXCEPT { + void fail() noexcept { if(alive()) { - current = state::FAILED; + current = state::failed; } } @@ -145,9 +142,9 @@ protected: * The function is idempotent and it does nothing if the process isn't * running. */ - void pause() ENTT_NOEXCEPT { - if(current == state::RUNNING) { - current = state::PAUSED; + void pause() noexcept { + if(current == state::running) { + current = state::paused; } } @@ -157,9 +154,9 @@ protected: * The function is idempotent and it does nothing if the process isn't * paused. */ - void unpause() ENTT_NOEXCEPT { - if(current == state::PAUSED) { - current = state::RUNNING; + void unpause() noexcept { + if(current == state::paused) { + current = state::running; } } @@ -168,7 +165,7 @@ public: using delta_type = Delta; /*! @brief Default destructor. */ - virtual ~process() { + virtual ~process() noexcept { static_assert(std::is_base_of_v, "Incorrect use of the class template"); } @@ -182,7 +179,7 @@ public: */ void abort(const bool immediately = false) { if(alive()) { - current = state::ABORTED; + current = state::aborted; if(immediately) { tick({}); @@ -194,32 +191,32 @@ public: * @brief Returns true if a process is either running or paused. * @return True if the process is still alive, false otherwise. */ - [[nodiscard]] bool alive() const ENTT_NOEXCEPT { - return current == state::RUNNING || current == state::PAUSED; + [[nodiscard]] bool alive() const noexcept { + return current == state::running || current == state::paused; } /** * @brief Returns true if a process is already terminated. * @return True if the process is terminated, false otherwise. */ - [[nodiscard]] bool finished() const ENTT_NOEXCEPT { - return current == state::FINISHED; + [[nodiscard]] bool finished() const noexcept { + return current == state::finished; } /** * @brief Returns true if a process is currently paused. * @return True if the process is paused, false otherwise. */ - [[nodiscard]] bool paused() const ENTT_NOEXCEPT { - return current == state::PAUSED; + [[nodiscard]] bool paused() const noexcept { + return current == state::paused; } /** * @brief Returns true if a process terminated with errors. * @return True if the process terminated with errors, false otherwise. */ - [[nodiscard]] bool rejected() const ENTT_NOEXCEPT { - return current == state::REJECTED; + [[nodiscard]] bool rejected() const noexcept { + return current == state::rejected; } /** @@ -228,13 +225,13 @@ public: * @param data Optional data. */ void tick(const Delta delta, void *data = nullptr) { - switch (current) { - case state::UNINITIALIZED: - next(std::integral_constant{}); - current = state::RUNNING; + switch(current) { + case state::uninitialized: + next(std::integral_constant{}); + current = state::running; break; - case state::RUNNING: - next(std::integral_constant{}, delta, data); + case state::running: + next(std::integral_constant{}, delta, data); break; default: // suppress warnings @@ -243,17 +240,17 @@ public: // if it's dead, it must be notified and removed immediately switch(current) { - case state::SUCCEEDED: - next(std::integral_constant{}); - current = state::FINISHED; + case state::succeeded: + next(std::integral_constant{}); + current = state::finished; break; - case state::FAILED: - next(std::integral_constant{}); - current = state::REJECTED; + case state::failed: + next(std::integral_constant{}); + current = state::rejected; break; - case state::ABORTED: - next(std::integral_constant{}); - current = state::REJECTED; + case state::aborted: + next(std::integral_constant{}); + current = state::rejected; break; default: // suppress warnings @@ -262,10 +259,9 @@ public: } private: - state current{state::UNINITIALIZED}; + state current{state::uninitialized}; }; - /** * @brief Adaptor for lambdas and functors to turn them into processes. * @@ -313,9 +309,8 @@ struct process_adaptor: process, Delta>, private Fu * @param args Parameters to use to initialize the actual process. */ template - process_adaptor(Args &&... args) - : Func{std::forward(args)...} - {} + process_adaptor(Args &&...args) + : Func{std::forward(args)...} {} /** * @brief Updates a process and its internal state if required. @@ -323,12 +318,14 @@ struct process_adaptor: process, Delta>, private Fu * @param data Optional data. */ void update(const Delta delta, void *data) { - Func::operator()(delta, data, [this]() { this->succeed(); }, [this]() { this->fail(); }); + Func::operator()( + delta, + data, + [this]() { this->succeed(); }, + [this]() { this->fail(); }); } }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/entt/process/scheduler.hpp b/LiteLoader/third-party/include/entt/process/scheduler.hpp similarity index 81% rename from LiteLoader/Header/third-party/entt/process/scheduler.hpp rename to LiteLoader/third-party/include/entt/process/scheduler.hpp index fd37def..23c7642 100644 --- a/LiteLoader/Header/third-party/entt/process/scheduler.hpp +++ b/LiteLoader/third-party/include/entt/process/scheduler.hpp @@ -1,19 +1,16 @@ #ifndef ENTT_PROCESS_SCHEDULER_HPP #define ENTT_PROCESS_SCHEDULER_HPP - -#include -#include -#include #include +#include +#include #include -#include "../config/config.h" +#include +#include #include "process.hpp" - namespace entt { - /** * @brief Cooperative scheduler for processes. * @@ -43,9 +40,9 @@ namespace entt { template class scheduler { struct process_handler { - using instance_type = std::unique_ptr; - using update_fn_type = bool(process_handler &, Delta, void *); - using abort_fn_type = void(process_handler &, bool); + using instance_type = std::unique_ptr; + using update_fn_type = bool(scheduler &, std::size_t, Delta, void *); + using abort_fn_type = void(scheduler &, std::size_t, bool); using next_type = std::unique_ptr; instance_type instance; @@ -55,12 +52,11 @@ class scheduler { }; struct continuation { - continuation(process_handler *ref) - : handler{ref} - {} + continuation(process_handler *ref) noexcept + : handler{ref} {} template - continuation then(Args &&... args) { + continuation then(Args &&...args) { static_assert(std::is_base_of_v, Proc>, "Invalid process type"); auto proc = typename process_handler::instance_type{new Proc{std::forward(args)...}, &scheduler::deleter}; handler->next.reset(new process_handler{std::move(proc), &scheduler::update, &scheduler::abort, nullptr}); @@ -78,17 +74,17 @@ class scheduler { }; template - [[nodiscard]] static bool update(process_handler &handler, const Delta delta, void *data) { - auto *process = static_cast(handler.instance.get()); + [[nodiscard]] static bool update(scheduler &owner, std::size_t pos, const Delta delta, void *data) { + auto *process = static_cast(owner.handlers[pos].instance.get()); process->tick(delta, data); if(process->rejected()) { return true; } else if(process->finished()) { - if(handler.next) { + if(auto &&handler = owner.handlers[pos]; handler.next) { handler = std::move(*handler.next); // forces the process to exit the uninitialized state - return handler.update(handler, {}, nullptr); + return handler.update(owner, pos, {}, nullptr); } return true; @@ -98,8 +94,8 @@ class scheduler { } template - static void abort(process_handler &handler, const bool immediately) { - static_cast(handler.instance.get())->abort(immediately); + static void abort(scheduler &owner, std::size_t pos, const bool immediately) { + static_cast(owner.handlers[pos].instance.get())->abort(immediately); } template @@ -112,19 +108,20 @@ public: using size_type = std::size_t; /*! @brief Default constructor. */ - scheduler() = default; + scheduler() + : handlers{} {} /*! @brief Default move constructor. */ scheduler(scheduler &&) = default; /*! @brief Default move assignment operator. @return This scheduler. */ - scheduler & operator=(scheduler &&) = default; + scheduler &operator=(scheduler &&) = default; /** * @brief Number of processes currently scheduled. * @return Number of processes currently scheduled. */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { + [[nodiscard]] size_type size() const noexcept { return handlers.size(); } @@ -132,7 +129,7 @@ public: * @brief Returns true if at least a process is currently scheduled. * @return True if there are scheduled processes, false otherwise. */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { + [[nodiscard]] bool empty() const noexcept { return handlers.empty(); } @@ -172,13 +169,13 @@ public: * @return An opaque object to use to concatenate processes. */ template - auto attach(Args &&... args) { + auto attach(Args &&...args) { static_assert(std::is_base_of_v, Proc>, "Invalid process type"); auto proc = typename process_handler::instance_type{new Proc{std::forward(args)...}, &scheduler::deleter}; - process_handler handler{std::move(proc), &scheduler::update, &scheduler::abort, nullptr}; + auto &&ref = handlers.emplace_back(process_handler{std::move(proc), &scheduler::update, &scheduler::abort, nullptr}); // forces the process to exit the uninitialized state - handler.update(handler, {}, nullptr); - return continuation{&handlers.emplace_back(std::move(handler))}; + ref.update(*this, handlers.size() - 1u, {}, nullptr); + return continuation{&handlers.back()}; } /** @@ -250,17 +247,14 @@ public: * @param data Optional data. */ void update(const Delta delta, void *data = nullptr) { - auto sz = handlers.size(); - for(auto pos = handlers.size(); pos; --pos) { - auto &handler = handlers[pos-1]; + const auto curr = pos - 1u; - if(const auto dead = handler.update(handler, delta, data); dead) { - std::swap(handler, handlers[--sz]); + if(const auto dead = handlers[curr].update(*this, curr, delta, data); dead) { + std::swap(handlers[curr], handlers.back()); + handlers.pop_back(); } } - - handlers.erase(handlers.begin() + sz, handlers.end()); } /** @@ -274,23 +268,16 @@ public: * @param immediately Requests an immediate operation. */ void abort(const bool immediately = false) { - decltype(handlers) exec; - exec.swap(handlers); - - for(auto &&handler: exec) { - handler.abort(handler, immediately); + for(auto pos = handlers.size(); pos; --pos) { + const auto curr = pos - 1u; + handlers[curr].abort(*this, curr, immediately); } - - std::move(handlers.begin(), handlers.end(), std::back_inserter(exec)); - handlers.swap(exec); } private: std::vector handlers{}; }; - -} - +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/resource/cache.hpp b/LiteLoader/third-party/include/entt/resource/cache.hpp new file mode 100644 index 0000000..8688685 --- /dev/null +++ b/LiteLoader/third-party/include/entt/resource/cache.hpp @@ -0,0 +1,423 @@ +#ifndef ENTT_RESOURCE_RESOURCE_CACHE_HPP +#define ENTT_RESOURCE_RESOURCE_CACHE_HPP + +#include +#include +#include +#include +#include +#include +#include +#include "../container/dense_map.hpp" +#include "../core/compressed_pair.hpp" +#include "../core/fwd.hpp" +#include "../core/iterator.hpp" +#include "../core/utility.hpp" +#include "fwd.hpp" +#include "loader.hpp" +#include "resource.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +template +class resource_cache_iterator final { + template + friend class resource_cache_iterator; + +public: + using value_type = std::pair>; + using pointer = input_iterator_pointer; + using reference = value_type; + using difference_type = std::ptrdiff_t; + using iterator_category = std::input_iterator_tag; + + constexpr resource_cache_iterator() noexcept = default; + + constexpr resource_cache_iterator(const It iter) noexcept + : it{iter} {} + + template && std::is_constructible_v>> + constexpr resource_cache_iterator(const resource_cache_iterator, Other> &other) noexcept + : it{other.it} {} + + constexpr resource_cache_iterator &operator++() noexcept { + return ++it, *this; + } + + constexpr resource_cache_iterator operator++(int) noexcept { + resource_cache_iterator orig = *this; + return ++(*this), orig; + } + + constexpr resource_cache_iterator &operator--() noexcept { + return --it, *this; + } + + constexpr resource_cache_iterator operator--(int) noexcept { + resource_cache_iterator orig = *this; + return operator--(), orig; + } + + constexpr resource_cache_iterator &operator+=(const difference_type value) noexcept { + it += value; + return *this; + } + + constexpr resource_cache_iterator operator+(const difference_type value) const noexcept { + resource_cache_iterator copy = *this; + return (copy += value); + } + + constexpr resource_cache_iterator &operator-=(const difference_type value) noexcept { + return (*this += -value); + } + + constexpr resource_cache_iterator operator-(const difference_type value) const noexcept { + return (*this + -value); + } + + [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept { + return {it[value].first, resource{it[value].second}}; + } + + [[nodiscard]] constexpr reference operator*() const noexcept { + return (*this)[0]; + } + + [[nodiscard]] constexpr pointer operator->() const noexcept { + return operator*(); + } + + template + friend constexpr std::ptrdiff_t operator-(const resource_cache_iterator &, const resource_cache_iterator &) noexcept; + + template + friend constexpr bool operator==(const resource_cache_iterator &, const resource_cache_iterator &) noexcept; + + template + friend constexpr bool operator<(const resource_cache_iterator &, const resource_cache_iterator &) noexcept; + +private: + It it; +}; + +template +[[nodiscard]] constexpr std::ptrdiff_t operator-(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return lhs.it - rhs.it; +} + +template +[[nodiscard]] constexpr bool operator==(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return lhs.it == rhs.it; +} + +template +[[nodiscard]] constexpr bool operator!=(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return !(lhs == rhs); +} + +template +[[nodiscard]] constexpr bool operator<(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return lhs.it < rhs.it; +} + +template +[[nodiscard]] constexpr bool operator>(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return rhs < lhs; +} + +template +[[nodiscard]] constexpr bool operator<=(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return !(lhs > rhs); +} + +template +[[nodiscard]] constexpr bool operator>=(const resource_cache_iterator &lhs, const resource_cache_iterator &rhs) noexcept { + return !(lhs < rhs); +} + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Basic cache for resources of any type. + * @tparam Type Type of resources managed by a cache. + * @tparam Loader Type of loader used to create the resources. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class resource_cache { + using alloc_traits = typename std::allocator_traits; + static_assert(std::is_same_v, "Invalid value type"); + using container_allocator = typename alloc_traits::template rebind_alloc>; + using container_type = dense_map, container_allocator>; + +public: + /*! @brief Resource type. */ + using value_type = Type; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + /*! @brief Loader type. */ + using loader_type = Loader; + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Input iterator type. */ + using iterator = internal::resource_cache_iterator; + /*! @brief Constant input iterator type. */ + using const_iterator = internal::resource_cache_iterator; + + /*! @brief Default constructor. */ + resource_cache() + : resource_cache{loader_type{}} {} + + /** + * @brief Constructs an empty cache with a given allocator. + * @param allocator The allocator to use. + */ + explicit resource_cache(const allocator_type &allocator) + : resource_cache{loader_type{}, allocator} {} + + /** + * @brief Constructs an empty cache with a given allocator and loader. + * @param callable The loader to use. + * @param allocator The allocator to use. + */ + explicit resource_cache(const loader_type &callable, const allocator_type &allocator = allocator_type{}) + : pool{container_type{allocator}, callable} {} + + /*! @brief Default copy constructor. */ + resource_cache(const resource_cache &) = default; + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + resource_cache(const resource_cache &other, const allocator_type &allocator) + : pool{std::piecewise_construct, std::forward_as_tuple(other.pool.first(), allocator), std::forward_as_tuple(other.pool.second())} {} + + /*! @brief Default move constructor. */ + resource_cache(resource_cache &&) = default; + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + resource_cache(resource_cache &&other, const allocator_type &allocator) + : pool{std::piecewise_construct, std::forward_as_tuple(std::move(other.pool.first()), allocator), std::forward_as_tuple(std::move(other.pool.second()))} {} + + /** + * @brief Default copy assignment operator. + * @return This cache. + */ + resource_cache &operator=(const resource_cache &) = default; + + /** + * @brief Default move assignment operator. + * @return This cache. + */ + resource_cache &operator=(resource_cache &&) = default; + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return pool.first().get_allocator(); + } + + /** + * @brief Returns an iterator to the beginning. + * + * The returned iterator points to the first instance of the cache. If the + * cache is empty, the returned iterator will be equal to `end()`. + * + * @return An iterator to the first instance of the internal cache. + */ + [[nodiscard]] const_iterator cbegin() const noexcept { + return pool.first().begin(); + } + + /*! @copydoc cbegin */ + [[nodiscard]] const_iterator begin() const noexcept { + return cbegin(); + } + + /*! @copydoc begin */ + [[nodiscard]] iterator begin() noexcept { + return pool.first().begin(); + } + + /** + * @brief Returns an iterator to the end. + * + * The returned iterator points to the element following the last instance + * of the cache. Attempting to dereference the returned iterator results in + * undefined behavior. + * + * @return An iterator to the element following the last instance of the + * internal cache. + */ + [[nodiscard]] const_iterator cend() const noexcept { + return pool.first().end(); + } + + /*! @copydoc cend */ + [[nodiscard]] const_iterator end() const noexcept { + return cend(); + } + + /*! @copydoc end */ + [[nodiscard]] iterator end() noexcept { + return pool.first().end(); + } + + /** + * @brief Returns true if a cache contains no resources, false otherwise. + * @return True if the cache contains no resources, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return pool.first().empty(); + } + + /** + * @brief Number of resources managed by a cache. + * @return Number of resources currently stored. + */ + [[nodiscard]] size_type size() const noexcept { + return pool.first().size(); + } + + /*! @brief Clears a cache. */ + void clear() noexcept { + pool.first().clear(); + } + + /** + * @brief Loads a resource, if its identifier does not exist. + * + * Arguments are forwarded directly to the loader and _consumed_ only if the + * resource doesn't already exist. + * + * @warning + * If the resource isn't loaded correctly, the returned handle could be + * invalid and any use of it will result in undefined behavior. + * + * @tparam Args Types of arguments to use to load the resource if required. + * @param id Unique resource identifier. + * @param args Arguments to use to load the resource if required. + * @return A pair consisting of an iterator to the inserted element (or to + * the element that prevented the insertion) and a bool denoting whether the + * insertion took place. + */ + template + std::pair load(const id_type id, Args &&...args) { + if(auto it = pool.first().find(id); it != pool.first().end()) { + return {it, false}; + } + + return pool.first().emplace(id, pool.second()(std::forward(args)...)); + } + + /** + * @brief Force loads a resource, if its identifier does not exist. + * @copydetails load + */ + template + std::pair force_load(const id_type id, Args &&...args) { + return {pool.first().insert_or_assign(id, pool.second()(std::forward(args)...)).first, true}; + } + + /** + * @brief Returns a handle for a given resource identifier. + * + * @warning + * There is no guarantee that the returned handle is valid.
+ * If it is not, any use will result in indefinite behavior. + * + * @param id Unique resource identifier. + * @return A handle for the given resource. + */ + [[nodiscard]] resource operator[](const id_type id) const { + if(auto it = pool.first().find(id); it != pool.first().cend()) { + return resource{it->second}; + } + + return {}; + } + + /*! @copydoc operator[] */ + [[nodiscard]] resource operator[](const id_type id) { + if(auto it = pool.first().find(id); it != pool.first().end()) { + return resource{it->second}; + } + + return {}; + } + + /** + * @brief Checks if a cache contains a given identifier. + * @param id Unique resource identifier. + * @return True if the cache contains the resource, false otherwise. + */ + [[nodiscard]] bool contains(const id_type id) const { + return pool.first().contains(id); + } + + /** + * @brief Removes an element from a given position. + * @param pos An iterator to the element to remove. + * @return An iterator following the removed element. + */ + iterator erase(const_iterator pos) { + const auto it = pool.first().begin(); + return pool.first().erase(it + (pos - const_iterator{it})); + } + + /** + * @brief Removes the given elements from a cache. + * @param first An iterator to the first element of the range of elements. + * @param last An iterator past the last element of the range of elements. + * @return An iterator following the last removed element. + */ + iterator erase(const_iterator first, const_iterator last) { + const auto it = pool.first().begin(); + return pool.first().erase(it + (first - const_iterator{it}), it + (last - const_iterator{it})); + } + + /** + * @brief Removes the given elements from a cache. + * @param id Unique resource identifier. + * @return Number of resources erased (either 0 or 1). + */ + size_type erase(const id_type id) { + return pool.first().erase(id); + } + + /** + * @brief Returns the loader used to create resources. + * @return The loader used to create resources. + */ + [[nodiscard]] loader_type loader() const { + return pool.second(); + } + +private: + compressed_pair pool; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/resource/fwd.hpp b/LiteLoader/third-party/include/entt/resource/fwd.hpp new file mode 100644 index 0000000..ed63da5 --- /dev/null +++ b/LiteLoader/third-party/include/entt/resource/fwd.hpp @@ -0,0 +1,19 @@ +#ifndef ENTT_RESOURCE_FWD_HPP +#define ENTT_RESOURCE_FWD_HPP + +#include + +namespace entt { + +template +struct resource_loader; + +template, typename = std::allocator> +class resource_cache; + +template +class resource; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/resource/loader.hpp b/LiteLoader/third-party/include/entt/resource/loader.hpp new file mode 100644 index 0000000..f59d748 --- /dev/null +++ b/LiteLoader/third-party/include/entt/resource/loader.hpp @@ -0,0 +1,33 @@ +#ifndef ENTT_RESOURCE_LOADER_HPP +#define ENTT_RESOURCE_LOADER_HPP + +#include +#include +#include "fwd.hpp" + +namespace entt { + +/** + * @brief Transparent loader for shared resources. + * @tparam Type Type of resources created by the loader. + */ +template +struct resource_loader { + /*! @brief Result type. */ + using result_type = std::shared_ptr; + + /** + * @brief Constructs a shared pointer to a resource from its arguments. + * @tparam Args Types of arguments to use to construct the resource. + * @param args Parameters to use to construct the resource. + * @return A shared pointer to a resource of the given type. + */ + template + result_type operator()(Args &&...args) const { + return std::make_shared(std::forward(args)...); + } +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/resource/resource.hpp b/LiteLoader/third-party/include/entt/resource/resource.hpp new file mode 100644 index 0000000..2e3d68d --- /dev/null +++ b/LiteLoader/third-party/include/entt/resource/resource.hpp @@ -0,0 +1,246 @@ +#ifndef ENTT_RESOURCE_RESOURCE_HPP +#define ENTT_RESOURCE_RESOURCE_HPP + +#include +#include +#include +#include "fwd.hpp" + +namespace entt { + +/** + * @brief Basic resource handle. + * + * A handle wraps a resource and extends its lifetime. It also shares the same + * resource with all other handles constructed from the same element.
+ * As a rule of thumb, resources should never be copied nor moved. Handles are + * the way to go to push references around. + * + * @tparam Type Type of resource managed by a handle. + */ +template +class resource { + /*! @brief Resource handles are friends with each other. */ + template + friend class resource; + + template + static constexpr bool is_acceptable_v = !std::is_same_v && std::is_constructible_v; + +public: + /*! @brief Resource type. */ + using element_type = Type; + /*! @brief Handle type. */ + using handle_type = std::shared_ptr; + + /*! @brief Default constructor. */ + resource() noexcept + : value{} {} + + /** + * @brief Creates a handle from a weak pointer, namely a resource. + * @param res A weak pointer to a resource. + */ + explicit resource(handle_type res) noexcept + : value{std::move(res)} {} + + /*! @brief Default copy constructor. */ + resource(const resource &) noexcept = default; + + /*! @brief Default move constructor. */ + resource(resource &&) noexcept = default; + + /** + * @brief Aliasing constructor. + * @tparam Other Type of resource managed by the received handle. + * @param other The handle with which to share ownership information. + * @param res Unrelated and unmanaged resources. + */ + template + resource(const resource &other, element_type &res) noexcept + : value{other.value, std::addressof(res)} {} + + /** + * @brief Copy constructs a handle which shares ownership of the resource. + * @tparam Other Type of resource managed by the received handle. + * @param other The handle to copy from. + */ + template>> + resource(const resource &other) noexcept + : value{other.value} {} + + /** + * @brief Move constructs a handle which takes ownership of the resource. + * @tparam Other Type of resource managed by the received handle. + * @param other The handle to move from. + */ + template>> + resource(resource &&other) noexcept + : value{std::move(other.value)} {} + + /** + * @brief Default copy assignment operator. + * @return This resource handle. + */ + resource &operator=(const resource &) noexcept = default; + + /** + * @brief Default move assignment operator. + * @return This resource handle. + */ + resource &operator=(resource &&) noexcept = default; + + /** + * @brief Copy assignment operator from foreign handle. + * @tparam Other Type of resource managed by the received handle. + * @param other The handle to copy from. + * @return This resource handle. + */ + template + std::enable_if_t, resource &> + operator=(const resource &other) noexcept { + value = other.value; + return *this; + } + + /** + * @brief Move assignment operator from foreign handle. + * @tparam Other Type of resource managed by the received handle. + * @param other The handle to move from. + * @return This resource handle. + */ + template + std::enable_if_t, resource &> + operator=(resource &&other) noexcept { + value = std::move(other.value); + return *this; + } + + /** + * @brief Returns a reference to the managed resource. + * + * @warning + * The behavior is undefined if the handle doesn't contain a resource. + * + * @return A reference to the managed resource. + */ + [[nodiscard]] element_type &operator*() const noexcept { + return *value; + } + + /*! @copydoc operator* */ + [[nodiscard]] operator element_type &() const noexcept { + return *value; + } + + /** + * @brief Returns a pointer to the managed resource. + * @return A pointer to the managed resource. + */ + [[nodiscard]] element_type *operator->() const noexcept { + return value.get(); + } + + /** + * @brief Returns true if a handle contains a resource, false otherwise. + * @return True if the handle contains a resource, false otherwise. + */ + [[nodiscard]] explicit operator bool() const noexcept { + return static_cast(value); + } + + /** + * @brief Returns the underlying resource handle. + * @return The underlying resource handle. + */ + [[nodiscard]] const handle_type &handle() const noexcept { + return value; + } + +private: + handle_type value; +}; + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if both handles refer to the same resource, false otherwise. + */ +template +[[nodiscard]] bool operator==(const resource &lhs, const resource &rhs) noexcept { + return (std::addressof(*lhs) == std::addressof(*rhs)); +} + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return False if both handles refer to the same registry, true otherwise. + */ +template +[[nodiscard]] bool operator!=(const resource &lhs, const resource &rhs) noexcept { + return !(lhs == rhs); +} + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if the first handle is less than the second, false otherwise. + */ +template +[[nodiscard]] bool operator<(const resource &lhs, const resource &rhs) noexcept { + return (std::addressof(*lhs) < std::addressof(*rhs)); +} + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if the first handle is greater than the second, false otherwise. + */ +template +[[nodiscard]] bool operator>(const resource &lhs, const resource &rhs) noexcept { + return (std::addressof(*lhs) > std::addressof(*rhs)); +} + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if the first handle is less than or equal to the second, false + * otherwise. + */ +template +[[nodiscard]] bool operator<=(const resource &lhs, const resource &rhs) noexcept { + return !(lhs > rhs); +} + +/** + * @brief Compares two handles. + * @tparam Res Type of resource managed by the first handle. + * @tparam Other Type of resource managed by the second handle. + * @param lhs A valid handle. + * @param rhs A valid handle. + * @return True if the first handle is greater than or equal to the second, + * false otherwise. + */ +template +[[nodiscard]] bool operator>=(const resource &lhs, const resource &rhs) noexcept { + return !(lhs < rhs); +} + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/signal/delegate.hpp b/LiteLoader/third-party/include/entt/signal/delegate.hpp similarity index 78% rename from LiteLoader/Header/third-party/entt/signal/delegate.hpp rename to LiteLoader/third-party/include/entt/signal/delegate.hpp index e8be93f..4419616 100644 --- a/LiteLoader/Header/third-party/entt/signal/delegate.hpp +++ b/LiteLoader/third-party/include/entt/signal/delegate.hpp @@ -1,77 +1,54 @@ #ifndef ENTT_SIGNAL_DELEGATE_HPP #define ENTT_SIGNAL_DELEGATE_HPP - -#include #include -#include #include +#include #include -#include "../core/type_traits.hpp" +#include #include "../config/config.h" - +#include "../core/type_traits.hpp" +#include "fwd.hpp" namespace entt { - /** * @cond TURN_OFF_DOXYGEN * Internal details not to be documented. */ - namespace internal { - template -auto function_pointer(Ret(*)(Args...)) -> Ret(*)(Args...); - +constexpr auto function_pointer(Ret (*)(Args...)) -> Ret (*)(Args...); template -auto function_pointer(Ret(*)(Type, Args...), Other &&) -> Ret(*)(Args...); - +constexpr auto function_pointer(Ret (*)(Type, Args...), Other &&) -> Ret (*)(Args...); template -auto function_pointer(Ret(Class:: *)(Args...), Other &&...) -> Ret(*)(Args...); - +constexpr auto function_pointer(Ret (Class::*)(Args...), Other &&...) -> Ret (*)(Args...); template -auto function_pointer(Ret(Class:: *)(Args...) const, Other &&...) -> Ret(*)(Args...); - +constexpr auto function_pointer(Ret (Class::*)(Args...) const, Other &&...) -> Ret (*)(Args...); template -auto function_pointer(Type Class:: *, Other &&...) -> Type(*)(); - +constexpr auto function_pointer(Type Class::*, Other &&...) -> Type (*)(); template -using function_pointer_t = decltype(internal::function_pointer(std::declval()...)); - +using function_pointer_t = decltype(function_pointer(std::declval()...)); template -[[nodiscard]] constexpr auto index_sequence_for(Ret(*)(Args...)) { +[[nodiscard]] constexpr auto index_sequence_for(Ret (*)(Args...)) { return std::index_sequence_for{}; } - -} - +} // namespace internal /** * Internal details not to be documented. * @endcond */ - -/*! @brief Used to wrap a function or a member of a specified type. */ -template -struct connect_arg_t {}; - - -/*! @brief Constant of type connect_arg_t used to disambiguate calls. */ -template -inline constexpr connect_arg_t connect_arg{}; - - /** * @brief Basic delegate implementation. * @@ -81,7 +58,6 @@ inline constexpr connect_arg_t connect_arg{}; template class delegate; - /** * @brief Utility class to use to send around functions and members. * @@ -97,7 +73,7 @@ class delegate; template class delegate { template - [[nodiscard]] auto wrap(std::index_sequence) ENTT_NOEXCEPT { + [[nodiscard]] auto wrap(std::index_sequence) noexcept { return [](const void *, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); return static_cast(std::invoke(Candidate, std::forward>>(std::get(arguments))...)); @@ -105,7 +81,7 @@ class delegate { } template - [[nodiscard]] auto wrap(Type &, std::index_sequence) ENTT_NOEXCEPT { + [[nodiscard]] auto wrap(Type &, std::index_sequence) noexcept { return [](const void *payload, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); Type *curr = static_cast(const_cast *>(payload)); @@ -114,7 +90,7 @@ class delegate { } template - [[nodiscard]] auto wrap(Type *, std::index_sequence) ENTT_NOEXCEPT { + [[nodiscard]] auto wrap(Type *, std::index_sequence) noexcept { return [](const void *payload, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); Type *curr = static_cast(const_cast *>(payload)); @@ -131,30 +107,19 @@ public: using result_type = Ret; /*! @brief Default constructor. */ - delegate() ENTT_NOEXCEPT - : fn{nullptr}, data{nullptr} - {} + delegate() noexcept + : instance{nullptr}, + fn{nullptr} {} /** - * @brief Constructs a delegate and connects a free function or an unbound - * member. + * @brief Constructs a delegate with a given object or payload, if any. * @tparam Candidate Function or member to connect to the delegate. + * @tparam Type Type of class or type of payload, if any. + * @param value_or_instance Optional valid object that fits the purpose. */ - template - delegate(connect_arg_t) ENTT_NOEXCEPT { - connect(); - } - - /** - * @brief Constructs a delegate and connects a free function with payload or - * a bound member. - * @tparam Candidate Function or member to connect to the delegate. - * @tparam Type Type of class or type of payload. - * @param value_or_instance A valid object that fits the purpose. - */ - template - delegate(connect_arg_t, Type &&value_or_instance) ENTT_NOEXCEPT { - connect(std::forward(value_or_instance)); + template + delegate(connect_arg_t, Type &&...value_or_instance) noexcept { + connect(std::forward(value_or_instance)...); } /** @@ -163,7 +128,7 @@ public: * @param function Function to connect to the delegate. * @param payload User defined arbitrary data. */ - delegate(function_type *function, const void *payload = nullptr) ENTT_NOEXCEPT { + delegate(function_type *function, const void *payload = nullptr) noexcept { connect(function, payload); } @@ -172,8 +137,8 @@ public: * @tparam Candidate Function or member to connect to the delegate. */ template - void connect() ENTT_NOEXCEPT { - data = nullptr; + void connect() noexcept { + instance = nullptr; if constexpr(std::is_invocable_r_v) { fn = [](const void *, Args... args) -> Ret { @@ -202,8 +167,8 @@ public: * @param value_or_instance A valid reference that fits the purpose. */ template - void connect(Type &value_or_instance) ENTT_NOEXCEPT { - data = &value_or_instance; + void connect(Type &value_or_instance) noexcept { + instance = &value_or_instance; if constexpr(std::is_invocable_r_v) { fn = [](const void *payload, Args... args) -> Ret { @@ -226,8 +191,8 @@ public: * @param value_or_instance A valid pointer that fits the purpose. */ template - void connect(Type *value_or_instance) ENTT_NOEXCEPT { - data = value_or_instance; + void connect(Type *value_or_instance) noexcept { + instance = value_or_instance; if constexpr(std::is_invocable_r_v) { fn = [](const void *payload, Args... args) -> Ret { @@ -252,9 +217,10 @@ public: * @param function Function to connect to the delegate. * @param payload User defined arbitrary data. */ - void connect(function_type *function, const void *payload = nullptr) ENTT_NOEXCEPT { + void connect(function_type *function, const void *payload = nullptr) noexcept { + ENTT_ASSERT(function != nullptr, "Uninitialized function pointer"); + instance = payload; fn = function; - data = payload; } /** @@ -262,17 +228,17 @@ public: * * After a reset, a delegate cannot be invoked anymore. */ - void reset() ENTT_NOEXCEPT { + void reset() noexcept { + instance = nullptr; fn = nullptr; - data = nullptr; } /** * @brief Returns the instance or the payload linked to a delegate, if any. * @return An opaque pointer to the underlying data. */ - [[nodiscard]] const void * instance() const ENTT_NOEXCEPT { - return data; + [[nodiscard]] const void *data() const noexcept { + return instance; } /** @@ -289,15 +255,15 @@ public: */ Ret operator()(Args... args) const { ENTT_ASSERT(static_cast(*this), "Uninitialized delegate"); - return fn(data, std::forward(args)...); + return fn(instance, std::forward(args)...); } /** * @brief Checks whether a delegate actually stores a listener. * @return False if the delegate is empty, true otherwise. */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { - // no need to test also data + [[nodiscard]] explicit operator bool() const noexcept { + // no need to also test instance return !(fn == nullptr); } @@ -306,16 +272,15 @@ public: * @param other Delegate with which to compare. * @return False if the two contents differ, true otherwise. */ - [[nodiscard]] bool operator==(const delegate &other) const ENTT_NOEXCEPT { - return fn == other.fn && data == other.data; + [[nodiscard]] bool operator==(const delegate &other) const noexcept { + return fn == other.fn && instance == other.instance; } private: + const void *instance; function_type *fn; - const void *data; }; - /** * @brief Compares the contents of two delegates. * @tparam Ret Return type of a function type. @@ -325,19 +290,16 @@ private: * @return True if the two contents differ, false otherwise. */ template -[[nodiscard]] bool operator!=(const delegate &lhs, const delegate &rhs) ENTT_NOEXCEPT { +[[nodiscard]] bool operator!=(const delegate &lhs, const delegate &rhs) noexcept { return !(lhs == rhs); } - /** * @brief Deduction guide. * @tparam Candidate Function or member to connect to the delegate. */ template -delegate(connect_arg_t) --> delegate>>; - +delegate(connect_arg_t) -> delegate>>; /** * @brief Deduction guide. @@ -345,9 +307,7 @@ delegate(connect_arg_t) * @tparam Type Type of class or type of payload. */ template -delegate(connect_arg_t, Type &&) --> delegate>>; - +delegate(connect_arg_t, Type &&) -> delegate>>; /** * @brief Deduction guide. @@ -355,11 +315,8 @@ delegate(connect_arg_t, Type &&) * @tparam Args Types of arguments of a function type. */ template -delegate(Ret(*)(const void *, Args...), const void * = nullptr) --> delegate; - - -} +delegate(Ret (*)(const void *, Args...), const void * = nullptr) -> delegate; +} // namespace entt #endif diff --git a/LiteLoader/third-party/include/entt/signal/dispatcher.hpp b/LiteLoader/third-party/include/entt/signal/dispatcher.hpp new file mode 100644 index 0000000..72c5694 --- /dev/null +++ b/LiteLoader/third-party/include/entt/signal/dispatcher.hpp @@ -0,0 +1,390 @@ +#ifndef ENTT_SIGNAL_DISPATCHER_HPP +#define ENTT_SIGNAL_DISPATCHER_HPP + +#include +#include +#include +#include +#include +#include +#include "../container/dense_map.hpp" +#include "../core/compressed_pair.hpp" +#include "../core/fwd.hpp" +#include "../core/type_info.hpp" +#include "../core/utility.hpp" +#include "fwd.hpp" +#include "sigh.hpp" + +namespace entt { + +/** + * @cond TURN_OFF_DOXYGEN + * Internal details not to be documented. + */ + +namespace internal { + +struct basic_dispatcher_handler { + virtual ~basic_dispatcher_handler() = default; + virtual void publish() = 0; + virtual void disconnect(void *) = 0; + virtual void clear() noexcept = 0; + virtual std::size_t size() const noexcept = 0; +}; + +template +class dispatcher_handler final: public basic_dispatcher_handler { + static_assert(std::is_same_v>, "Invalid type"); + + using alloc_traits = std::allocator_traits; + using signal_type = sigh; + using container_type = std::vector>; + +public: + using allocator_type = Allocator; + + dispatcher_handler(const allocator_type &allocator) + : signal{allocator}, + events{allocator} {} + + void publish() override { + const auto length = events.size(); + + for(std::size_t pos{}; pos < length; ++pos) { + signal.publish(events[pos]); + } + + events.erase(events.cbegin(), events.cbegin() + length); + } + + void disconnect(void *instance) override { + bucket().disconnect(instance); + } + + void clear() noexcept override { + events.clear(); + } + + [[nodiscard]] auto bucket() noexcept { + return typename signal_type::sink_type{signal}; + } + + void trigger(Type event) { + signal.publish(event); + } + + template + void enqueue(Args &&...args) { + if constexpr(std::is_aggregate_v) { + events.push_back(Type{std::forward(args)...}); + } else { + events.emplace_back(std::forward(args)...); + } + } + + std::size_t size() const noexcept override { + return events.size(); + } + +private: + signal_type signal; + container_type events; +}; + +} // namespace internal + +/** + * Internal details not to be documented. + * @endcond + */ + +/** + * @brief Basic dispatcher implementation. + * + * A dispatcher can be used either to trigger an immediate event or to enqueue + * events to be published all together once per tick.
+ * Listeners are provided in the form of member functions. For each event of + * type `Type`, listeners are such that they can be invoked with an argument of + * type `Type &`, no matter what the return type is. + * + * The dispatcher creates instances of the `sigh` class internally. Refer to the + * documentation of the latter for more details. + * + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class basic_dispatcher { + template + using handler_type = internal::dispatcher_handler; + + using key_type = id_type; + // std::shared_ptr because of its type erased allocator which is useful here + using mapped_type = std::shared_ptr; + + using alloc_traits = std::allocator_traits; + using container_allocator = typename alloc_traits::template rebind_alloc>; + using container_type = dense_map, container_allocator>; + + template + [[nodiscard]] handler_type &assure(const id_type id) { + static_assert(std::is_same_v>, "Non-decayed types not allowed"); + auto &&ptr = pools.first()[id]; + + if(!ptr) { + const auto &allocator = get_allocator(); + ptr = std::allocate_shared>(allocator, allocator); + } + + return static_cast &>(*ptr); + } + + template + [[nodiscard]] const handler_type *assure(const id_type id) const { + static_assert(std::is_same_v>, "Non-decayed types not allowed"); + + if(auto it = pools.first().find(id); it != pools.first().cend()) { + return static_cast *>(it->second.get()); + } + + return nullptr; + } + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + + /*! @brief Default constructor. */ + basic_dispatcher() + : basic_dispatcher{allocator_type{}} {} + + /** + * @brief Constructs a dispatcher with a given allocator. + * @param allocator The allocator to use. + */ + explicit basic_dispatcher(const allocator_type &allocator) + : pools{allocator, allocator} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + basic_dispatcher(basic_dispatcher &&other) noexcept + : pools{std::move(other.pools)} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + basic_dispatcher(basic_dispatcher &&other, const allocator_type &allocator) noexcept + : pools{container_type{std::move(other.pools.first()), allocator}, allocator} {} + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This dispatcher. + */ + basic_dispatcher &operator=(basic_dispatcher &&other) noexcept { + pools = std::move(other.pools); + return *this; + } + + /** + * @brief Exchanges the contents with those of a given dispatcher. + * @param other Dispatcher to exchange the content with. + */ + void swap(basic_dispatcher &other) { + using std::swap; + swap(pools, other.pools); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return pools.second(); + } + + /** + * @brief Returns the number of pending events for a given type. + * @tparam Type Type of event for which to return the count. + * @param id Name used to map the event queue within the dispatcher. + * @return The number of pending events for the given type. + */ + template + size_type size(const id_type id = type_hash::value()) const noexcept { + const auto *cpool = assure>(id); + return cpool ? cpool->size() : 0u; + } + + /** + * @brief Returns the total number of pending events. + * @return The total number of pending events. + */ + size_type size() const noexcept { + size_type count{}; + + for(auto &&cpool: pools.first()) { + count += cpool.second->size(); + } + + return count; + } + + /** + * @brief Returns a sink object for the given event and queue. + * + * A sink is an opaque object used to connect listeners to events. + * + * The function type for a listener is _compatible_ with: + * + * @code{.cpp} + * void(Type &); + * @endcode + * + * The order of invocation of the listeners isn't guaranteed. + * + * @sa sink + * + * @tparam Type Type of event of which to get the sink. + * @param id Name used to map the event queue within the dispatcher. + * @return A temporary sink object. + */ + template + [[nodiscard]] auto sink(const id_type id = type_hash::value()) { + return assure(id).bucket(); + } + + /** + * @brief Triggers an immediate event of a given type. + * @tparam Type Type of event to trigger. + * @param value An instance of the given type of event. + */ + template + void trigger(Type &&value = {}) { + trigger(type_hash>::value(), std::forward(value)); + } + + /** + * @brief Triggers an immediate event on a queue of a given type. + * @tparam Type Type of event to trigger. + * @param value An instance of the given type of event. + * @param id Name used to map the event queue within the dispatcher. + */ + template + void trigger(const id_type id, Type &&value = {}) { + assure>(id).trigger(std::forward(value)); + } + + /** + * @brief Enqueues an event of the given type. + * @tparam Type Type of event to enqueue. + * @tparam Args Types of arguments to use to construct the event. + * @param args Arguments to use to construct the event. + */ + template + void enqueue(Args &&...args) { + enqueue_hint(type_hash::value(), std::forward(args)...); + } + + /** + * @brief Enqueues an event of the given type. + * @tparam Type Type of event to enqueue. + * @param value An instance of the given type of event. + */ + template + void enqueue(Type &&value) { + enqueue_hint(type_hash>::value(), std::forward(value)); + } + + /** + * @brief Enqueues an event of the given type. + * @tparam Type Type of event to enqueue. + * @tparam Args Types of arguments to use to construct the event. + * @param id Name used to map the event queue within the dispatcher. + * @param args Arguments to use to construct the event. + */ + template + void enqueue_hint(const id_type id, Args &&...args) { + assure(id).enqueue(std::forward(args)...); + } + + /** + * @brief Enqueues an event of the given type. + * @tparam Type Type of event to enqueue. + * @param id Name used to map the event queue within the dispatcher. + * @param value An instance of the given type of event. + */ + template + void enqueue_hint(const id_type id, Type &&value) { + assure>(id).enqueue(std::forward(value)); + } + + /** + * @brief Utility function to disconnect everything related to a given value + * or instance from a dispatcher. + * @tparam Type Type of class or type of payload. + * @param value_or_instance A valid object that fits the purpose. + */ + template + void disconnect(Type &value_or_instance) { + disconnect(&value_or_instance); + } + + /** + * @brief Utility function to disconnect everything related to a given value + * or instance from a dispatcher. + * @tparam Type Type of class or type of payload. + * @param value_or_instance A valid object that fits the purpose. + */ + template + void disconnect(Type *value_or_instance) { + for(auto &&cpool: pools.first()) { + cpool.second->disconnect(value_or_instance); + } + } + + /** + * @brief Discards all the events stored so far in a given queue. + * @tparam Type Type of event to discard. + * @param id Name used to map the event queue within the dispatcher. + */ + template + void clear(const id_type id = type_hash::value()) { + assure(id).clear(); + } + + /*! @brief Discards all the events queued so far. */ + void clear() noexcept { + for(auto &&cpool: pools.first()) { + cpool.second->clear(); + } + } + + /** + * @brief Delivers all the pending events of a given queue. + * @tparam Type Type of event to send. + * @param id Name used to map the event queue within the dispatcher. + */ + template + void update(const id_type id = type_hash::value()) { + assure(id).publish(); + } + + /*! @brief Delivers all the pending events. */ + void update() const { + for(auto &&cpool: pools.first()) { + cpool.second->publish(); + } + } + +private: + compressed_pair pools; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/signal/emitter.hpp b/LiteLoader/third-party/include/entt/signal/emitter.hpp new file mode 100644 index 0000000..263da18 --- /dev/null +++ b/LiteLoader/third-party/include/entt/signal/emitter.hpp @@ -0,0 +1,170 @@ +#ifndef ENTT_SIGNAL_EMITTER_HPP +#define ENTT_SIGNAL_EMITTER_HPP + +#include +#include +#include +#include "../container/dense_map.hpp" +#include "../core/compressed_pair.hpp" +#include "../core/fwd.hpp" +#include "../core/type_info.hpp" +#include "../core/utility.hpp" +#include "fwd.hpp" + +namespace entt { + +/** + * @brief General purpose event emitter. + * + * To create an emitter type, derived classes must inherit from the base as: + * + * @code{.cpp} + * struct my_emitter: emitter { + * // ... + * } + * @endcode + * + * Handlers for the different events are created internally on the fly. It's not + * required to specify in advance the full list of accepted events.
+ * Moreover, whenever an event is published, an emitter also passes a reference + * to itself to its listeners. + * + * @tparam Derived Emitter type. + * @tparam Allocator Type of allocator used to manage memory and elements. + */ +template +class emitter { + using key_type = id_type; + using mapped_type = std::function; + + using alloc_traits = std::allocator_traits; + using container_allocator = typename alloc_traits::template rebind_alloc>; + using container_type = dense_map, container_allocator>; + +public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; + /*! @brief Unsigned integer type. */ + using size_type = std::size_t; + + /*! @brief Default constructor. */ + emitter() + : emitter{allocator_type{}} {} + + /** + * @brief Constructs an emitter with a given allocator. + * @param allocator The allocator to use. + */ + explicit emitter(const allocator_type &allocator) + : handlers{allocator, allocator} {} + + /*! @brief Default destructor. */ + virtual ~emitter() noexcept { + static_assert(std::is_base_of_v, Derived>, "Invalid emitter type"); + } + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + emitter(emitter &&other) noexcept + : handlers{std::move(other.handlers)} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + emitter(emitter &&other, const allocator_type &allocator) noexcept + : handlers{container_type{std::move(other.handlers.first()), allocator}, allocator} {} + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This dispatcher. + */ + emitter &operator=(emitter &&other) noexcept { + handlers = std::move(other.handlers); + return *this; + } + + /** + * @brief Exchanges the contents with those of a given emitter. + * @param other Emitter to exchange the content with. + */ + void swap(emitter &other) { + using std::swap; + swap(handlers, other.handlers); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return handlers.second(); + } + + /** + * @brief Publishes a given event. + * @tparam Type Type of event to trigger. + * @param value An instance of the given type of event. + */ + template + void publish(Type &&value) { + if(const auto id = type_id().hash(); handlers.first().contains(id)) { + handlers.first()[id](&value); + } + } + + /** + * @brief Registers a listener with the event emitter. + * @tparam Type Type of event to which to connect the listener. + * @param func The listener to register. + */ + template + void on(std::function func) { + handlers.first().insert_or_assign(type_id().hash(), [func = std::move(func), this](void *value) { + func(*static_cast(value), static_cast(*this)); + }); + } + + /** + * @brief Disconnects a listener from the event emitter. + * @tparam Type Type of event of the listener. + */ + template + void erase() { + handlers.first().erase(type_hash>>::value()); + } + + /*! @brief Disconnects all the listeners. */ + void clear() noexcept { + handlers.first().clear(); + } + + /** + * @brief Checks if there are listeners registered for the specific event. + * @tparam Type Type of event to test. + * @return True if there are no listeners registered, false otherwise. + */ + template + [[nodiscard]] bool contains() const { + return handlers.first().contains(type_hash>>::value()); + } + + /** + * @brief Checks if there are listeners registered with the event emitter. + * @return True if there are no listeners registered, false otherwise. + */ + [[nodiscard]] bool empty() const noexcept { + return handlers.first().empty(); + } + +private: + compressed_pair handlers; +}; + +} // namespace entt + +#endif diff --git a/LiteLoader/third-party/include/entt/signal/fwd.hpp b/LiteLoader/third-party/include/entt/signal/fwd.hpp new file mode 100644 index 0000000..b0964b6 --- /dev/null +++ b/LiteLoader/third-party/include/entt/signal/fwd.hpp @@ -0,0 +1,46 @@ +#ifndef ENTT_SIGNAL_FWD_HPP +#define ENTT_SIGNAL_FWD_HPP + +#include + +namespace entt { + +template +class delegate; + +template> +class basic_dispatcher; + +template> +class emitter; + +class connection; + +struct scoped_connection; + +template +class sink; + +template> +class sigh; + +/*! @brief Alias declaration for the most common use case. */ +using dispatcher = basic_dispatcher<>; + +/*! @brief Disambiguation tag for constructors and the like. */ +template +struct connect_arg_t { + /*! @brief Default constructor. */ + explicit connect_arg_t() = default; +}; + +/** + * @brief Constant of type connect_arg_t used to disambiguate calls. + * @tparam Candidate Element to connect (likely a free or member function). + */ +template +inline constexpr connect_arg_t connect_arg{}; + +} // namespace entt + +#endif diff --git a/LiteLoader/Header/third-party/entt/signal/sigh.hpp b/LiteLoader/third-party/include/entt/signal/sigh.hpp similarity index 60% rename from LiteLoader/Header/third-party/entt/signal/sigh.hpp rename to LiteLoader/third-party/include/entt/signal/sigh.hpp index bcece0c..5e85354 100644 --- a/LiteLoader/Header/third-party/entt/signal/sigh.hpp +++ b/LiteLoader/third-party/include/entt/signal/sigh.hpp @@ -1,45 +1,39 @@ #ifndef ENTT_SIGNAL_SIGH_HPP #define ENTT_SIGNAL_SIGH_HPP - -#include -#include -#include #include #include #include -#include "../config/config.h" +#include +#include #include "delegate.hpp" #include "fwd.hpp" - namespace entt { - /** * @brief Sink class. * * Primary template isn't defined on purpose. All the specializations give a * compile-time error unless the template parameter is a function type. * - * @tparam Function A valid function type. + * @tparam Type A valid signal handler type. */ -template +template class sink; - /** * @brief Unmanaged signal handler. * * Primary template isn't defined on purpose. All the specializations give a * compile-time error unless the template parameter is a function type. * - * @tparam Function A valid function type. + * @tparam Type A valid function type. + * @tparam Allocator Type of allocator used to manage memory and elements. */ -template +template class sigh; - /** * @brief Unmanaged signal handler. * @@ -54,30 +48,107 @@ class sigh; * * @tparam Ret Return type of a function type. * @tparam Args Types of arguments of a function type. + * @tparam Allocator Type of allocator used to manage memory and elements. */ -template -class sigh { +template +class sigh { /*! @brief A sink is allowed to modify a signal. */ - friend class sink; + friend class sink>; + + using alloc_traits = std::allocator_traits; + using container_type = std::vector, typename alloc_traits::template rebind_alloc>>; public: + /*! @brief Allocator type. */ + using allocator_type = Allocator; /*! @brief Unsigned integer type. */ using size_type = std::size_t; /*! @brief Sink type. */ - using sink_type = sink; + using sink_type = sink>; + + /*! @brief Default constructor. */ + sigh() noexcept(std::is_nothrow_default_constructible_v &&std::is_nothrow_constructible_v) + : sigh{allocator_type{}} {} /** - * @brief Instance type when it comes to connecting member functions. - * @tparam Class Type of class to which the member function belongs. + * @brief Constructs a signal handler with a given allocator. + * @param allocator The allocator to use. */ - template - using instance_type = Class *; + explicit sigh(const allocator_type &allocator) noexcept(std::is_nothrow_constructible_v) + : calls{allocator} {} + + /** + * @brief Copy constructor. + * @param other The instance to copy from. + */ + sigh(const sigh &other) noexcept(std::is_nothrow_copy_constructible_v) + : calls{other.calls} {} + + /** + * @brief Allocator-extended copy constructor. + * @param other The instance to copy from. + * @param allocator The allocator to use. + */ + sigh(const sigh &other, const allocator_type &allocator) noexcept(std::is_nothrow_constructible_v) + : calls{other.calls, allocator} {} + + /** + * @brief Move constructor. + * @param other The instance to move from. + */ + sigh(sigh &&other) noexcept(std::is_nothrow_move_constructible_v) + : calls{std::move(other.calls)} {} + + /** + * @brief Allocator-extended move constructor. + * @param other The instance to move from. + * @param allocator The allocator to use. + */ + sigh(sigh &&other, const allocator_type &allocator) noexcept(std::is_nothrow_constructible_v) + : calls{std::move(other.calls), allocator} {} + + /** + * @brief Copy assignment operator. + * @param other The instance to copy from. + * @return This signal handler. + */ + sigh &operator=(const sigh &other) noexcept(std::is_nothrow_copy_assignable_v) { + calls = other.calls; + return *this; + } + + /** + * @brief Move assignment operator. + * @param other The instance to move from. + * @return This signal handler. + */ + sigh &operator=(sigh &&other) noexcept(std::is_nothrow_move_assignable_v) { + calls = std::move(other.calls); + return *this; + } + + /** + * @brief Exchanges the contents with those of a given signal handler. + * @param other Signal handler to exchange the content with. + */ + void swap(sigh &other) noexcept(std::is_nothrow_swappable_v) { + using std::swap; + swap(calls, other.calls); + } + + /** + * @brief Returns the associated allocator. + * @return The associated allocator. + */ + [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { + return calls.get_allocator(); + } /** * @brief Number of listeners connected to the signal. * @return Number of listeners currently connected. */ - [[nodiscard]] size_type size() const ENTT_NOEXCEPT { + [[nodiscard]] size_type size() const noexcept { return calls.size(); } @@ -85,7 +156,7 @@ public: * @brief Returns false if at least a listener is connected to the signal. * @return True if the signal has no listeners connected, false otherwise. */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { + [[nodiscard]] bool empty() const noexcept { return calls.empty(); } @@ -122,14 +193,18 @@ public: if constexpr(std::is_void_v) { if constexpr(std::is_invocable_r_v) { call(args...); - if(func()) { break; } + if(func()) { + break; + } } else { call(args...); func(); } } else { if constexpr(std::is_invocable_r_v) { - if(func(call(args...))) { break; } + if(func(call(args...))) { + break; + } } else { func(call(args...)); } @@ -138,10 +213,9 @@ public: } private: - std::vector> calls; + container_type calls; }; - /** * @brief Connection class. * @@ -155,18 +229,19 @@ class connection { friend class sink; connection(delegate fn, void *ref) - : disconnect{fn}, signal{ref} - {} + : disconnect{fn}, signal{ref} {} public: /*! @brief Default constructor. */ - connection() = default; + connection() + : disconnect{}, + signal{} {} /** * @brief Checks whether a connection is properly initialized. * @return True if the connection is properly initialized, false otherwise. */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { + [[nodiscard]] explicit operator bool() const noexcept { return static_cast(disconnect); } @@ -180,10 +255,9 @@ public: private: delegate disconnect; - void *signal{}; + void *signal; }; - /** * @brief Scoped connection class. * @@ -202,12 +276,18 @@ struct scoped_connection { * @param other A valid connection object. */ scoped_connection(const connection &other) - : conn{other} - {} + : conn{other} {} /*! @brief Default copy constructor, deleted on purpose. */ scoped_connection(const scoped_connection &) = delete; + /** + * @brief Move constructor. + * @param other The scoped connection to move from. + */ + scoped_connection(scoped_connection &&other) noexcept + : conn{std::exchange(other.conn, {})} {} + /*! @brief Automatically breaks the link on destruction. */ ~scoped_connection() { conn.release(); @@ -217,14 +297,24 @@ struct scoped_connection { * @brief Default copy assignment operator, deleted on purpose. * @return This scoped connection. */ - scoped_connection & operator=(const scoped_connection &) = delete; + scoped_connection &operator=(const scoped_connection &) = delete; + + /** + * @brief Move assignment operator. + * @param other The scoped connection to move from. + * @return This scoped connection. + */ + scoped_connection &operator=(scoped_connection &&other) noexcept { + conn = std::exchange(other.conn, {}); + return *this; + } /** * @brief Acquires a connection. * @param other The connection object to acquire. * @return This scoped connection. */ - scoped_connection & operator=(connection other) { + scoped_connection &operator=(connection other) { conn = std::move(other); return *this; } @@ -233,7 +323,7 @@ struct scoped_connection { * @brief Checks whether a scoped connection is properly initialized. * @return True if the connection is properly initialized, false otherwise. */ - [[nodiscard]] explicit operator bool() const ENTT_NOEXCEPT { + [[nodiscard]] explicit operator bool() const noexcept { return static_cast(conn); } @@ -246,7 +336,6 @@ private: connection conn; }; - /** * @brief Sink class. * @@ -264,11 +353,12 @@ private: * * @tparam Ret Return type of a function type. * @tparam Args Types of arguments of a function type. + * @tparam Allocator Type of allocator used to manage memory and elements. */ -template -class sink { - using signal_type = sigh; - using difference_type = typename std::iterator_traits::difference_type; +template +class sink> { + using signal_type = sigh; + using difference_type = typename signal_type::container_type::difference_type; template static void release(Type value_or_instance, void *signal) { @@ -280,21 +370,29 @@ class sink { sink{*static_cast(signal)}.disconnect(); } + auto before(delegate call) { + const auto &calls = signal->calls; + const auto it = std::find(calls.cbegin(), calls.cend(), std::move(call)); + + sink other{*this}; + other.offset = calls.cend() - it; + return other; + } + public: /** * @brief Constructs a sink that is allowed to modify a given signal. * @param ref A valid reference to a signal object. */ - sink(sigh &ref) ENTT_NOEXCEPT + sink(sigh &ref) noexcept : offset{}, - signal{&ref} - {} + signal{&ref} {} /** * @brief Returns false if at least a listener is connected to the sink. * @return True if the sink has no listeners connected, false otherwise. */ - [[nodiscard]] bool empty() const ENTT_NOEXCEPT { + [[nodiscard]] bool empty() const noexcept { return signal->calls.empty(); } @@ -308,13 +406,7 @@ public: [[nodiscard]] sink before() { delegate call{}; call.template connect(); - - const auto &calls = signal->calls; - const auto it = std::find(calls.cbegin(), calls.cend(), std::move(call)); - - sink other{*this}; - other.offset = std::distance(it, calls.cend()); - return other; + return before(std::move(call)); } /** @@ -329,13 +421,7 @@ public: [[nodiscard]] sink before(Type &&value_or_instance) { delegate call{}; call.template connect(value_or_instance); - - const auto &calls = signal->calls; - const auto it = std::find(calls.cbegin(), calls.cend(), std::move(call)); - - sink other{*this}; - other.offset = std::distance(it, calls.cend()); - return other; + return before(std::move(call)); } /** @@ -345,7 +431,7 @@ public: * @param value_or_instance A valid object that fits the purpose. * @return A properly initialized sink object. */ - template + template>, void>, sink>> [[nodiscard]] sink before(Type &value_or_instance) { return before(&value_or_instance); } @@ -353,21 +439,19 @@ public: /** * @brief Returns a sink that connects before a given instance or specific * payload. - * @tparam Type Type of class or type of payload. * @param value_or_instance A valid pointer that fits the purpose. * @return A properly initialized sink object. */ - template - [[nodiscard]] sink before(Type *value_or_instance) { + [[nodiscard]] sink before(const void *value_or_instance) { sink other{*this}; if(value_or_instance) { const auto &calls = signal->calls; const auto it = std::find_if(calls.cbegin(), calls.cend(), [value_or_instance](const auto &delegate) { - return delegate.instance() == value_or_instance; + return delegate.data() == value_or_instance; }); - other.offset = std::distance(it, calls.cend()); + other.offset = calls.cend() - it; } return other; @@ -384,81 +468,47 @@ public: } /** - * @brief Connects a free function or an unbound member to a signal. + * @brief Connects a free function (with or without payload), a bound or an + * unbound member to a signal. * - * The signal handler performs checks to avoid multiple connections for the - * same function. - * - * @tparam Candidate Function or member to connect to the signal. - * @return A properly initialized connection object. - */ - template - connection connect() { - disconnect(); - - delegate call{}; - call.template connect(); - signal->calls.insert(signal->calls.end() - offset, std::move(call)); - - delegate conn{}; - conn.template connect<&release>(); - return { std::move(conn), signal }; - } - - /** - * @brief Connects a free function with payload or a bound member to a - * signal. - * - * The signal isn't responsible for the connected object or the payload. - * Users must always guarantee that the lifetime of the instance overcomes - * the one of the signal. On the other side, the signal handler performs + * The signal isn't responsible for the connected object or the payload, if + * any. Users must guarantee that the lifetime of the instance overcomes the + * one of the signal. On the other side, the signal handler performs * checks to avoid multiple connections for the same function.
* When used to connect a free function with payload, its signature must be * such that the instance is the first argument before the ones used to * define the signal itself. * * @tparam Candidate Function or member to connect to the signal. - * @tparam Type Type of class or type of payload. - * @param value_or_instance A valid object that fits the purpose. + * @tparam Type Type of class or type of payload, if any. + * @param value_or_instance A valid object that fits the purpose, if any. * @return A properly initialized connection object. */ - template - connection connect(Type &&value_or_instance) { - disconnect(value_or_instance); + template + connection connect(Type &&...value_or_instance) { + disconnect(value_or_instance...); delegate call{}; - call.template connect(value_or_instance); + call.template connect(value_or_instance...); signal->calls.insert(signal->calls.end() - offset, std::move(call)); delegate conn{}; - conn.template connect<&release>(value_or_instance); - return { std::move(conn), signal }; + conn.template connect<&release>(value_or_instance...); + return {std::move(conn), signal}; } /** - * @brief Disconnects a free function or an unbound member from a signal. + * @brief Disconnects a free function (with or without payload), a bound or + * an unbound member from a signal. * @tparam Candidate Function or member to disconnect from the signal. + * @tparam Type Type of class or type of payload, if any. + * @param value_or_instance A valid object that fits the purpose, if any. */ - template - void disconnect() { + template + void disconnect(Type &&...value_or_instance) { auto &calls = signal->calls; delegate call{}; - call.template connect(); - calls.erase(std::remove(calls.begin(), calls.end(), std::move(call)), calls.end()); - } - - /** - * @brief Disconnects a free function with payload or a bound member from a - * signal. - * @tparam Candidate Function or member to disconnect from the signal. - * @tparam Type Type of class or type of payload. - * @param value_or_instance A valid object that fits the purpose. - */ - template - void disconnect(Type &&value_or_instance) { - auto &calls = signal->calls; - delegate call{}; - call.template connect(value_or_instance); + call.template connect(value_or_instance...); calls.erase(std::remove(calls.begin(), calls.end(), std::move(call)), calls.end()); } @@ -468,7 +518,7 @@ public: * @tparam Type Type of class or type of payload. * @param value_or_instance A valid object that fits the purpose. */ - template + template>, void>>> void disconnect(Type &value_or_instance) { disconnect(&value_or_instance); } @@ -476,16 +526,13 @@ public: /** * @brief Disconnects free functions with payload or bound members from a * signal. - * @tparam Type Type of class or type of payload. * @param value_or_instance A valid object that fits the purpose. */ - template - void disconnect(Type *value_or_instance) { + void disconnect(const void *value_or_instance) { if(value_or_instance) { auto &calls = signal->calls; - calls.erase(std::remove_if(calls.begin(), calls.end(), [value_or_instance](const auto &delegate) { - return delegate.instance() == value_or_instance; - }), calls.end()); + auto predicate = [value_or_instance](const auto &delegate) { return delegate.data() == value_or_instance; }; + calls.erase(std::remove_if(calls.begin(), calls.end(), std::move(predicate)), calls.end()); } } @@ -499,22 +546,19 @@ private: signal_type *signal; }; - /** * @brief Deduction guide. * - * It allows to deduce the function type of a sink directly from the signal it - * refers to. + * It allows to deduce the signal handler type of a sink directly from the + * signal it refers to. * * @tparam Ret Return type of a function type. * @tparam Args Types of arguments of a function type. + * @tparam Allocator Type of allocator used to manage memory and elements. */ -template -sink(sigh &) --> sink; - - -} +template +sink(sigh &) -> sink>; +} // namespace entt #endif diff --git a/LiteLoader/Header/third-party/gsl/gsl b/LiteLoader/third-party/include/gsl/gsl similarity index 100% rename from LiteLoader/Header/third-party/gsl/gsl rename to LiteLoader/third-party/include/gsl/gsl diff --git a/LiteLoader/Header/third-party/gsl/gsl_algorithm b/LiteLoader/third-party/include/gsl/gsl_algorithm similarity index 100% rename from LiteLoader/Header/third-party/gsl/gsl_algorithm rename to LiteLoader/third-party/include/gsl/gsl_algorithm diff --git a/LiteLoader/Header/third-party/gsl/gsl_assert b/LiteLoader/third-party/include/gsl/gsl_assert similarity index 100% rename from LiteLoader/Header/third-party/gsl/gsl_assert rename to LiteLoader/third-party/include/gsl/gsl_assert diff --git a/LiteLoader/Header/third-party/gsl/gsl_byte b/LiteLoader/third-party/include/gsl/gsl_byte similarity index 100% rename from LiteLoader/Header/third-party/gsl/gsl_byte rename to LiteLoader/third-party/include/gsl/gsl_byte diff --git a/LiteLoader/Header/third-party/gsl/gsl_util b/LiteLoader/third-party/include/gsl/gsl_util similarity index 100% rename from LiteLoader/Header/third-party/gsl/gsl_util rename to LiteLoader/third-party/include/gsl/gsl_util diff --git a/LiteLoader/Header/third-party/gsl/multi_span b/LiteLoader/third-party/include/gsl/multi_span similarity index 100% rename from LiteLoader/Header/third-party/gsl/multi_span rename to LiteLoader/third-party/include/gsl/multi_span diff --git a/LiteLoader/Header/third-party/gsl/pointers b/LiteLoader/third-party/include/gsl/pointers similarity index 100% rename from LiteLoader/Header/third-party/gsl/pointers rename to LiteLoader/third-party/include/gsl/pointers diff --git a/LiteLoader/Header/third-party/gsl/span b/LiteLoader/third-party/include/gsl/span similarity index 100% rename from LiteLoader/Header/third-party/gsl/span rename to LiteLoader/third-party/include/gsl/span diff --git a/LiteLoader/Header/third-party/gsl/span_ext b/LiteLoader/third-party/include/gsl/span_ext similarity index 100% rename from LiteLoader/Header/third-party/gsl/span_ext rename to LiteLoader/third-party/include/gsl/span_ext diff --git a/LiteLoader/Header/third-party/gsl/string_span b/LiteLoader/third-party/include/gsl/string_span similarity index 100% rename from LiteLoader/Header/third-party/gsl/string_span rename to LiteLoader/third-party/include/gsl/string_span diff --git a/LiteLoader/Header/third-party/httplib/httplib.h b/LiteLoader/third-party/include/httplib/httplib.h similarity index 100% rename from LiteLoader/Header/third-party/httplib/httplib.h rename to LiteLoader/third-party/include/httplib/httplib.h diff --git a/LiteLoader/Header/third-party/leveldb/c.h b/LiteLoader/third-party/include/leveldb/c.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/c.h rename to LiteLoader/third-party/include/leveldb/c.h diff --git a/LiteLoader/Header/third-party/leveldb/cache.h b/LiteLoader/third-party/include/leveldb/cache.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/cache.h rename to LiteLoader/third-party/include/leveldb/cache.h diff --git a/LiteLoader/Header/third-party/leveldb/comparator.h b/LiteLoader/third-party/include/leveldb/comparator.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/comparator.h rename to LiteLoader/third-party/include/leveldb/comparator.h diff --git a/LiteLoader/Header/third-party/leveldb/db.h b/LiteLoader/third-party/include/leveldb/db.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/db.h rename to LiteLoader/third-party/include/leveldb/db.h diff --git a/LiteLoader/Header/third-party/leveldb/dumpfile.h b/LiteLoader/third-party/include/leveldb/dumpfile.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/dumpfile.h rename to LiteLoader/third-party/include/leveldb/dumpfile.h diff --git a/LiteLoader/Header/third-party/leveldb/env.h b/LiteLoader/third-party/include/leveldb/env.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/env.h rename to LiteLoader/third-party/include/leveldb/env.h diff --git a/LiteLoader/Header/third-party/leveldb/export.h b/LiteLoader/third-party/include/leveldb/export.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/export.h rename to LiteLoader/third-party/include/leveldb/export.h diff --git a/LiteLoader/Header/third-party/leveldb/filter_policy.h b/LiteLoader/third-party/include/leveldb/filter_policy.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/filter_policy.h rename to LiteLoader/third-party/include/leveldb/filter_policy.h diff --git a/LiteLoader/Header/third-party/leveldb/iterator.h b/LiteLoader/third-party/include/leveldb/iterator.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/iterator.h rename to LiteLoader/third-party/include/leveldb/iterator.h diff --git a/LiteLoader/Header/third-party/leveldb/options.h b/LiteLoader/third-party/include/leveldb/options.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/options.h rename to LiteLoader/third-party/include/leveldb/options.h diff --git a/LiteLoader/Header/third-party/leveldb/slice.h b/LiteLoader/third-party/include/leveldb/slice.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/slice.h rename to LiteLoader/third-party/include/leveldb/slice.h diff --git a/LiteLoader/Header/third-party/leveldb/status.h b/LiteLoader/third-party/include/leveldb/status.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/status.h rename to LiteLoader/third-party/include/leveldb/status.h diff --git a/LiteLoader/Header/third-party/leveldb/table.h b/LiteLoader/third-party/include/leveldb/table.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/table.h rename to LiteLoader/third-party/include/leveldb/table.h diff --git a/LiteLoader/Header/third-party/leveldb/table_builder.h b/LiteLoader/third-party/include/leveldb/table_builder.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/table_builder.h rename to LiteLoader/third-party/include/leveldb/table_builder.h diff --git a/LiteLoader/Header/third-party/leveldb/write_batch.h b/LiteLoader/third-party/include/leveldb/write_batch.h similarity index 100% rename from LiteLoader/Header/third-party/leveldb/write_batch.h rename to LiteLoader/third-party/include/leveldb/write_batch.h diff --git a/LiteLoader/third-party/include/magic_enum/magic_enum.hpp b/LiteLoader/third-party/include/magic_enum/magic_enum.hpp new file mode 100644 index 0000000..9aa0e69 --- /dev/null +++ b/LiteLoader/third-party/include/magic_enum/magic_enum.hpp @@ -0,0 +1,1504 @@ +// __ __ _ ______ _____ +// | \/ | (_) | ____| / ____|_ _ +// | \ / | __ _ __ _ _ ___ | |__ _ __ _ _ _ __ ___ | | _| |_ _| |_ +// | |\/| |/ _` |/ _` | |/ __| | __| | '_ \| | | | '_ ` _ \ | | |_ _|_ _| +// | | | | (_| | (_| | | (__ | |____| | | | |_| | | | | | | | |____|_| |_| +// |_| |_|\__,_|\__, |_|\___| |______|_| |_|\__,_|_| |_| |_| \_____| +// __/ | https://github.com/Neargye/magic_enum +// |___/ version 0.8.1 +// +// Licensed under the MIT License . +// SPDX-License-Identifier: MIT +// Copyright (c) 2019 - 2022 Daniil Goncharov . +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#ifndef NEARGYE_MAGIC_ENUM_HPP +#define NEARGYE_MAGIC_ENUM_HPP + +#define MAGIC_ENUM_VERSION_MAJOR 0 +#define MAGIC_ENUM_VERSION_MINOR 8 +#define MAGIC_ENUM_VERSION_PATCH 1 + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(MAGIC_ENUM_CONFIG_FILE) +#include MAGIC_ENUM_CONFIG_FILE +#endif + +#if !defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) +#include +#endif +#if !defined(MAGIC_ENUM_USING_ALIAS_STRING) +#include +#endif +#if !defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) +#include +#endif + +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wenum-constexpr-conversion" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // May be used uninitialized 'return {};'. +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 26495) // Variable 'static_string::chars_' is uninitialized. +#pragma warning(disable : 28020) // Arithmetic overflow: Using operator '-' on a 4 byte value and then casting the result to a 8 byte value. +#pragma warning(disable : 26451) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call. +#pragma warning(disable : 4514) // Unreferenced inline function has been removed. +#endif + +// Checks magic_enum compiler compatibility. +#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1910 +#undef MAGIC_ENUM_SUPPORTED +#define MAGIC_ENUM_SUPPORTED 1 +#endif + +// Checks magic_enum compiler aliases compatibility. +#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1920 +#undef MAGIC_ENUM_SUPPORTED_ALIASES +#define MAGIC_ENUM_SUPPORTED_ALIASES 1 +#endif + +// Enum value must be greater or equals than MAGIC_ENUM_RANGE_MIN. By default MAGIC_ENUM_RANGE_MIN = -128. +// If need another min range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN. +#if !defined(MAGIC_ENUM_RANGE_MIN) +#define MAGIC_ENUM_RANGE_MIN -128 +#endif + +// Enum value must be less or equals than MAGIC_ENUM_RANGE_MAX. By default MAGIC_ENUM_RANGE_MAX = 128. +// If need another max range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MAX. +#if !defined(MAGIC_ENUM_RANGE_MAX) +#define MAGIC_ENUM_RANGE_MAX 128 +#endif + +namespace magic_enum { + +// If need another optional type, define the macro MAGIC_ENUM_USING_ALIAS_OPTIONAL. +#if defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) +MAGIC_ENUM_USING_ALIAS_OPTIONAL +#else +using std::optional; +#endif + +// If need another string_view type, define the macro MAGIC_ENUM_USING_ALIAS_STRING_VIEW. +#if defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) +MAGIC_ENUM_USING_ALIAS_STRING_VIEW +#else +using std::string_view; +#endif + +// If need another string type, define the macro MAGIC_ENUM_USING_ALIAS_STRING. +#if defined(MAGIC_ENUM_USING_ALIAS_STRING) +MAGIC_ENUM_USING_ALIAS_STRING +#else +using std::string; +#endif + +namespace customize { + +// Enum value must be in range [MAGIC_ENUM_RANGE_MIN, MAGIC_ENUM_RANGE_MAX]. By default MAGIC_ENUM_RANGE_MIN = -128, MAGIC_ENUM_RANGE_MAX = 128. +// If need another range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN and MAGIC_ENUM_RANGE_MAX. +// If need another range for specific enum type, add specialization enum_range for necessary enum type. +template +struct enum_range { + static_assert(std::is_enum_v, "magic_enum::customize::enum_range requires enum type."); + static constexpr int min = MAGIC_ENUM_RANGE_MIN; + static constexpr int max = MAGIC_ENUM_RANGE_MAX; + static_assert(max > min, "magic_enum::customize::enum_range requires max > min."); +}; + +static_assert(MAGIC_ENUM_RANGE_MAX > MAGIC_ENUM_RANGE_MIN, "MAGIC_ENUM_RANGE_MAX must be greater than MAGIC_ENUM_RANGE_MIN."); +static_assert((MAGIC_ENUM_RANGE_MAX - MAGIC_ENUM_RANGE_MIN) < (std::numeric_limits::max)(), "MAGIC_ENUM_RANGE must be less than UINT16_MAX."); + +namespace detail { +enum class default_customize_tag { +}; +enum class invalid_customize_tag { +}; +} // namespace detail + +using customize_t = std::variant; + +// Default customize. +inline constexpr auto default_tag = detail::default_customize_tag{}; +// Invalid customize. +inline constexpr auto invalid_tag = detail::invalid_customize_tag{}; + +// If need custom names for enum, add specialization enum_name for necessary enum type. +template +constexpr customize_t enum_name(E) noexcept { + return default_tag; +} + +// If need custom type name for enum, add specialization enum_type_name for necessary enum type. +template +constexpr customize_t enum_type_name() noexcept { + return default_tag; +} + +} // namespace customize + +namespace detail { + +template , std::enable_if_t, int> = 0> +using enum_constant = std::integral_constant; + +template +inline constexpr bool always_false_v = false; + +template +struct supported +#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED || defined(MAGIC_ENUM_NO_CHECK_SUPPORT) +: std::true_type { +}; +#else +: std::false_type { +}; +#endif + +template +struct has_is_flags : std::false_type {}; + +template +struct has_is_flags::is_flags)>> : std::bool_constant::is_flags)>>> {}; + +template +struct range_min : std::integral_constant {}; + +template +struct range_min::min)>> : std::integral_constant::min), customize::enum_range::min> {}; + +template +struct range_max : std::integral_constant {}; + +template +struct range_max::max)>> : std::integral_constant::max), customize::enum_range::max> {}; + +template +class static_string { +public: + constexpr explicit static_string(string_view str) noexcept + : static_string{str, std::make_integer_sequence{}} { + assert(str.size() == N); + } + + constexpr const char* data() const noexcept { + return chars_; + } + + constexpr std::uint16_t size() const noexcept { + return N; + } + + constexpr operator string_view() const noexcept { + return {data(), size()}; + } + +private: + template + constexpr static_string(string_view str, std::integer_sequence) noexcept + : chars_{str[I]..., '\0'} { + } + + char chars_[static_cast(N) + 1]; +}; + +template <> +class static_string<0> { +public: + constexpr explicit static_string() = default; + + constexpr explicit static_string(string_view) noexcept { + } + + constexpr const char* data() const noexcept { + return nullptr; + } + + constexpr std::uint16_t size() const noexcept { + return 0; + } + + constexpr operator string_view() const noexcept { + return {}; + } +}; + +constexpr string_view pretty_name(string_view name) noexcept { + for (std::size_t i = name.size(); i > 0; --i) { + if (!((name[i - 1] >= '0' && name[i - 1] <= '9') || + (name[i - 1] >= 'a' && name[i - 1] <= 'z') || + (name[i - 1] >= 'A' && name[i - 1] <= 'Z') || +#if defined(MAGIC_ENUM_ENABLE_NONASCII) + (name[i - 1] & 0x80) || +#endif + (name[i - 1] == '_'))) { + name.remove_prefix(i); + break; + } + } + + if (name.size() > 0 && ((name[0] >= 'a' && name[0] <= 'z') || + (name[0] >= 'A' && name[0] <= 'Z') || +#if defined(MAGIC_ENUM_ENABLE_NONASCII) + (name[0]) & 0x80) || +#endif + (name[0] == '_'))) { + return name; + } + + return {}; // Invalid name. +} + +class case_insensitive { + static constexpr char to_lower(char c) noexcept { + return (c >= 'A' && c <= 'Z') ? static_cast(c + ('a' - 'A')) : c; + } + +public: + template + constexpr auto operator()([[maybe_unused]] L lhs, [[maybe_unused]] R rhs) const noexcept -> std::enable_if_t, char> && std::is_same_v, char>, bool> { +#if defined(MAGIC_ENUM_ENABLE_NONASCII) + static_assert(always_false_v, "magic_enum::case_insensitive not supported Non-ASCII feature."); + return false; +#else + return to_lower(lhs) == to_lower(rhs); +#endif + } +}; + +constexpr std::size_t find(string_view str, char c) noexcept { +#if defined(__clang__) && __clang_major__ < 9 && defined(__GLIBCXX__) || defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) + // https://stackoverflow.com/questions/56484834/constexpr-stdstring-viewfind-last-of-doesnt-work-on-clang-8-with-libstdc + // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html + constexpr bool workaround = true; +#else + constexpr bool workaround = false; +#endif + + if constexpr (workaround) { + for (std::size_t i = 0; i < str.size(); ++i) { + if (str[i] == c) { + return i; + } + } + + return string_view::npos; + } else { + return str.find(c); + } +} + +template +constexpr std::array, N> to_array(T (&a)[N], std::index_sequence) noexcept { + return {{a[I]...}}; +} + +template +constexpr bool is_default_predicate() noexcept { + return std::is_same_v, std::equal_to> || + std::is_same_v, std::equal_to<>>; +} + +template +constexpr bool is_nothrow_invocable() { + return is_default_predicate() || + std::is_nothrow_invocable_r_v; +} + +template +constexpr bool cmp_equal(string_view lhs, string_view rhs, [[maybe_unused]] BinaryPredicate&& p) noexcept(is_nothrow_invocable()) { +#if defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) + // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html + // https://developercommunity.visualstudio.com/content/problem/232218/c-constexpr-string-view.html + constexpr bool workaround = true; +#else + constexpr bool workaround = false; +#endif + + if constexpr (!is_default_predicate() || workaround) { + if (lhs.size() != rhs.size()) { + return false; + } + + const auto size = lhs.size(); + for (std::size_t i = 0; i < size; ++i) { + if (!p(lhs[i], rhs[i])) { + return false; + } + } + + return true; + } else { + return lhs == rhs; + } +} + +template +constexpr bool cmp_less(L lhs, R rhs) noexcept { + static_assert(std::is_integral_v && std::is_integral_v, "magic_enum::detail::cmp_less requires integral type."); + + if constexpr (std::is_signed_v == std::is_signed_v) { + // If same signedness (both signed or both unsigned). + return lhs < rhs; + } else if constexpr (std::is_same_v) { // bool special case + return static_cast(lhs) < rhs; + } else if constexpr (std::is_same_v) { // bool special case + return lhs < static_cast(rhs); + } else if constexpr (std::is_signed_v) { + // If 'right' is negative, then result is 'false', otherwise cast & compare. + return rhs > 0 && lhs < static_cast>(rhs); + } else { + // If 'left' is negative, then result is 'true', otherwise cast & compare. + return lhs < 0 || static_cast>(lhs) < rhs; + } +} + +template +constexpr I log2(I value) noexcept { + static_assert(std::is_integral_v, "magic_enum::detail::log2 requires integral type."); + + if constexpr (std::is_same_v) { // bool special case + return assert(false), value; + } else { + auto ret = I{0}; + for (; value > I{1}; value >>= I{1}, ++ret) {} + + return ret; + } +} + +template +inline constexpr bool is_enum_v = std::is_enum_v&& std::is_same_v>; + +template +constexpr auto n() noexcept { + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); + + if constexpr (supported::value) { +#if defined(__clang__) || defined(__GNUC__) + constexpr auto name = pretty_name({__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 2}); +#elif defined(_MSC_VER) + constexpr auto name = pretty_name({__FUNCSIG__, sizeof(__FUNCSIG__) - 17}); +#else + constexpr auto name = string_view{}; +#endif + return static_string{name}; + } else { + return static_string<0>{}; // Unsupported compiler or Invalid customize. + } +} + +template +constexpr auto type_name() noexcept { + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); + + [[maybe_unused]] constexpr auto custom = customize::enum_type_name(); + static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); + if constexpr (std::is_same_v, customize::customize_t> && custom.index() == 0) { + constexpr auto name = std::get(custom); + static_assert(!name.empty(), "magic_enum::customize requires not empty string."); + return static_string{name}; + } else { + return n(); + } +} + +template +inline constexpr auto type_name_v = type_name(); + +template +constexpr auto n() noexcept { + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); + + if constexpr (supported::value) { +#if defined(__clang__) || defined(__GNUC__) + constexpr auto name = pretty_name({__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 2}); +#elif defined(_MSC_VER) + constexpr auto name = pretty_name({__FUNCSIG__, sizeof(__FUNCSIG__) - 17}); +#else + constexpr auto name = string_view{}; +#endif + return static_string{name}; + } else { + return static_string<0>{}; // Unsupported compiler or Invalid customize. + } +} + +template +constexpr auto enum_name() noexcept { + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); + + [[maybe_unused]] constexpr auto custom = customize::enum_name(V); + static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); + if constexpr (std::is_same_v, customize::customize_t> && custom.index() == 0) { + constexpr auto name = std::get(custom); + static_assert(!name.empty(), "magic_enum::customize requires not empty string."); + return static_string{name}; + } else { + return n(); + } +} + +template +inline constexpr auto enum_name_v = enum_name(); + +template +constexpr bool is_valid() noexcept { + static_assert(is_enum_v, "magic_enum::detail::is_valid requires enum type."); + +#if defined(__clang__) && __clang_major__ >= 16 + // https://reviews.llvm.org/D130058, https://reviews.llvm.org/D131307 + constexpr E v = __builtin_bit_cast(E, V); + [[maybe_unused]] constexpr auto custom = customize::enum_name(v); + static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); + if constexpr (std::is_same_v, customize::customize_t> && custom.index() == 0) { + constexpr auto name = std::get(custom); + static_assert(!name.empty(), "magic_enum::customize requires not empty string."); + return name.size() != 0; + } else { + return n().size() != 0; + } +#else + return enum_name(V)>().size() != 0; +#endif +} + +template > +constexpr U ualue(std::size_t i) noexcept { + static_assert(is_enum_v, "magic_enum::detail::ualue requires enum type."); + + if constexpr (std::is_same_v) { // bool special case + static_assert(O == 0, "magic_enum::detail::ualue requires valid offset."); + + return static_cast(i); + } else if constexpr (IsFlags) { + return static_cast(U{1} << static_cast(static_cast(i) + O)); + } else { + return static_cast(static_cast(i) + O); + } +} + +template > +constexpr E value(std::size_t i) noexcept { + static_assert(is_enum_v, "magic_enum::detail::value requires enum type."); + + return static_cast(ualue(i)); +} + +template > +constexpr int reflected_min() noexcept { + static_assert(is_enum_v, "magic_enum::detail::reflected_min requires enum type."); + + if constexpr (IsFlags) { + return 0; + } else { + constexpr auto lhs = range_min::value; + constexpr auto rhs = (std::numeric_limits::min)(); + + if constexpr (cmp_less(rhs, lhs)) { + return lhs; + } else { + return rhs; + } + } +} + +template > +constexpr int reflected_max() noexcept { + static_assert(is_enum_v, "magic_enum::detail::reflected_max requires enum type."); + + if constexpr (IsFlags) { + return std::numeric_limits::digits - 1; + } else { + constexpr auto lhs = range_max::value; + constexpr auto rhs = (std::numeric_limits::max)(); + + if constexpr (cmp_less(lhs, rhs)) { + return lhs; + } else { + return rhs; + } + } +} + +template +inline constexpr auto reflected_min_v = reflected_min(); + +template +inline constexpr auto reflected_max_v = reflected_max(); + +template +constexpr std::size_t values_count(const bool (&valid)[N]) noexcept { + auto count = std::size_t{0}; + for (std::size_t i = 0; i < N; ++i) { + if (valid[i]) { + ++count; + } + } + + return count; +} + +template +constexpr auto values(std::index_sequence) noexcept { + static_assert(is_enum_v, "magic_enum::detail::values requires enum type."); + constexpr bool valid[sizeof...(I)] = {is_valid(I)>()...}; + constexpr std::size_t count = values_count(valid); + + if constexpr (count > 0) { + E values[count] = {}; + for (std::size_t i = 0, v = 0; v < count; ++i) { + if (valid[i]) { + values[v++] = value(i); + } + } + + return to_array(values, std::make_index_sequence{}); + } else { + return std::array{}; + } +} + +template > +constexpr auto values() noexcept { + static_assert(is_enum_v, "magic_enum::detail::values requires enum type."); + constexpr auto min = reflected_min_v; + constexpr auto max = reflected_max_v; + constexpr auto range_size = max - min + 1; + static_assert(range_size > 0, "magic_enum::enum_range requires valid size."); + static_assert(range_size < (std::numeric_limits::max)(), "magic_enum::enum_range requires valid size."); + + return values(std::make_index_sequence{}); +} + +template > +constexpr bool is_flags_enum() noexcept { + static_assert(is_enum_v, "magic_enum::detail::is_flags_enum requires enum type."); + + if constexpr (has_is_flags::value) { + return customize::enum_range::is_flags; + } else if constexpr (std::is_same_v) { // bool special case + return false; + } else { +#if defined(MAGIC_ENUM_NO_CHECK_FLAGS) + return false; +#else + constexpr auto flags_values = values(); + constexpr auto default_values = values(); + if (flags_values.size() == 0 || default_values.size() > flags_values.size()) { + return false; + } + for (std::size_t i = 0; i < default_values.size(); ++i) { + const auto v = static_cast(default_values[i]); + if (v != 0 && (v & (v - 1)) != 0) { + return false; + } + } + return flags_values.size() > 0; +#endif + } +} + +template +inline constexpr bool is_flags_v = is_flags_enum(); + +template +inline constexpr std::array values_v = values>(); + +template > +using values_t = decltype((values_v)); + +template +inline constexpr auto count_v = values_v.size(); + +template > +inline constexpr auto min_v = (count_v > 0) ? static_cast(values_v.front()) : U{0}; + +template > +inline constexpr auto max_v = (count_v > 0) ? static_cast(values_v.back()) : U{0}; + +template +constexpr auto names(std::index_sequence) noexcept { + static_assert(is_enum_v, "magic_enum::detail::names requires enum type."); + + return std::array{{enum_name_v[I]>...}}; +} + +template +inline constexpr std::array names_v = names(std::make_index_sequence>{}); + +template > +using names_t = decltype((names_v)); + +template +constexpr auto entries(std::index_sequence) noexcept { + static_assert(is_enum_v, "magic_enum::detail::entries requires enum type."); + + return std::array, sizeof...(I)>{{{values_v[I], enum_name_v[I]>}...}}; +} + +template +inline constexpr std::array entries_v = entries(std::make_index_sequence>{}); + +template > +using entries_t = decltype((entries_v)); + +template > +constexpr bool is_sparse() noexcept { + static_assert(is_enum_v, "magic_enum::detail::is_sparse requires enum type."); + + if constexpr (count_v == 0) { + return false; + } else if constexpr (std::is_same_v) { // bool special case + return false; + } else { + constexpr auto max = is_flags_v ? log2(max_v) : max_v; + constexpr auto min = is_flags_v ? log2(min_v) : min_v; + constexpr auto range_size = max - min + 1; + + return range_size != count_v; + } +} + +template +inline constexpr bool is_sparse_v = is_sparse(); + +template > +constexpr U values_ors() noexcept { + static_assert(is_enum_v, "magic_enum::detail::values_ors requires enum type."); + + auto ors = U{0}; + for (std::size_t i = 0; i < count_v; ++i) { + ors |= static_cast(values_v[i]); + } + + return ors; +} + +template +struct enable_if_enum {}; + +template +struct enable_if_enum { + using type = R; + static_assert(supported::value, "magic_enum unsupported compiler (https://github.com/Neargye/magic_enum#compiler-compatibility)."); +}; + +template > +using enable_if_t = typename enable_if_enum> && std::is_invocable_r_v, R>::type; + +template >, int> = 0> +using enum_concept = T; + +template > +struct is_scoped_enum : std::false_type {}; + +template +struct is_scoped_enum : std::bool_constant>> {}; + +template > +struct is_unscoped_enum : std::false_type {}; + +template +struct is_unscoped_enum : std::bool_constant>> {}; + +template >> +struct underlying_type {}; + +template +struct underlying_type : std::underlying_type> {}; + +#if defined(MAGIC_ENUM_NO_HASH) +template +inline constexpr bool has_hash = false; +#else +template +inline constexpr bool has_hash = true; + +template +struct constexpr_hash_t; + +template +struct constexpr_hash_t>> { + constexpr auto operator()(Value value) const noexcept { + using U = typename underlying_type::type; + if constexpr (std::is_same_v) { // bool special case + return static_cast(value); + } else { + return static_cast(value); + } + } + using secondary_hash = constexpr_hash_t; +}; + +template +struct constexpr_hash_t>> { + static constexpr std::uint32_t crc_table[256]{ + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L, + 0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, 0x90bf1d91L, + 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, + 0x136c9856L, 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, 0xfa0f3d63L, 0x8d080df5L, + 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, + 0x26d930acL, 0x51de003aL, 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, 0xb8bda50fL, + 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, + 0x76dc4190L, 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, 0x9fbfe4a5L, 0xe8b8d433L, + 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, + 0x65b0d9c6L, 0x12b7e950L, 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, 0xfbd44c65L, + 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, + 0x4369e96aL, 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, 0xaa0a4c5fL, 0xdd0d7cc9L, + 0x5005713cL, 0x270241aaL, 0xbe0b1010L, 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, + 0xedb88320L, 0x9abfb3b6L, 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, 0x73dc1683L, + 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, + 0xf00f9344L, 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, 0x196c3671L, 0x6e6b06e7L, + 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, + 0xd80d2bdaL, 0xaf0a1b4cL, 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, 0x4669be79L, + 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, + 0xc5ba3bbeL, 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, 0x2cd99e8bL, 0x5bdeae1dL, + 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, + 0x86d3d2d4L, 0xf1d4e242L, 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, 0x18b74777L, + 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, + 0xa00ae278L, 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, 0x4969474dL, 0x3e6e77dbL, + 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, 0xcdd70693L, 0x54de5729L, 0x23d967bfL, + 0xb3667a2eL, 0xc4614ab8L, 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, 0x2d02ef8dL}; + constexpr std::uint32_t operator()(string_view value) const noexcept { + auto crc = static_cast(0xffffffffL); + for (const auto c : value) { + crc = (crc >> 8) ^ crc_table[(crc ^ static_cast(c)) & 0xff]; + } + return crc ^ 0xffffffffL; + } + + struct secondary_hash { + constexpr std::uint32_t operator()(string_view value) const noexcept { + auto acc = static_cast(2166136261ULL); + for (const auto c : value) { + acc = ((acc ^ static_cast(c)) * static_cast(16777619ULL)) & (std::numeric_limits::max)(); + } + return static_cast(acc); + } + }; +}; + +template +inline constexpr Hash hash_v{}; + +template +constexpr auto calculate_cases(std::size_t Page) noexcept { + constexpr std::array values = *GlobValues; + constexpr std::size_t size = values.size(); + + using switch_t = std::invoke_result_t; + static_assert(std::is_integral_v && !std::is_same_v); + const std::size_t values_to = (std::min)(static_cast(256), size - Page); + + std::array result{}; + auto fill = result.begin(); + { + auto first = values.begin() + static_cast(Page); + auto last = values.begin() + static_cast(Page + values_to); + while (first != last) { + *fill++ = hash_v(*first++); + } + } + + // dead cases, try to avoid case collisions + for (switch_t last_value = result[values_to - 1]; fill != result.end() && last_value != (std::numeric_limits::max)(); *fill++ = ++last_value) { + } + + { + auto it = result.begin(); + auto last_value = (std::numeric_limits::min)(); + for (; fill != result.end(); *fill++ = last_value++) { + while (last_value == *it) { + ++last_value, ++it; + } + } + } + + return result; +} + +template +constexpr R invoke_r(F&& f, Args&&... args) noexcept(std::is_nothrow_invocable_r_v) { + if constexpr (std::is_void_v) { + std::forward(f)(std::forward(args)...); + } else { + return static_cast(std::forward(f)(std::forward(args)...)); + } +} + +enum class case_call_t { + index, + value +}; + +template +inline constexpr auto default_result_type_lambda = []() noexcept(std::is_nothrow_default_constructible_v) { return T{}; }; + +template <> +inline constexpr auto default_result_type_lambda = []() noexcept {}; + +template +constexpr bool no_duplicate() noexcept { + using value_t = std::decay_t; + using hash_value_t = std::invoke_result_t; + std::arraysize()> hashes{}; + std::size_t size = 0; + for (auto elem : *Arr) { + hashes[size] = hash_v(elem); + for (auto i = size++; i > 0; --i) { + if (hashes[i] < hashes[i - 1]) { + auto tmp = hashes[i]; + hashes[i] = hashes[i - 1]; + hashes[i - 1] = tmp; + } else if (hashes[i] == hashes[i - 1]) { + return false; + } else { + break; + } + } + } + return true; +} + +#define MAGIC_ENUM_FOR_EACH_256(T) T(0) T(1) T(2) T(3) T(4) T(5) T(6) T(7) T(8) T(9) T(10) T(11) T(12) T(13) T(14) T(15) T(16) T(17) T(18) T(19) T(20) T(21) T(22) T(23) T(24) T(25) T(26) T(27) T(28) T(29) T(30) T(31) \ + T(32) T(33) T(34) T(35) T(36) T(37) T(38) T(39) T(40) T(41) T(42) T(43) T(44) T(45) T(46) T(47) T(48) T(49) T(50) T(51) T(52) T(53) T(54) T(55) T(56) T(57) T(58) T(59) T(60) T(61) T(62) T(63) \ + T(64) T(65) T(66) T(67) T(68) T(69) T(70) T(71) T(72) T(73) T(74) T(75) T(76) T(77) T(78) T(79) T(80) T(81) T(82) T(83) T(84) T(85) T(86) T(87) T(88) T(89) T(90) T(91) T(92) T(93) T(94) T(95) \ + T(96) T(97) T(98) T(99) T(100) T(101) T(102) T(103) T(104) T(105) T(106) T(107) T(108) T(109) T(110) T(111) T(112) T(113) T(114) T(115) T(116) T(117) T(118) T(119) T(120) T(121) T(122) T(123) T(124) T(125) T(126) T(127) \ + T(128) T(129) T(130) T(131) T(132) T(133) T(134) T(135) T(136) T(137) T(138) T(139) T(140) T(141) T(142) T(143) T(144) T(145) T(146) T(147) T(148) T(149) T(150) T(151) T(152) T(153) T(154) T(155) T(156) T(157) T(158) T(159) \ + T(160) T(161) T(162) T(163) T(164) T(165) T(166) T(167) T(168) T(169) T(170) T(171) T(172) T(173) T(174) T(175) T(176) T(177) T(178) T(179) T(180) T(181) T(182) T(183) T(184) T(185) T(186) T(187) T(188) T(189) T(190) T(191) \ + T(192) T(193) T(194) T(195) T(196) T(197) T(198) T(199) T(200) T(201) T(202) T(203) T(204) T(205) T(206) T(207) T(208) T(209) T(210) T(211) T(212) T(213) T(214) T(215) T(216) T(217) T(218) T(219) T(220) T(221) T(222) T(223) \ + T(224) T(225) T(226) T(227) T(228) T(229) T(230) T(231) T(232) T(233) T(234) T(235) T(236) T(237) T(238) T(239) T(240) T(241) T(242) T(243) T(244) T(245) T(246) T(247) T(248) T(249) T(250) T(251) T(252) T(253) T(254) T(255) + +#define MAGIC_ENUM_CASE(val) \ + case cases[val]: \ + if constexpr ((val) + Page < size) { \ + if (!pred(values[val + Page], searched)) { \ + break; \ + } \ + if constexpr (CallValue == case_call_t::index) { \ + if constexpr (std::is_invocable_r_v>) { \ + return detail::invoke_r(std::forward(lambda), std::integral_constant{}); \ + } else if constexpr (std::is_invocable_v>) { \ + assert(false && "magic_enum::detail::constexpr_switch wrong result type."); \ + } \ + } else if constexpr (CallValue == case_call_t::value) { \ + if constexpr (std::is_invocable_r_v>) { \ + return detail::invoke_r(std::forward(lambda), enum_constant{}); \ + } else if constexpr (std::is_invocable_r_v>) { \ + assert(false && "magic_enum::detail::constexpr_switch wrong result type."); \ + } \ + } \ + break; \ + } else \ + [[fallthrough]]; + +template ::value_type>, + typename Lambda, typename ResultGetterType = decltype(default_result_type_lambda<>), + typename BinaryPredicate = std::equal_to<>> +constexpr std::invoke_result_t constexpr_switch( + Lambda&& lambda, + typename std::decay_t::value_type searched, + ResultGetterType&& def = default_result_type_lambda<>, + BinaryPredicate&& pred = {}) { + using result_t = std::invoke_result_t; + using hash_t = std::conditional_t(), Hash, typename Hash::secondary_hash>; + constexpr std::array values = *GlobValues; + constexpr std::size_t size = values.size(); + constexpr std::array cases = calculate_cases(Page); + + switch (hash_v(searched)) { + MAGIC_ENUM_FOR_EACH_256(MAGIC_ENUM_CASE) + default: + if constexpr (size > 256 + Page) { + return constexpr_switch(std::forward(lambda), searched, std::forward(def)); + } + break; + } + return def(); +} + +#undef MAGIC_ENUM_FOR_EACH_256 +#undef MAGIC_ENUM_CASE +#endif + +template +constexpr auto for_each(Lambda&& lambda, std::index_sequence) { + static_assert(is_enum_v, "magic_enum::detail::for_each requires enum type."); + constexpr bool has_void_return = (std::is_void_v[I]>>> || ...); + constexpr bool all_same_return = (std::is_same_v[0]>>, std::invoke_result_t[I]>>> && ...); + + if constexpr (has_void_return) { + (lambda(enum_constant[I]> {}), ...); + } else if constexpr (all_same_return) { + return std::array{lambda(enum_constant[I]> {})...}; + } else { + return std::tuple{lambda(enum_constant[I]> {})...}; + } +} + +template +constexpr bool all_invocable(std::index_sequence) { + static_assert(is_enum_v, "magic_enum::detail::all_invocable requires enum type."); + + return (std::is_invocable_v[I]>> && ...); +} + +} // namespace detail + +// Checks is magic_enum supported compiler. +inline constexpr bool is_magic_enum_supported = detail::supported::value; + +template +using Enum = detail::enum_concept; + +// Checks whether T is an Unscoped enumeration type. +// Provides the member constant value which is equal to true, if T is an [Unscoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Unscoped_enumeration) type. Otherwise, value is equal to false. +template +struct is_unscoped_enum : detail::is_unscoped_enum {}; + +template +inline constexpr bool is_unscoped_enum_v = is_unscoped_enum::value; + +// Checks whether T is an Scoped enumeration type. +// Provides the member constant value which is equal to true, if T is an [Scoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Scoped_enumerations) type. Otherwise, value is equal to false. +template +struct is_scoped_enum : detail::is_scoped_enum {}; + +template +inline constexpr bool is_scoped_enum_v = is_scoped_enum::value; + +// If T is a complete enumeration type, provides a member typedef type that names the underlying type of T. +// Otherwise, if T is not an enumeration type, there is no member type. Otherwise (T is an incomplete enumeration type), the program is ill-formed. +template +struct underlying_type : detail::underlying_type {}; + +template +using underlying_type_t = typename underlying_type::type; + +template +using enum_constant = detail::enum_constant; + +// Returns type name of enum. +template +[[nodiscard]] constexpr auto enum_type_name() noexcept -> detail::enable_if_t { + constexpr string_view name = detail::type_name_v>; + static_assert(!name.empty(), "magic_enum::enum_type_name enum type does not have a name."); + + return name; +} + +// Returns number of enum values. +template +[[nodiscard]] constexpr auto enum_count() noexcept -> detail::enable_if_t { + return detail::count_v>; +} + +// Returns enum value at specified index. +// No bounds checking is performed: the behavior is undefined if index >= number of enum values. +template +[[nodiscard]] constexpr auto enum_value(std::size_t index) noexcept -> detail::enable_if_t> { + using D = std::decay_t; + + if constexpr (detail::is_sparse_v) { + return assert((index < detail::count_v)), detail::values_v[index]; + } else { + constexpr bool is_flag = detail::is_flags_v; + constexpr auto min = is_flag ? detail::log2(detail::min_v) : detail::min_v; + + return assert((index < detail::count_v)), detail::value(index); + } +} + +// Returns enum value at specified index. +template +[[nodiscard]] constexpr auto enum_value() noexcept -> detail::enable_if_t> { + using D = std::decay_t; + static_assert(I < detail::count_v, "magic_enum::enum_value out of range."); + + return enum_value(I); +} + +// Returns std::array with enum values, sorted by enum value. +template +[[nodiscard]] constexpr auto enum_values() noexcept -> detail::enable_if_t> { + return detail::values_v>; +} + +// Returns integer value from enum value. +template +[[nodiscard]] constexpr auto enum_integer(E value) noexcept -> detail::enable_if_t> { + return static_cast>(value); +} + +// Returns underlying value from enum value. +template +[[nodiscard]] constexpr auto enum_underlying(E value) noexcept -> detail::enable_if_t> { + return static_cast>(value); +} + +// Obtains index in enum values from enum value. +// Returns optional with index. +template +[[nodiscard]] constexpr auto enum_index(E value) noexcept -> detail::enable_if_t> { + using D = std::decay_t; + using U = underlying_type_t; + + if constexpr (detail::count_v == 0) { + return {}; // Empty enum. + } else if constexpr (detail::is_sparse_v || detail::is_flags_v) { +#if defined(MAGIC_ENUM_NO_HASH) + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (enum_value(i) == value) { + return i; + } + } + return {}; // Invalid value or out of range. +#else + return detail::constexpr_switch<&detail::values_v, detail::case_call_t::index>( + [](std::size_t i) { return optional{i}; }, + value, + detail::default_result_type_lambda>); +#endif + } else { + const auto v = static_cast(value); + if (v >= detail::min_v && v <= detail::max_v) { + return static_cast(v - detail::min_v); + } + return {}; // Invalid value or out of range. + } +} + +// Obtains index in enum values from static storage enum variable. +template +[[nodiscard]] constexpr auto enum_index() noexcept -> detail::enable_if_t { + constexpr auto index = enum_index>(V); + static_assert(index, "magic_enum::enum_index enum value does not have a index."); + + return *index; +} + +// Returns name from static storage enum variable. +// This version is much lighter on the compile times and is not restricted to the enum_range limitation. +template +[[nodiscard]] constexpr auto enum_name() noexcept -> detail::enable_if_t { + constexpr string_view name = detail::enum_name_v, V>; + static_assert(!name.empty(), "magic_enum::enum_name enum value does not have a name."); + + return name; +} + +// Returns name from enum value. +// If enum value does not have name or value out of range, returns empty string. +template +[[nodiscard]] constexpr auto enum_name(E value) noexcept -> detail::enable_if_t { + using D = std::decay_t; + + if (const auto i = enum_index(value)) { + return detail::names_v[*i]; + } + return {}; +} + +// Returns name from enum-flags value. +// If enum-flags value does not have name or value out of range, returns empty string. +template +[[nodiscard]] auto enum_flags_name(E value) -> detail::enable_if_t { + using D = std::decay_t; + using U = underlying_type_t; + + if constexpr (detail::is_flags_v) { + string name; + auto check_value = U{0}; + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (const auto v = static_cast(enum_value(i)); (static_cast(value) & v) != 0) { + check_value |= v; + const auto n = detail::names_v[i]; + if (!name.empty()) { + name.append(1, '|'); + } + name.append(n.data(), n.size()); + } + } + + if (check_value != 0 && check_value == static_cast(value)) { + return name; + } + + return {}; // Invalid value or out of range. + } else { + if (const auto name = enum_name(value); !name.empty()) { + return {name.data(), name.size()}; + } + return {}; // Invalid value or out of range. + } +} + +// Returns std::array with names, sorted by enum value. +template +[[nodiscard]] constexpr auto enum_names() noexcept -> detail::enable_if_t> { + return detail::names_v>; +} + +// Returns std::array with pairs (value, name), sorted by enum value. +template +[[nodiscard]] constexpr auto enum_entries() noexcept -> detail::enable_if_t> { + return detail::entries_v>; +} + +// Allows you to write magic_enum::enum_cast("bar", magic_enum::case_insensitive); +inline constexpr auto case_insensitive = detail::case_insensitive{}; + +// Obtains enum value from integer value. +// Returns optional with enum value. +template +[[nodiscard]] constexpr auto enum_cast(underlying_type_t value) noexcept -> detail::enable_if_t>> { + using D = std::decay_t; + using U = underlying_type_t; + + if constexpr (detail::count_v == 0) { + return {}; // Empty enum. + } else if constexpr (detail::is_sparse_v) { + if constexpr (detail::is_flags_v) { + auto check_value = U{0}; + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (const auto v = static_cast(enum_value(i)); (value & v) != 0) { + check_value |= v; + } + } + + if (check_value != 0 && check_value == value) { + return static_cast(value); + } + return {}; // Invalid value or out of range. + } else { +#if defined(MAGIC_ENUM_NO_HASH) + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (value == static_cast(enum_value(i))) { + return static_cast(value); + } + } + return {}; // Invalid value or out of range. +#else + return detail::constexpr_switch<&detail::values_v, detail::case_call_t::value>( + [](D v) { return optional{v}; }, + static_cast(value), + detail::default_result_type_lambda>); +#endif + } + } else { + constexpr auto min = detail::min_v; + constexpr auto max = detail::is_flags_v ? detail::values_ors() : detail::max_v; + + if (value >= min && value <= max) { + return static_cast(value); + } + return {}; // Invalid value or out of range. + } +} + +// Obtains enum value from name. +// Returns optional with enum value. +template > +[[nodiscard]] constexpr auto enum_cast(string_view value, [[maybe_unused]] BinaryPredicate&& p = {}) noexcept(detail::is_nothrow_invocable()) -> detail::enable_if_t>, BinaryPredicate> { + static_assert(std::is_invocable_r_v, "magic_enum::enum_cast requires bool(char, char) invocable predicate."); + using D = std::decay_t; + using U = underlying_type_t; + + if constexpr (detail::count_v == 0) { + return {}; // Empty enum. + } else if constexpr (detail::is_flags_v) { + auto result = U{0}; + while (!value.empty()) { + const auto d = detail::find(value, '|'); + const auto s = (d == string_view::npos) ? value : value.substr(0, d); + auto f = U{0}; + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (detail::cmp_equal(s, detail::names_v[i], p)) { + f = static_cast(enum_value(i)); + result |= f; + break; + } + } + if (f == U{0}) { + return {}; // Invalid value or out of range. + } + value.remove_prefix((d == string_view::npos) ? value.size() : d + 1); + } + + if (result != U{0}) { + return static_cast(result); + } + return {}; // Invalid value or out of range. + } else if constexpr (detail::count_v > 0) { + if constexpr (detail::is_default_predicate()) { +#if defined(MAGIC_ENUM_NO_HASH) + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (detail::cmp_equal(value, detail::names_v[i], p)) { + return enum_value(i); + } + } + return {}; // Invalid value or out of range. +#else + return detail::constexpr_switch<&detail::names_v, detail::case_call_t::index>( + [](std::size_t i) { return optional{detail::values_v[i]}; }, + value, + detail::default_result_type_lambda>, + [&p](string_view lhs, string_view rhs) { return detail::cmp_equal(lhs, rhs, p); }); +#endif + } else { + for (std::size_t i = 0; i < detail::count_v; ++i) { + if (detail::cmp_equal(value, detail::names_v[i], p)) { + return enum_value(i); + } + } + return {}; // Invalid value or out of range. + } + } +} + +// Checks whether enum contains enumerator with such enum value. +template +[[nodiscard]] constexpr auto enum_contains(E value) noexcept -> detail::enable_if_t { + using D = std::decay_t; + using U = underlying_type_t; + + return static_cast(enum_cast(static_cast(value))); +} + +// Checks whether enum contains enumerator with such integer value. +template +[[nodiscard]] constexpr auto enum_contains(underlying_type_t value) noexcept -> detail::enable_if_t { + using D = std::decay_t; + + return static_cast(enum_cast(value)); +} + +// Checks whether enum contains enumerator with such name. +template > +[[nodiscard]] constexpr auto enum_contains(string_view value, BinaryPredicate&& p = {}) noexcept(detail::is_nothrow_invocable()) -> detail::enable_if_t { + static_assert(std::is_invocable_r_v, "magic_enum::enum_contains requires bool(char, char) invocable predicate."); + using D = std::decay_t; + + return static_cast(enum_cast(value, std::forward(p))); +} + +template +constexpr auto enum_switch(Lambda&& lambda, E value) -> detail::enable_if_t { + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + return detail::constexpr_switch<&detail::values_v, detail::case_call_t::value>( + std::forward(lambda), + value, + detail::default_result_type_lambda); +} + +template +constexpr auto enum_switch(Lambda&& lambda, E value, Result&& result) -> detail::enable_if_t { + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + return detail::constexpr_switch<&detail::values_v, detail::case_call_t::value>( + std::forward(lambda), + value, + [&result] { return std::forward(result); }); +} + +template , typename Lambda> +constexpr auto enum_switch(Lambda&& lambda, string_view name, BinaryPredicate&& p = {}) -> detail::enable_if_t { + static_assert(std::is_invocable_r_v, "magic_enum::enum_switch requires bool(char, char) invocable predicate."); + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + if (const auto v = enum_cast(name, std::forward(p))) { + return enum_switch(std::forward(lambda), *v); + } + return detail::default_result_type_lambda(); +} + +template , typename Lambda> +constexpr auto enum_switch(Lambda&& lambda, string_view name, Result&& result, BinaryPredicate&& p = {}) -> detail::enable_if_t { + static_assert(std::is_invocable_r_v, "magic_enum::enum_switch requires bool(char, char) invocable predicate."); + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + if (const auto v = enum_cast(name, std::forward(p))) { + return enum_switch(std::forward(lambda), *v, std::forward(result)); + } + return std::forward(result); +} + +template +constexpr auto enum_switch(Lambda&& lambda, underlying_type_t value) -> detail::enable_if_t { + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + if (const auto v = enum_cast(value)) { + return enum_switch(std::forward(lambda), *v); + } + return detail::default_result_type_lambda(); +} + +template +constexpr auto enum_switch(Lambda&& lambda, underlying_type_t value, Result&& result) -> detail::enable_if_t { + using D = std::decay_t; + static_assert(detail::has_hash, "magic_enum::enum_switch requires no defined MAGIC_ENUM_NO_HASH"); + + if (const auto v = enum_cast(value)) { + return enum_switch(std::forward(lambda), *v, std::forward(result)); + } + return std::forward(result); +} + +template = 0> +constexpr auto enum_for_each(Lambda&& lambda) { + using D = std::decay_t; + static_assert(std::is_enum_v, "magic_enum::enum_for_each requires enum type."); + constexpr auto sep = std::make_index_sequence>{}; + + if constexpr (detail::all_invocable(sep)) { + return detail::for_each(std::forward(lambda), sep); + } else { + static_assert(detail::always_false_v, "magic_enum::enum_for_each requires invocable of all enum value."); + } +} + +namespace ostream_operators { + +template = 0> +std::basic_ostream& operator<<(std::basic_ostream& os, E value) { + using D = std::decay_t; + using U = underlying_type_t; + + if constexpr (detail::supported::value) { + if (const auto name = enum_flags_name(value); !name.empty()) { + for (const auto c : name) { + os.put(c); + } + return os; + } + } + return (os << static_cast(value)); +} + +template = 0> +std::basic_ostream& operator<<(std::basic_ostream& os, optional value) { + return value ? (os << *value) : os; +} + +} // namespace ostream_operators + +namespace istream_operators { + +template = 0> +std::basic_istream& operator>>(std::basic_istream& is, E& value) { + using D = std::decay_t; + + std::basic_string s; + is >> s; + if (const auto v = enum_cast(s)) { + value = *v; + } else { + is.setstate(std::basic_ios::failbit); + } + return is; +} + +} // namespace istream_operators + +namespace iostream_operators { + +using namespace ostream_operators; +using namespace istream_operators; + +} // namespace iostream_operators + +namespace bitwise_operators { + +template = 0> +constexpr E operator~(E rhs) noexcept { + return static_cast(~static_cast>(rhs)); +} + +template = 0> +constexpr E operator|(E lhs, E rhs) noexcept { + return static_cast(static_cast>(lhs) | static_cast>(rhs)); +} + +template = 0> +constexpr E operator&(E lhs, E rhs) noexcept { + return static_cast(static_cast>(lhs) & static_cast>(rhs)); +} + +template = 0> +constexpr E operator^(E lhs, E rhs) noexcept { + return static_cast(static_cast>(lhs) ^ static_cast>(rhs)); +} + +template = 0> +constexpr E& operator|=(E& lhs, E rhs) noexcept { + return lhs = (lhs | rhs); +} + +template = 0> +constexpr E& operator&=(E& lhs, E rhs) noexcept { + return lhs = (lhs & rhs); +} + +template = 0> +constexpr E& operator^=(E& lhs, E rhs) noexcept { + return lhs = (lhs ^ rhs); +} + +} // namespace bitwise_operators + +} // namespace magic_enum + +#if defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning(pop) +#endif + +#endif // NEARGYE_MAGIC_ENUM_HPP \ No newline at end of file diff --git a/LiteLoader/Header/third-party/mysql/errmsg.h b/LiteLoader/third-party/include/mysql/errmsg.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/errmsg.h rename to LiteLoader/third-party/include/mysql/errmsg.h diff --git a/LiteLoader/Header/third-party/mysql/field_types.h b/LiteLoader/third-party/include/mysql/field_types.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/field_types.h rename to LiteLoader/third-party/include/mysql/field_types.h diff --git a/LiteLoader/Header/third-party/mysql/my_command.h b/LiteLoader/third-party/include/mysql/my_command.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/my_command.h rename to LiteLoader/third-party/include/mysql/my_command.h diff --git a/LiteLoader/Header/third-party/mysql/my_compress.h b/LiteLoader/third-party/include/mysql/my_compress.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/my_compress.h rename to LiteLoader/third-party/include/mysql/my_compress.h diff --git a/LiteLoader/Header/third-party/mysql/my_list.h b/LiteLoader/third-party/include/mysql/my_list.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/my_list.h rename to LiteLoader/third-party/include/mysql/my_list.h diff --git a/LiteLoader/Header/third-party/mysql/mysql.h b/LiteLoader/third-party/include/mysql/mysql.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql.h rename to LiteLoader/third-party/include/mysql/mysql.h diff --git a/LiteLoader/Header/third-party/mysql/mysql/client_plugin.h b/LiteLoader/third-party/include/mysql/mysql/client_plugin.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql/client_plugin.h rename to LiteLoader/third-party/include/mysql/mysql/client_plugin.h diff --git a/LiteLoader/Header/third-party/mysql/mysql/plugin_auth_common.h b/LiteLoader/third-party/include/mysql/mysql/plugin_auth_common.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql/plugin_auth_common.h rename to LiteLoader/third-party/include/mysql/mysql/plugin_auth_common.h diff --git a/LiteLoader/Header/third-party/mysql/mysql/udf_registration_types.h b/LiteLoader/third-party/include/mysql/mysql/udf_registration_types.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql/udf_registration_types.h rename to LiteLoader/third-party/include/mysql/mysql/udf_registration_types.h diff --git a/LiteLoader/Header/third-party/mysql/mysql_com.h b/LiteLoader/third-party/include/mysql/mysql_com.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql_com.h rename to LiteLoader/third-party/include/mysql/mysql_com.h diff --git a/LiteLoader/Header/third-party/mysql/mysql_time.h b/LiteLoader/third-party/include/mysql/mysql_time.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql_time.h rename to LiteLoader/third-party/include/mysql/mysql_time.h diff --git a/LiteLoader/Header/third-party/mysql/mysql_version.h b/LiteLoader/third-party/include/mysql/mysql_version.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysql_version.h rename to LiteLoader/third-party/include/mysql/mysql_version.h diff --git a/LiteLoader/Header/third-party/mysql/mysqld_error.h b/LiteLoader/third-party/include/mysql/mysqld_error.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysqld_error.h rename to LiteLoader/third-party/include/mysql/mysqld_error.h diff --git a/LiteLoader/Header/third-party/mysql/mysqlx_ername.h b/LiteLoader/third-party/include/mysql/mysqlx_ername.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysqlx_ername.h rename to LiteLoader/third-party/include/mysql/mysqlx_ername.h diff --git a/LiteLoader/Header/third-party/mysql/mysqlx_error.h b/LiteLoader/third-party/include/mysql/mysqlx_error.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysqlx_error.h rename to LiteLoader/third-party/include/mysql/mysqlx_error.h diff --git a/LiteLoader/Header/third-party/mysql/mysqlx_version.h b/LiteLoader/third-party/include/mysql/mysqlx_version.h similarity index 100% rename from LiteLoader/Header/third-party/mysql/mysqlx_version.h rename to LiteLoader/third-party/include/mysql/mysqlx_version.h diff --git a/LiteLoader/Header/third-party/nbt-cpp/nbt.hpp b/LiteLoader/third-party/include/nbt-cpp/nbt.hpp similarity index 100% rename from LiteLoader/Header/third-party/nbt-cpp/nbt.hpp rename to LiteLoader/third-party/include/nbt-cpp/nbt.hpp diff --git a/LiteLoader/Header/third-party/openssl/__DECC_INCLUDE_EPILOGUE.H b/LiteLoader/third-party/include/openssl/__DECC_INCLUDE_EPILOGUE.H similarity index 100% rename from LiteLoader/Header/third-party/openssl/__DECC_INCLUDE_EPILOGUE.H rename to LiteLoader/third-party/include/openssl/__DECC_INCLUDE_EPILOGUE.H diff --git a/LiteLoader/Header/third-party/openssl/__DECC_INCLUDE_PROLOGUE.H b/LiteLoader/third-party/include/openssl/__DECC_INCLUDE_PROLOGUE.H similarity index 100% rename from LiteLoader/Header/third-party/openssl/__DECC_INCLUDE_PROLOGUE.H rename to LiteLoader/third-party/include/openssl/__DECC_INCLUDE_PROLOGUE.H diff --git a/LiteLoader/Header/third-party/openssl/aes.h b/LiteLoader/third-party/include/openssl/aes.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/aes.h rename to LiteLoader/third-party/include/openssl/aes.h diff --git a/LiteLoader/Header/third-party/openssl/asn1.h b/LiteLoader/third-party/include/openssl/asn1.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1.h rename to LiteLoader/third-party/include/openssl/asn1.h diff --git a/LiteLoader/Header/third-party/openssl/asn1.h.in b/LiteLoader/third-party/include/openssl/asn1.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1.h.in rename to LiteLoader/third-party/include/openssl/asn1.h.in diff --git a/LiteLoader/Header/third-party/openssl/asn1_mac.h b/LiteLoader/third-party/include/openssl/asn1_mac.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1_mac.h rename to LiteLoader/third-party/include/openssl/asn1_mac.h diff --git a/LiteLoader/Header/third-party/openssl/asn1err.h b/LiteLoader/third-party/include/openssl/asn1err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1err.h rename to LiteLoader/third-party/include/openssl/asn1err.h diff --git a/LiteLoader/Header/third-party/openssl/asn1t.h b/LiteLoader/third-party/include/openssl/asn1t.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1t.h rename to LiteLoader/third-party/include/openssl/asn1t.h diff --git a/LiteLoader/Header/third-party/openssl/asn1t.h.in b/LiteLoader/third-party/include/openssl/asn1t.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/asn1t.h.in rename to LiteLoader/third-party/include/openssl/asn1t.h.in diff --git a/LiteLoader/Header/third-party/openssl/async.h b/LiteLoader/third-party/include/openssl/async.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/async.h rename to LiteLoader/third-party/include/openssl/async.h diff --git a/LiteLoader/Header/third-party/openssl/asyncerr.h b/LiteLoader/third-party/include/openssl/asyncerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/asyncerr.h rename to LiteLoader/third-party/include/openssl/asyncerr.h diff --git a/LiteLoader/Header/third-party/openssl/bio.h b/LiteLoader/third-party/include/openssl/bio.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/bio.h rename to LiteLoader/third-party/include/openssl/bio.h diff --git a/LiteLoader/Header/third-party/openssl/bio.h.in b/LiteLoader/third-party/include/openssl/bio.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/bio.h.in rename to LiteLoader/third-party/include/openssl/bio.h.in diff --git a/LiteLoader/Header/third-party/openssl/bioerr.h b/LiteLoader/third-party/include/openssl/bioerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/bioerr.h rename to LiteLoader/third-party/include/openssl/bioerr.h diff --git a/LiteLoader/Header/third-party/openssl/blowfish.h b/LiteLoader/third-party/include/openssl/blowfish.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/blowfish.h rename to LiteLoader/third-party/include/openssl/blowfish.h diff --git a/LiteLoader/Header/third-party/openssl/bn.h b/LiteLoader/third-party/include/openssl/bn.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/bn.h rename to LiteLoader/third-party/include/openssl/bn.h diff --git a/LiteLoader/Header/third-party/openssl/bnerr.h b/LiteLoader/third-party/include/openssl/bnerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/bnerr.h rename to LiteLoader/third-party/include/openssl/bnerr.h diff --git a/LiteLoader/Header/third-party/openssl/buffer.h b/LiteLoader/third-party/include/openssl/buffer.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/buffer.h rename to LiteLoader/third-party/include/openssl/buffer.h diff --git a/LiteLoader/Header/third-party/openssl/buffererr.h b/LiteLoader/third-party/include/openssl/buffererr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/buffererr.h rename to LiteLoader/third-party/include/openssl/buffererr.h diff --git a/LiteLoader/Header/third-party/openssl/camellia.h b/LiteLoader/third-party/include/openssl/camellia.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/camellia.h rename to LiteLoader/third-party/include/openssl/camellia.h diff --git a/LiteLoader/Header/third-party/openssl/cast.h b/LiteLoader/third-party/include/openssl/cast.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cast.h rename to LiteLoader/third-party/include/openssl/cast.h diff --git a/LiteLoader/Header/third-party/openssl/cmac.h b/LiteLoader/third-party/include/openssl/cmac.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmac.h rename to LiteLoader/third-party/include/openssl/cmac.h diff --git a/LiteLoader/Header/third-party/openssl/cmp.h b/LiteLoader/third-party/include/openssl/cmp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmp.h rename to LiteLoader/third-party/include/openssl/cmp.h diff --git a/LiteLoader/Header/third-party/openssl/cmp.h.in b/LiteLoader/third-party/include/openssl/cmp.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmp.h.in rename to LiteLoader/third-party/include/openssl/cmp.h.in diff --git a/LiteLoader/Header/third-party/openssl/cmp_util.h b/LiteLoader/third-party/include/openssl/cmp_util.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmp_util.h rename to LiteLoader/third-party/include/openssl/cmp_util.h diff --git a/LiteLoader/Header/third-party/openssl/cmperr.h b/LiteLoader/third-party/include/openssl/cmperr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmperr.h rename to LiteLoader/third-party/include/openssl/cmperr.h diff --git a/LiteLoader/Header/third-party/openssl/cms.h b/LiteLoader/third-party/include/openssl/cms.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cms.h rename to LiteLoader/third-party/include/openssl/cms.h diff --git a/LiteLoader/Header/third-party/openssl/cms.h.in b/LiteLoader/third-party/include/openssl/cms.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/cms.h.in rename to LiteLoader/third-party/include/openssl/cms.h.in diff --git a/LiteLoader/Header/third-party/openssl/cmserr.h b/LiteLoader/third-party/include/openssl/cmserr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cmserr.h rename to LiteLoader/third-party/include/openssl/cmserr.h diff --git a/LiteLoader/Header/third-party/openssl/comp.h b/LiteLoader/third-party/include/openssl/comp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/comp.h rename to LiteLoader/third-party/include/openssl/comp.h diff --git a/LiteLoader/Header/third-party/openssl/comperr.h b/LiteLoader/third-party/include/openssl/comperr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/comperr.h rename to LiteLoader/third-party/include/openssl/comperr.h diff --git a/LiteLoader/Header/third-party/openssl/conf.h b/LiteLoader/third-party/include/openssl/conf.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/conf.h rename to LiteLoader/third-party/include/openssl/conf.h diff --git a/LiteLoader/Header/third-party/openssl/conf.h.in b/LiteLoader/third-party/include/openssl/conf.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/conf.h.in rename to LiteLoader/third-party/include/openssl/conf.h.in diff --git a/LiteLoader/Header/third-party/openssl/conf_api.h b/LiteLoader/third-party/include/openssl/conf_api.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/conf_api.h rename to LiteLoader/third-party/include/openssl/conf_api.h diff --git a/LiteLoader/Header/third-party/openssl/conferr.h b/LiteLoader/third-party/include/openssl/conferr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/conferr.h rename to LiteLoader/third-party/include/openssl/conferr.h diff --git a/LiteLoader/Header/third-party/openssl/configuration.h b/LiteLoader/third-party/include/openssl/configuration.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/configuration.h rename to LiteLoader/third-party/include/openssl/configuration.h diff --git a/LiteLoader/Header/third-party/openssl/configuration.h.in b/LiteLoader/third-party/include/openssl/configuration.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/configuration.h.in rename to LiteLoader/third-party/include/openssl/configuration.h.in diff --git a/LiteLoader/Header/third-party/openssl/conftypes.h b/LiteLoader/third-party/include/openssl/conftypes.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/conftypes.h rename to LiteLoader/third-party/include/openssl/conftypes.h diff --git a/LiteLoader/Header/third-party/openssl/core.h b/LiteLoader/third-party/include/openssl/core.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/core.h rename to LiteLoader/third-party/include/openssl/core.h diff --git a/LiteLoader/Header/third-party/openssl/core_dispatch.h b/LiteLoader/third-party/include/openssl/core_dispatch.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/core_dispatch.h rename to LiteLoader/third-party/include/openssl/core_dispatch.h diff --git a/LiteLoader/Header/third-party/openssl/core_names.h b/LiteLoader/third-party/include/openssl/core_names.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/core_names.h rename to LiteLoader/third-party/include/openssl/core_names.h diff --git a/LiteLoader/Header/third-party/openssl/core_object.h b/LiteLoader/third-party/include/openssl/core_object.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/core_object.h rename to LiteLoader/third-party/include/openssl/core_object.h diff --git a/LiteLoader/Header/third-party/openssl/crmf.h b/LiteLoader/third-party/include/openssl/crmf.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/crmf.h rename to LiteLoader/third-party/include/openssl/crmf.h diff --git a/LiteLoader/Header/third-party/openssl/crmf.h.in b/LiteLoader/third-party/include/openssl/crmf.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/crmf.h.in rename to LiteLoader/third-party/include/openssl/crmf.h.in diff --git a/LiteLoader/Header/third-party/openssl/crmferr.h b/LiteLoader/third-party/include/openssl/crmferr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/crmferr.h rename to LiteLoader/third-party/include/openssl/crmferr.h diff --git a/LiteLoader/Header/third-party/openssl/crypto.h b/LiteLoader/third-party/include/openssl/crypto.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/crypto.h rename to LiteLoader/third-party/include/openssl/crypto.h diff --git a/LiteLoader/Header/third-party/openssl/crypto.h.in b/LiteLoader/third-party/include/openssl/crypto.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/crypto.h.in rename to LiteLoader/third-party/include/openssl/crypto.h.in diff --git a/LiteLoader/Header/third-party/openssl/cryptoerr.h b/LiteLoader/third-party/include/openssl/cryptoerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cryptoerr.h rename to LiteLoader/third-party/include/openssl/cryptoerr.h diff --git a/LiteLoader/Header/third-party/openssl/cryptoerr_legacy.h b/LiteLoader/third-party/include/openssl/cryptoerr_legacy.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cryptoerr_legacy.h rename to LiteLoader/third-party/include/openssl/cryptoerr_legacy.h diff --git a/LiteLoader/Header/third-party/openssl/ct.h b/LiteLoader/third-party/include/openssl/ct.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ct.h rename to LiteLoader/third-party/include/openssl/ct.h diff --git a/LiteLoader/Header/third-party/openssl/ct.h.in b/LiteLoader/third-party/include/openssl/ct.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/ct.h.in rename to LiteLoader/third-party/include/openssl/ct.h.in diff --git a/LiteLoader/Header/third-party/openssl/cterr.h b/LiteLoader/third-party/include/openssl/cterr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/cterr.h rename to LiteLoader/third-party/include/openssl/cterr.h diff --git a/LiteLoader/Header/third-party/openssl/decoder.h b/LiteLoader/third-party/include/openssl/decoder.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/decoder.h rename to LiteLoader/third-party/include/openssl/decoder.h diff --git a/LiteLoader/Header/third-party/openssl/decodererr.h b/LiteLoader/third-party/include/openssl/decodererr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/decodererr.h rename to LiteLoader/third-party/include/openssl/decodererr.h diff --git a/LiteLoader/Header/third-party/openssl/des.h b/LiteLoader/third-party/include/openssl/des.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/des.h rename to LiteLoader/third-party/include/openssl/des.h diff --git a/LiteLoader/Header/third-party/openssl/dh.h b/LiteLoader/third-party/include/openssl/dh.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/dh.h rename to LiteLoader/third-party/include/openssl/dh.h diff --git a/LiteLoader/Header/third-party/openssl/dherr.h b/LiteLoader/third-party/include/openssl/dherr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/dherr.h rename to LiteLoader/third-party/include/openssl/dherr.h diff --git a/LiteLoader/Header/third-party/openssl/dsa.h b/LiteLoader/third-party/include/openssl/dsa.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/dsa.h rename to LiteLoader/third-party/include/openssl/dsa.h diff --git a/LiteLoader/Header/third-party/openssl/dsaerr.h b/LiteLoader/third-party/include/openssl/dsaerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/dsaerr.h rename to LiteLoader/third-party/include/openssl/dsaerr.h diff --git a/LiteLoader/Header/third-party/openssl/dtls1.h b/LiteLoader/third-party/include/openssl/dtls1.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/dtls1.h rename to LiteLoader/third-party/include/openssl/dtls1.h diff --git a/LiteLoader/Header/third-party/openssl/e_os2.h b/LiteLoader/third-party/include/openssl/e_os2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/e_os2.h rename to LiteLoader/third-party/include/openssl/e_os2.h diff --git a/LiteLoader/Header/third-party/openssl/ebcdic.h b/LiteLoader/third-party/include/openssl/ebcdic.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ebcdic.h rename to LiteLoader/third-party/include/openssl/ebcdic.h diff --git a/LiteLoader/Header/third-party/openssl/ec.h b/LiteLoader/third-party/include/openssl/ec.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ec.h rename to LiteLoader/third-party/include/openssl/ec.h diff --git a/LiteLoader/Header/third-party/openssl/ecdh.h b/LiteLoader/third-party/include/openssl/ecdh.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ecdh.h rename to LiteLoader/third-party/include/openssl/ecdh.h diff --git a/LiteLoader/Header/third-party/openssl/ecdsa.h b/LiteLoader/third-party/include/openssl/ecdsa.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ecdsa.h rename to LiteLoader/third-party/include/openssl/ecdsa.h diff --git a/LiteLoader/Header/third-party/openssl/ecerr.h b/LiteLoader/third-party/include/openssl/ecerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ecerr.h rename to LiteLoader/third-party/include/openssl/ecerr.h diff --git a/LiteLoader/Header/third-party/openssl/encoder.h b/LiteLoader/third-party/include/openssl/encoder.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/encoder.h rename to LiteLoader/third-party/include/openssl/encoder.h diff --git a/LiteLoader/Header/third-party/openssl/encodererr.h b/LiteLoader/third-party/include/openssl/encodererr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/encodererr.h rename to LiteLoader/third-party/include/openssl/encodererr.h diff --git a/LiteLoader/Header/third-party/openssl/engine.h b/LiteLoader/third-party/include/openssl/engine.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/engine.h rename to LiteLoader/third-party/include/openssl/engine.h diff --git a/LiteLoader/Header/third-party/openssl/engineerr.h b/LiteLoader/third-party/include/openssl/engineerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/engineerr.h rename to LiteLoader/third-party/include/openssl/engineerr.h diff --git a/LiteLoader/Header/third-party/openssl/err.h b/LiteLoader/third-party/include/openssl/err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/err.h rename to LiteLoader/third-party/include/openssl/err.h diff --git a/LiteLoader/Header/third-party/openssl/err.h.in b/LiteLoader/third-party/include/openssl/err.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/err.h.in rename to LiteLoader/third-party/include/openssl/err.h.in diff --git a/LiteLoader/Header/third-party/openssl/ess.h b/LiteLoader/third-party/include/openssl/ess.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ess.h rename to LiteLoader/third-party/include/openssl/ess.h diff --git a/LiteLoader/Header/third-party/openssl/ess.h.in b/LiteLoader/third-party/include/openssl/ess.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/ess.h.in rename to LiteLoader/third-party/include/openssl/ess.h.in diff --git a/LiteLoader/Header/third-party/openssl/esserr.h b/LiteLoader/third-party/include/openssl/esserr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/esserr.h rename to LiteLoader/third-party/include/openssl/esserr.h diff --git a/LiteLoader/Header/third-party/openssl/evp.h b/LiteLoader/third-party/include/openssl/evp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/evp.h rename to LiteLoader/third-party/include/openssl/evp.h diff --git a/LiteLoader/Header/third-party/openssl/evperr.h b/LiteLoader/third-party/include/openssl/evperr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/evperr.h rename to LiteLoader/third-party/include/openssl/evperr.h diff --git a/LiteLoader/Header/third-party/openssl/fips_names.h b/LiteLoader/third-party/include/openssl/fips_names.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/fips_names.h rename to LiteLoader/third-party/include/openssl/fips_names.h diff --git a/LiteLoader/Header/third-party/openssl/fipskey.h b/LiteLoader/third-party/include/openssl/fipskey.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/fipskey.h rename to LiteLoader/third-party/include/openssl/fipskey.h diff --git a/LiteLoader/Header/third-party/openssl/fipskey.h.in b/LiteLoader/third-party/include/openssl/fipskey.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/fipskey.h.in rename to LiteLoader/third-party/include/openssl/fipskey.h.in diff --git a/LiteLoader/Header/third-party/openssl/hmac.h b/LiteLoader/third-party/include/openssl/hmac.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/hmac.h rename to LiteLoader/third-party/include/openssl/hmac.h diff --git a/LiteLoader/Header/third-party/openssl/http.h b/LiteLoader/third-party/include/openssl/http.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/http.h rename to LiteLoader/third-party/include/openssl/http.h diff --git a/LiteLoader/Header/third-party/openssl/httperr.h b/LiteLoader/third-party/include/openssl/httperr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/httperr.h rename to LiteLoader/third-party/include/openssl/httperr.h diff --git a/LiteLoader/Header/third-party/openssl/idea.h b/LiteLoader/third-party/include/openssl/idea.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/idea.h rename to LiteLoader/third-party/include/openssl/idea.h diff --git a/LiteLoader/Header/third-party/openssl/kdf.h b/LiteLoader/third-party/include/openssl/kdf.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/kdf.h rename to LiteLoader/third-party/include/openssl/kdf.h diff --git a/LiteLoader/Header/third-party/openssl/kdferr.h b/LiteLoader/third-party/include/openssl/kdferr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/kdferr.h rename to LiteLoader/third-party/include/openssl/kdferr.h diff --git a/LiteLoader/Header/third-party/openssl/lhash.h b/LiteLoader/third-party/include/openssl/lhash.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/lhash.h rename to LiteLoader/third-party/include/openssl/lhash.h diff --git a/LiteLoader/Header/third-party/openssl/lhash.h.in b/LiteLoader/third-party/include/openssl/lhash.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/lhash.h.in rename to LiteLoader/third-party/include/openssl/lhash.h.in diff --git a/LiteLoader/Header/third-party/openssl/macros.h b/LiteLoader/third-party/include/openssl/macros.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/macros.h rename to LiteLoader/third-party/include/openssl/macros.h diff --git a/LiteLoader/Header/third-party/openssl/md2.h b/LiteLoader/third-party/include/openssl/md2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/md2.h rename to LiteLoader/third-party/include/openssl/md2.h diff --git a/LiteLoader/Header/third-party/openssl/md4.h b/LiteLoader/third-party/include/openssl/md4.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/md4.h rename to LiteLoader/third-party/include/openssl/md4.h diff --git a/LiteLoader/Header/third-party/openssl/md5.h b/LiteLoader/third-party/include/openssl/md5.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/md5.h rename to LiteLoader/third-party/include/openssl/md5.h diff --git a/LiteLoader/Header/third-party/openssl/mdc2.h b/LiteLoader/third-party/include/openssl/mdc2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/mdc2.h rename to LiteLoader/third-party/include/openssl/mdc2.h diff --git a/LiteLoader/Header/third-party/openssl/modes.h b/LiteLoader/third-party/include/openssl/modes.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/modes.h rename to LiteLoader/third-party/include/openssl/modes.h diff --git a/LiteLoader/Header/third-party/openssl/obj_mac.h b/LiteLoader/third-party/include/openssl/obj_mac.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/obj_mac.h rename to LiteLoader/third-party/include/openssl/obj_mac.h diff --git a/LiteLoader/Header/third-party/openssl/objects.h b/LiteLoader/third-party/include/openssl/objects.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/objects.h rename to LiteLoader/third-party/include/openssl/objects.h diff --git a/LiteLoader/Header/third-party/openssl/objectserr.h b/LiteLoader/third-party/include/openssl/objectserr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/objectserr.h rename to LiteLoader/third-party/include/openssl/objectserr.h diff --git a/LiteLoader/Header/third-party/openssl/ocsp.h b/LiteLoader/third-party/include/openssl/ocsp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ocsp.h rename to LiteLoader/third-party/include/openssl/ocsp.h diff --git a/LiteLoader/Header/third-party/openssl/ocsp.h.in b/LiteLoader/third-party/include/openssl/ocsp.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/ocsp.h.in rename to LiteLoader/third-party/include/openssl/ocsp.h.in diff --git a/LiteLoader/Header/third-party/openssl/ocsperr.h b/LiteLoader/third-party/include/openssl/ocsperr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ocsperr.h rename to LiteLoader/third-party/include/openssl/ocsperr.h diff --git a/LiteLoader/Header/third-party/openssl/opensslconf.h b/LiteLoader/third-party/include/openssl/opensslconf.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/opensslconf.h rename to LiteLoader/third-party/include/openssl/opensslconf.h diff --git a/LiteLoader/Header/third-party/openssl/opensslv.h b/LiteLoader/third-party/include/openssl/opensslv.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/opensslv.h rename to LiteLoader/third-party/include/openssl/opensslv.h diff --git a/LiteLoader/Header/third-party/openssl/opensslv.h.in b/LiteLoader/third-party/include/openssl/opensslv.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/opensslv.h.in rename to LiteLoader/third-party/include/openssl/opensslv.h.in diff --git a/LiteLoader/Header/third-party/openssl/ossl_typ.h b/LiteLoader/third-party/include/openssl/ossl_typ.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ossl_typ.h rename to LiteLoader/third-party/include/openssl/ossl_typ.h diff --git a/LiteLoader/Header/third-party/openssl/param_build.h b/LiteLoader/third-party/include/openssl/param_build.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/param_build.h rename to LiteLoader/third-party/include/openssl/param_build.h diff --git a/LiteLoader/Header/third-party/openssl/params.h b/LiteLoader/third-party/include/openssl/params.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/params.h rename to LiteLoader/third-party/include/openssl/params.h diff --git a/LiteLoader/Header/third-party/openssl/pem.h b/LiteLoader/third-party/include/openssl/pem.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pem.h rename to LiteLoader/third-party/include/openssl/pem.h diff --git a/LiteLoader/Header/third-party/openssl/pem2.h b/LiteLoader/third-party/include/openssl/pem2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pem2.h rename to LiteLoader/third-party/include/openssl/pem2.h diff --git a/LiteLoader/Header/third-party/openssl/pemerr.h b/LiteLoader/third-party/include/openssl/pemerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pemerr.h rename to LiteLoader/third-party/include/openssl/pemerr.h diff --git a/LiteLoader/Header/third-party/openssl/pkcs12.h b/LiteLoader/third-party/include/openssl/pkcs12.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs12.h rename to LiteLoader/third-party/include/openssl/pkcs12.h diff --git a/LiteLoader/Header/third-party/openssl/pkcs12.h.in b/LiteLoader/third-party/include/openssl/pkcs12.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs12.h.in rename to LiteLoader/third-party/include/openssl/pkcs12.h.in diff --git a/LiteLoader/Header/third-party/openssl/pkcs12err.h b/LiteLoader/third-party/include/openssl/pkcs12err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs12err.h rename to LiteLoader/third-party/include/openssl/pkcs12err.h diff --git a/LiteLoader/Header/third-party/openssl/pkcs7.h b/LiteLoader/third-party/include/openssl/pkcs7.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs7.h rename to LiteLoader/third-party/include/openssl/pkcs7.h diff --git a/LiteLoader/Header/third-party/openssl/pkcs7.h.in b/LiteLoader/third-party/include/openssl/pkcs7.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs7.h.in rename to LiteLoader/third-party/include/openssl/pkcs7.h.in diff --git a/LiteLoader/Header/third-party/openssl/pkcs7err.h b/LiteLoader/third-party/include/openssl/pkcs7err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/pkcs7err.h rename to LiteLoader/third-party/include/openssl/pkcs7err.h diff --git a/LiteLoader/Header/third-party/openssl/prov_ssl.h b/LiteLoader/third-party/include/openssl/prov_ssl.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/prov_ssl.h rename to LiteLoader/third-party/include/openssl/prov_ssl.h diff --git a/LiteLoader/Header/third-party/openssl/proverr.h b/LiteLoader/third-party/include/openssl/proverr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/proverr.h rename to LiteLoader/third-party/include/openssl/proverr.h diff --git a/LiteLoader/Header/third-party/openssl/provider.h b/LiteLoader/third-party/include/openssl/provider.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/provider.h rename to LiteLoader/third-party/include/openssl/provider.h diff --git a/LiteLoader/Header/third-party/openssl/rand.h b/LiteLoader/third-party/include/openssl/rand.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rand.h rename to LiteLoader/third-party/include/openssl/rand.h diff --git a/LiteLoader/Header/third-party/openssl/randerr.h b/LiteLoader/third-party/include/openssl/randerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/randerr.h rename to LiteLoader/third-party/include/openssl/randerr.h diff --git a/LiteLoader/Header/third-party/openssl/rc2.h b/LiteLoader/third-party/include/openssl/rc2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rc2.h rename to LiteLoader/third-party/include/openssl/rc2.h diff --git a/LiteLoader/Header/third-party/openssl/rc4.h b/LiteLoader/third-party/include/openssl/rc4.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rc4.h rename to LiteLoader/third-party/include/openssl/rc4.h diff --git a/LiteLoader/Header/third-party/openssl/rc5.h b/LiteLoader/third-party/include/openssl/rc5.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rc5.h rename to LiteLoader/third-party/include/openssl/rc5.h diff --git a/LiteLoader/Header/third-party/openssl/ripemd.h b/LiteLoader/third-party/include/openssl/ripemd.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ripemd.h rename to LiteLoader/third-party/include/openssl/ripemd.h diff --git a/LiteLoader/Header/third-party/openssl/rsa.h b/LiteLoader/third-party/include/openssl/rsa.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rsa.h rename to LiteLoader/third-party/include/openssl/rsa.h diff --git a/LiteLoader/Header/third-party/openssl/rsaerr.h b/LiteLoader/third-party/include/openssl/rsaerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/rsaerr.h rename to LiteLoader/third-party/include/openssl/rsaerr.h diff --git a/LiteLoader/Header/third-party/openssl/safestack.h b/LiteLoader/third-party/include/openssl/safestack.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/safestack.h rename to LiteLoader/third-party/include/openssl/safestack.h diff --git a/LiteLoader/Header/third-party/openssl/safestack.h.in b/LiteLoader/third-party/include/openssl/safestack.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/safestack.h.in rename to LiteLoader/third-party/include/openssl/safestack.h.in diff --git a/LiteLoader/Header/third-party/openssl/seed.h b/LiteLoader/third-party/include/openssl/seed.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/seed.h rename to LiteLoader/third-party/include/openssl/seed.h diff --git a/LiteLoader/Header/third-party/openssl/self_test.h b/LiteLoader/third-party/include/openssl/self_test.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/self_test.h rename to LiteLoader/third-party/include/openssl/self_test.h diff --git a/LiteLoader/Header/third-party/openssl/sha.h b/LiteLoader/third-party/include/openssl/sha.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/sha.h rename to LiteLoader/third-party/include/openssl/sha.h diff --git a/LiteLoader/Header/third-party/openssl/srp.h b/LiteLoader/third-party/include/openssl/srp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/srp.h rename to LiteLoader/third-party/include/openssl/srp.h diff --git a/LiteLoader/Header/third-party/openssl/srp.h.in b/LiteLoader/third-party/include/openssl/srp.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/srp.h.in rename to LiteLoader/third-party/include/openssl/srp.h.in diff --git a/LiteLoader/Header/third-party/openssl/srtp.h b/LiteLoader/third-party/include/openssl/srtp.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/srtp.h rename to LiteLoader/third-party/include/openssl/srtp.h diff --git a/LiteLoader/Header/third-party/openssl/ssl.h b/LiteLoader/third-party/include/openssl/ssl.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ssl.h rename to LiteLoader/third-party/include/openssl/ssl.h diff --git a/LiteLoader/Header/third-party/openssl/ssl.h.in b/LiteLoader/third-party/include/openssl/ssl.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/ssl.h.in rename to LiteLoader/third-party/include/openssl/ssl.h.in diff --git a/LiteLoader/Header/third-party/openssl/ssl2.h b/LiteLoader/third-party/include/openssl/ssl2.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ssl2.h rename to LiteLoader/third-party/include/openssl/ssl2.h diff --git a/LiteLoader/Header/third-party/openssl/ssl3.h b/LiteLoader/third-party/include/openssl/ssl3.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ssl3.h rename to LiteLoader/third-party/include/openssl/ssl3.h diff --git a/LiteLoader/Header/third-party/openssl/sslerr.h b/LiteLoader/third-party/include/openssl/sslerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/sslerr.h rename to LiteLoader/third-party/include/openssl/sslerr.h diff --git a/LiteLoader/Header/third-party/openssl/sslerr_legacy.h b/LiteLoader/third-party/include/openssl/sslerr_legacy.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/sslerr_legacy.h rename to LiteLoader/third-party/include/openssl/sslerr_legacy.h diff --git a/LiteLoader/Header/third-party/openssl/stack.h b/LiteLoader/third-party/include/openssl/stack.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/stack.h rename to LiteLoader/third-party/include/openssl/stack.h diff --git a/LiteLoader/Header/third-party/openssl/store.h b/LiteLoader/third-party/include/openssl/store.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/store.h rename to LiteLoader/third-party/include/openssl/store.h diff --git a/LiteLoader/Header/third-party/openssl/storeerr.h b/LiteLoader/third-party/include/openssl/storeerr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/storeerr.h rename to LiteLoader/third-party/include/openssl/storeerr.h diff --git a/LiteLoader/Header/third-party/openssl/symhacks.h b/LiteLoader/third-party/include/openssl/symhacks.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/symhacks.h rename to LiteLoader/third-party/include/openssl/symhacks.h diff --git a/LiteLoader/Header/third-party/openssl/tls1.h b/LiteLoader/third-party/include/openssl/tls1.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/tls1.h rename to LiteLoader/third-party/include/openssl/tls1.h diff --git a/LiteLoader/Header/third-party/openssl/trace.h b/LiteLoader/third-party/include/openssl/trace.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/trace.h rename to LiteLoader/third-party/include/openssl/trace.h diff --git a/LiteLoader/Header/third-party/openssl/ts.h b/LiteLoader/third-party/include/openssl/ts.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ts.h rename to LiteLoader/third-party/include/openssl/ts.h diff --git a/LiteLoader/Header/third-party/openssl/tserr.h b/LiteLoader/third-party/include/openssl/tserr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/tserr.h rename to LiteLoader/third-party/include/openssl/tserr.h diff --git a/LiteLoader/Header/third-party/openssl/txt_db.h b/LiteLoader/third-party/include/openssl/txt_db.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/txt_db.h rename to LiteLoader/third-party/include/openssl/txt_db.h diff --git a/LiteLoader/Header/third-party/openssl/types.h b/LiteLoader/third-party/include/openssl/types.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/types.h rename to LiteLoader/third-party/include/openssl/types.h diff --git a/LiteLoader/Header/third-party/openssl/ui.h b/LiteLoader/third-party/include/openssl/ui.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/ui.h rename to LiteLoader/third-party/include/openssl/ui.h diff --git a/LiteLoader/Header/third-party/openssl/ui.h.in b/LiteLoader/third-party/include/openssl/ui.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/ui.h.in rename to LiteLoader/third-party/include/openssl/ui.h.in diff --git a/LiteLoader/Header/third-party/openssl/uierr.h b/LiteLoader/third-party/include/openssl/uierr.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/uierr.h rename to LiteLoader/third-party/include/openssl/uierr.h diff --git a/LiteLoader/Header/third-party/openssl/whrlpool.h b/LiteLoader/third-party/include/openssl/whrlpool.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/whrlpool.h rename to LiteLoader/third-party/include/openssl/whrlpool.h diff --git a/LiteLoader/Header/third-party/openssl/x509.h b/LiteLoader/third-party/include/openssl/x509.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509.h rename to LiteLoader/third-party/include/openssl/x509.h diff --git a/LiteLoader/Header/third-party/openssl/x509.h.in b/LiteLoader/third-party/include/openssl/x509.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509.h.in rename to LiteLoader/third-party/include/openssl/x509.h.in diff --git a/LiteLoader/Header/third-party/openssl/x509_vfy.h b/LiteLoader/third-party/include/openssl/x509_vfy.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509_vfy.h rename to LiteLoader/third-party/include/openssl/x509_vfy.h diff --git a/LiteLoader/Header/third-party/openssl/x509_vfy.h.in b/LiteLoader/third-party/include/openssl/x509_vfy.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509_vfy.h.in rename to LiteLoader/third-party/include/openssl/x509_vfy.h.in diff --git a/LiteLoader/Header/third-party/openssl/x509err.h b/LiteLoader/third-party/include/openssl/x509err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509err.h rename to LiteLoader/third-party/include/openssl/x509err.h diff --git a/LiteLoader/Header/third-party/openssl/x509v3.h b/LiteLoader/third-party/include/openssl/x509v3.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509v3.h rename to LiteLoader/third-party/include/openssl/x509v3.h diff --git a/LiteLoader/Header/third-party/openssl/x509v3.h.in b/LiteLoader/third-party/include/openssl/x509v3.h.in similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509v3.h.in rename to LiteLoader/third-party/include/openssl/x509v3.h.in diff --git a/LiteLoader/Header/third-party/openssl/x509v3err.h b/LiteLoader/third-party/include/openssl/x509v3err.h similarity index 100% rename from LiteLoader/Header/third-party/openssl/x509v3err.h rename to LiteLoader/third-party/include/openssl/x509v3err.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/btree.h b/LiteLoader/third-party/include/parallel_hashmap/btree.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/btree.h rename to LiteLoader/third-party/include/parallel_hashmap/btree.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/meminfo.h b/LiteLoader/third-party/include/parallel_hashmap/meminfo.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/meminfo.h rename to LiteLoader/third-party/include/parallel_hashmap/meminfo.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap.h b/LiteLoader/third-party/include/parallel_hashmap/phmap.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_base.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_base.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_base.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_base.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_bits.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_bits.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_bits.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_bits.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_config.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_config.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_config.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_config.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_dump.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_dump.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_dump.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_dump.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_fwd_decl.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_fwd_decl.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_fwd_decl.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_fwd_decl.h diff --git a/LiteLoader/Header/third-party/parallel_hashmap/phmap_utils.h b/LiteLoader/third-party/include/parallel_hashmap/phmap_utils.h similarity index 100% rename from LiteLoader/Header/third-party/parallel_hashmap/phmap_utils.h rename to LiteLoader/third-party/include/parallel_hashmap/phmap_utils.h diff --git a/LiteLoader/Header/third-party/pcg/pcg_extras.hpp b/LiteLoader/third-party/include/pcg/pcg_extras.hpp similarity index 100% rename from LiteLoader/Header/third-party/pcg/pcg_extras.hpp rename to LiteLoader/third-party/include/pcg/pcg_extras.hpp diff --git a/LiteLoader/Header/third-party/pcg/pcg_random.hpp b/LiteLoader/third-party/include/pcg/pcg_random.hpp similarity index 100% rename from LiteLoader/Header/third-party/pcg/pcg_random.hpp rename to LiteLoader/third-party/include/pcg/pcg_random.hpp diff --git a/LiteLoader/Header/third-party/pcg/pcg_uint128.hpp b/LiteLoader/third-party/include/pcg/pcg_uint128.hpp similarity index 100% rename from LiteLoader/Header/third-party/pcg/pcg_uint128.hpp rename to LiteLoader/third-party/include/pcg/pcg_uint128.hpp diff --git a/LiteLoader/Header/third-party/seh_exception/seh_exception.hpp b/LiteLoader/third-party/include/seh_exception/seh_exception.hpp similarity index 100% rename from LiteLoader/Header/third-party/seh_exception/seh_exception.hpp rename to LiteLoader/third-party/include/seh_exception/seh_exception.hpp diff --git a/LiteLoader/Header/third-party/sqlite3/sqlite3.h b/LiteLoader/third-party/include/sqlite3/sqlite3.h similarity index 100% rename from LiteLoader/Header/third-party/sqlite3/sqlite3.h rename to LiteLoader/third-party/include/sqlite3/sqlite3.h diff --git a/LiteLoader/Lib/third-party/SQLiteCpp/SQLiteCpp.lib b/LiteLoader/third-party/lib/SQLiteCpp/SQLiteCpp.lib similarity index 100% rename from LiteLoader/Lib/third-party/SQLiteCpp/SQLiteCpp.lib rename to LiteLoader/third-party/lib/SQLiteCpp/SQLiteCpp.lib diff --git a/LiteLoader/Lib/third-party/SQLiteCpp/sqlite3.lib b/LiteLoader/third-party/lib/SQLiteCpp/sqlite3.lib similarity index 100% rename from LiteLoader/Lib/third-party/SQLiteCpp/sqlite3.lib rename to LiteLoader/third-party/lib/SQLiteCpp/sqlite3.lib diff --git a/LiteLoader/Lib/third-party/compact_enc_det/ced.lib b/LiteLoader/third-party/lib/compact_enc_det/ced.lib similarity index 100% rename from LiteLoader/Lib/third-party/compact_enc_det/ced.lib rename to LiteLoader/third-party/lib/compact_enc_det/ced.lib diff --git a/LiteLoader/Lib/third-party/dbghelp/dbghelp.lib b/LiteLoader/third-party/lib/dbghelp/dbghelp.lib similarity index 100% rename from LiteLoader/Lib/third-party/dbghelp/dbghelp.lib rename to LiteLoader/third-party/lib/dbghelp/dbghelp.lib diff --git a/LiteLoader/Lib/third-party/detours/detours.lib b/LiteLoader/third-party/lib/detours/detours.lib similarity index 100% rename from LiteLoader/Lib/third-party/detours/detours.lib rename to LiteLoader/third-party/lib/detours/detours.lib diff --git a/LiteLoader/Lib/third-party/detours/detours.pdb b/LiteLoader/third-party/lib/detours/detours.pdb similarity index 100% rename from LiteLoader/Lib/third-party/detours/detours.pdb rename to LiteLoader/third-party/lib/detours/detours.pdb diff --git a/LiteLoader/Lib/third-party/dyncall/dyncall_s.lib b/LiteLoader/third-party/lib/dyncall/dyncall_s.lib similarity index 100% rename from LiteLoader/Lib/third-party/dyncall/dyncall_s.lib rename to LiteLoader/third-party/lib/dyncall/dyncall_s.lib diff --git a/LiteLoader/Lib/third-party/dyncall/dyncallback_s.lib b/LiteLoader/third-party/lib/dyncall/dyncallback_s.lib similarity index 100% rename from LiteLoader/Lib/third-party/dyncall/dyncallback_s.lib rename to LiteLoader/third-party/lib/dyncall/dyncallback_s.lib diff --git a/LiteLoader/Lib/third-party/dyncall/dynload_s.lib b/LiteLoader/third-party/lib/dyncall/dynload_s.lib similarity index 100% rename from LiteLoader/Lib/third-party/dyncall/dynload_s.lib rename to LiteLoader/third-party/lib/dyncall/dynload_s.lib diff --git a/LiteLoader/Lib/third-party/leveldb/leveldb.lib b/LiteLoader/third-party/lib/leveldb/leveldb.lib similarity index 100% rename from LiteLoader/Lib/third-party/leveldb/leveldb.lib rename to LiteLoader/third-party/lib/leveldb/leveldb.lib diff --git a/LiteLoader/Lib/third-party/mysql/libmysql.pdb b/LiteLoader/third-party/lib/mysql/libmysql.pdb similarity index 100% rename from LiteLoader/Lib/third-party/mysql/libmysql.pdb rename to LiteLoader/third-party/lib/mysql/libmysql.pdb diff --git a/LiteLoader/Lib/third-party/mysql/mysqlclient.lib b/LiteLoader/third-party/lib/mysql/mysqlclient.lib similarity index 100% rename from LiteLoader/Lib/third-party/mysql/mysqlclient.lib rename to LiteLoader/third-party/lib/mysql/mysqlclient.lib diff --git a/LiteLoader/Lib/third-party/openssl/libcrypto.lib b/LiteLoader/third-party/lib/openssl/libcrypto.lib similarity index 100% rename from LiteLoader/Lib/third-party/openssl/libcrypto.lib rename to LiteLoader/third-party/lib/openssl/libcrypto.lib diff --git a/LiteLoader/Lib/third-party/openssl/libssl.lib b/LiteLoader/third-party/lib/openssl/libssl.lib similarity index 100% rename from LiteLoader/Lib/third-party/openssl/libssl.lib rename to LiteLoader/third-party/lib/openssl/libssl.lib diff --git a/LiteLoader/Lib/third-party/sqlite3/sqlite3.lib b/LiteLoader/third-party/lib/sqlite3/sqlite3.lib similarity index 100% rename from LiteLoader/Lib/third-party/sqlite3/sqlite3.lib rename to LiteLoader/third-party/lib/sqlite3/sqlite3.lib diff --git a/LiteLoader/Lib/third-party/nbt-cpp/nbt.cpp b/LiteLoader/third-party/src/nbt-cpp/nbt.cpp similarity index 98% rename from LiteLoader/Lib/third-party/nbt-cpp/nbt.cpp rename to LiteLoader/third-party/src/nbt-cpp/nbt.cpp index 0a93f5e..bb8c651 100644 --- a/LiteLoader/Lib/third-party/nbt-cpp/nbt.cpp +++ b/LiteLoader/third-party/src/nbt-cpp/nbt.cpp @@ -1,5 +1,6 @@ #include "nbt_internal.hpp" +#include #include #include #include @@ -262,7 +263,7 @@ tag_id deduce_tag(std::istream & input) { } if (std::isdigit(a) || a == '-' || a == '+') { std::string buffer(&a, 1); - tag_id deduced; + tag_id deduced = static_cast(-1); for (;;) { char b = cheof(input); buffer.push_back(b); @@ -577,7 +578,7 @@ std::unique_ptr end_list_tag::read_content(std::istream & input) { } else { char c = cheof(input); if (c != ']') - throw std::runtime_error("']' expected, got "+c); + throw std::runtime_error(std::string("']' expected, got ") + c); } return std::make_unique(); } @@ -801,8 +802,8 @@ tag_list_tag compound_list_tag::as_tags() { void read_compound_text(std::istream & input, tags::compound_tag & compound, const context & ctxt) { skip_space(input); - char a = cheof(input); - if (a != '{') + char start_char = cheof(input); + if (start_char != '{') throw std::runtime_error("failed to open compound"); for (;;) { tag_id key_type = deduce_tag(input); @@ -822,19 +823,19 @@ void read_compound_text(std::istream & input, tags::compound_tag & compound, con std::string key = tags::read_string(input, ctxt); //std::cout << key << std::endl; skip_space(input); - char a = cheof(input); - if (a != ':') - throw std::runtime_error(std::string("key-value delimiter expected, got ") + a); + char next_char = cheof(input); + if (next_char != ':') + throw std::runtime_error(std::string("key-value delimiter expected, got ") + next_char); tag_id value_type = deduce_tag(input); if (value_type == tag_id::tag_end) throw std::runtime_error(std::string("value expected")); compound.value.emplace(std::move(key), tags::read(value_type, input)); skip_space(input); - a = cheof(input); - if (a == '}') + next_char = cheof(input); + if (next_char == '}') return; - if (a != ',' && a != ';') - throw std::runtime_error(std::string("next tag or end expected, got ") + a); + if (next_char != ',' && next_char != ';') + throw std::runtime_error(std::string("next tag or end expected, got ") + next_char); } } diff --git a/LiteLoader/Lib/third-party/nbt-cpp/nbt_internal.hpp b/LiteLoader/third-party/src/nbt-cpp/nbt_internal.hpp similarity index 98% rename from LiteLoader/Lib/third-party/nbt-cpp/nbt_internal.hpp rename to LiteLoader/third-party/src/nbt-cpp/nbt_internal.hpp index b708761..f7568ad 100644 --- a/LiteLoader/Lib/third-party/nbt-cpp/nbt_internal.hpp +++ b/LiteLoader/third-party/src/nbt-cpp/nbt_internal.hpp @@ -1,7 +1,7 @@ #ifndef NBT_INTERNAL_HEAD_BFGUDYHGVWCEARSTYJGHI #define NBT_INTERNAL_HEAD_BFGUDYHGVWCEARSTYJGHI -#include "../../../Header/third-party/nbt-cpp/nbt.hpp" +#include namespace nbt { diff --git a/ParticleAPI-1.16.40 b/ParticleAPI-1.16.40 new file mode 160000 index 0000000..bb5eec0 --- /dev/null +++ b/ParticleAPI-1.16.40 @@ -0,0 +1 @@ +Subproject commit bb5eec05040a634f5a61fdfcea703fcc33954143 diff --git a/PermissionAPI-1.16.40 b/PermissionAPI-1.16.40 new file mode 160000 index 0000000..15e2c6d --- /dev/null +++ b/PermissionAPI-1.16.40 @@ -0,0 +1 @@ +Subproject commit 15e2c6d7149054f36f103de0a86d58e4548a506f diff --git a/PreLoader/CMakeLists.txt b/PreLoader/CMakeLists.txt deleted file mode 100644 index 033a2fd..0000000 --- a/PreLoader/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 3.21) -project(LLPreLoader) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_BUILD_TYPE Release) -SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/x64/) - -add_definitions(-D"NDEBUG" -D"_WINDOWS" -D"_USRDLL" -D"_WINDLL" -D"_UNICODE" -D"UNICODE") - -include_directories(${LiteLoader_SOURCE_DIR}/Header/) -include_directories(${LiteLoader_SOURCE_DIR}/Header/third-party) - -add_compile_options( - /permissive- /GS /GL /W0 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise - /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column -) - -add_link_options( - /MANIFEST /LTCG:incremental /NXCOMPAT /DEBUG /DLL /MACHINE:X64 /OPT:REF /INCREMENTAL:NO - /SUBSYSTEM:WINDOWS /MANIFESTUAC:NO /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1 -) - -link_directories(${CMAKE_SOURCE_DIR}/x64/Release/) - -aux_source_directory(../LiteLoader/Lib/third-party/rawpdb DIR_LIB_SRCS) -add_library(LLPreLoader SHARED dllmain.cpp SymDB.cpp PreLoader.cpp 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") diff --git a/RELEASE/plugins/LLMoney.dll b/RELEASE/plugins/LLMoney.dll deleted file mode 100644 index ad48a3a..0000000 Binary files a/RELEASE/plugins/LLMoney.dll and /dev/null differ diff --git a/RELEASE/plugins/LiteLoader/CrashLogger.dll b/RELEASE/plugins/LiteLoader/CrashLogger.dll deleted file mode 100644 index 69f7c36..0000000 Binary files a/RELEASE/plugins/LiteLoader/CrashLogger.dll and /dev/null differ diff --git a/RELEASE/plugins/LiteLoader/ParticleAPI.dll b/RELEASE/plugins/LiteLoader/ParticleAPI.dll deleted file mode 100644 index 94adf7d..0000000 Binary files a/RELEASE/plugins/LiteLoader/ParticleAPI.dll and /dev/null differ diff --git a/RELEASE/plugins/LiteLoader/PermissionAPI.dll b/RELEASE/plugins/LiteLoader/PermissionAPI.dll deleted file mode 100644 index 6930efe..0000000 Binary files a/RELEASE/plugins/LiteLoader/PermissionAPI.dll and /dev/null differ diff --git a/RELEASE/plugins/LiteLoader/PermissionAPI.pdb b/RELEASE/plugins/LiteLoader/PermissionAPI.pdb deleted file mode 100644 index 3901d34..0000000 Binary files a/RELEASE/plugins/LiteLoader/PermissionAPI.pdb and /dev/null differ diff --git a/ScriptEngine/.gitignore b/ScriptEngine/.gitignore deleted file mode 100644 index 39863a9..0000000 --- a/ScriptEngine/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Debug/ -Release/ -**/*.user - -!third-party/**/*.lib -x64/ -/third-party/ScriptX/lib/ diff --git a/ScriptEngine/API/SimulatedPlayerAPI.cpp b/ScriptEngine/API/SimulatedPlayerAPI.cpp deleted file mode 100644 index 17f333d..0000000 --- a/ScriptEngine/API/SimulatedPlayerAPI.cpp +++ /dev/null @@ -1,667 +0,0 @@ -//#include "APIHelp.h" -//#include "BaseAPI.h" -//#include "BlockAPI.h" -//#include "DeviceAPI.h" -//#include "PlayerAPI.h" -//#include "McAPI.h" -//#include "ContainerAPI.h" -//#include "ItemAPI.h" -//#include "EntityAPI.h" -//#include "NbtAPI.h" -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//using namespace std; -// -// -//Local McClass::spawnSimulatedPlayer(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// CHECK_ARG_TYPE(args[0], ValueKind::kString); -// -// try { -// std::string name = args[0].toStr(); -// if (args.size() == 1) { -// if (auto sp = SimulatedPlayer::create(name)) -// return PlayerClass::newPlayer(sp); -// else -// return Local(); -// } -// auto dimid = 0; -// BlockPos bpos; -// if (IsInstanceOf(args[1])) { -// auto pos = IntPos::extractPos(args[1]); -// bpos = pos->getBlockPos(); -// dimid = pos->getDimensionId(); -// } else if (IsInstanceOf(args[1])) { -// auto pos = FloatPos::extractPos(args[1]); -// bpos = pos->getVec3(); -// dimid = pos->getDimensionId(); -// } else { -// CHECK_ARGS_COUNT(args, 4); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[3], ValueKind::kNumber); -// if (args.size() > 4) { -// CHECK_ARG_TYPE(args[4], ValueKind::kNumber); -// dimid = args[4].toInt(); -// } -// bpos = BlockPos(args[1].toInt(), args[2].toInt(), args[3].toInt()); -// } -// if (auto sp = SimulatedPlayer::create(name, bpos, dimid)) -// return PlayerClass::newPlayer(sp); -// else -// return Local(); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//} -// -//SimulatedPlayer* PlayerClass::asSimulatedPlayer() { -// if (get()->isSimulatedPlayer()) { -// return static_cast(get()); -// } -// return nullptr; -//} -// -//Local PlayerClass::simulateSneak(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// -// return Boolean::newBoolean(sp->simulateSneak()); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//} -// -//// bool simulateAttack(class Actor*); -//// bool simulateAttack(); -//Local PlayerClass::simulateAttack(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// -// if (args.size() == 0) -// return Boolean::newBoolean(sp->simulateAttack()); -// -// if (auto actor = EntityClass::tryExtractActor(args[0])) { -// if (!*actor) -// return Local(); -// return Boolean::newBoolean(sp->simulateAttack(*actor)); -// } -// -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// bool simulateDestroy(); // LIAPI -//// bool simulateDestroyBlock(class BlockPos const&, enum ScriptFacing); -//Local PlayerClass::simulateDestroy(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// -// if (args.size() == 0) -// return Boolean::newBoolean(sp->simulateDestroy()); -// -// int dimid = sp->getDimensionId(); -// BlockPos bpos; -// size_t index = 0; -// ScriptModuleMinecraft::ScriptFacing face = (ScriptModuleMinecraft::ScriptFacing)0; -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[index]); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getBlockPos(); -// index = 1; -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[index]); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getVec3(); -// index = 1; -// } else if (IsInstanceOf(args[0])) { -// auto block = EngineScope::currentEngine()->getNativeInstance(args[0]); -// auto pos = IntPos::extractPos(block->getPos()); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getBlockPos(); -// index = 1; -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 4); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// bpos = {args[0].toInt(), args[1].toInt(), args[2].toInt()}; -// index = 3; -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// if (args.size() > index) { -// CHECK_ARG_TYPE(args[index], ValueKind::kNumber); -// face = (ScriptModuleMinecraft::ScriptFacing)args[index].toInt(); -// } -// // TODO -// return Boolean::newBoolean(sp->simulateDestroyBlock(bpos, face)); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateDisconnect(); -//Local PlayerClass::simulateDisconnect(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateDisconnect(); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// bool simulateInteract(class Actor&); -//// bool simulateInteract(class BlockPos const&, enum ScriptFacing); -//// bool simulateInteract(); -//Local PlayerClass::simulateInteract(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// if (args.size() == 0) -// return Boolean::newBoolean(sp->simulateInteract()); -// -// if (auto actor = EntityClass::tryExtractActor(args[0])) { -// if (!*actor) -// return Local(); -// return Boolean::newBoolean(sp->simulateInteract(**actor)); -// } -// -// int dimid = sp->getDimensionId(); -// BlockPos bpos; -// size_t index = 0; -// ScriptModuleMinecraft::ScriptFacing face = (ScriptModuleMinecraft::ScriptFacing)0; -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[index]); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getBlockPos(); -// index = 1; -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[index]); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getVec3(); -// index = 1; -// } else if (IsInstanceOf(args[0])) { -// auto block = EngineScope::currentEngine()->getNativeInstance(args[0]); -// auto pos = IntPos::extractPos(block->getPos()); -// if (dimid != pos->getDimensionId()) -// return Local(); -// bpos = pos->getBlockPos(); -// index = 1; -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 4); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// bpos = {args[0].toInt(), args[1].toInt(), args[2].toInt()}; -// index = 3; -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// // TODO -// return Boolean::newBoolean(sp->simulateInteract(bpos, face)); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// bool simulateJump(); -//Local PlayerClass::simulateJump(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// return Boolean::newBoolean(sp->simulateJump()); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateLocalMove(class Vec3 const&, float); -//Local PlayerClass::simulateLocalMove(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// Vec3 target; -// float speed = 1.0f; -// size_t index = 0; -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[0]); -// target = pos->getBlockPos().toVec3(); -// index += 1; -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[0]); -// target = pos->getVec3(); -// index += 1; -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 3); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// Vec3 pos = Vec3(args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat()); -// index += 3; -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// -// if (args.size() > index) { -// CHECK_ARG_TYPE(args[index], ValueKind::kNumber); -// speed = args[index].asNumber().toFloat(); -// } -// -// sp->simulateLocalMove(target, speed); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//} -// -//// void simulateWorldMove(class Vec3 const&, float); -//Local PlayerClass::simulateWorldMove(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// Vec3 target; -// float speed = 1.0f; -// size_t index = 0; -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[0]); -// target = pos->getBlockPos().toVec3(); -// index += 1; -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[0]); -// target = pos->getVec3(); -// index += 1; -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 3); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// Vec3 pos = Vec3(args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat()); -// index += 3; -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// -// if (args.size() > index) { -// CHECK_ARG_TYPE(args[index], ValueKind::kNumber); -// speed = args[index].asNumber().toFloat(); -// } -// -// sp->simulateWorldMove(target, speed); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateMoveToLocation(class Vec3 const&, float); -//Local PlayerClass::simulateMoveTo(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// Vec3 target; -// float speed = 1.0f; -// size_t index = 0; -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[0]); -// target = pos->getBlockPos().toVec3(); -// index += 1; -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[0]); -// target = pos->getVec3(); -// index += 1; -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 3); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// Vec3 pos = Vec3(args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat()); -// index += 3; -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// -// if (args.size() > index) { -// CHECK_ARG_TYPE(args[index], ValueKind::kNumber); -// speed = args[index].asNumber().toFloat(); -// } -// -// sp->simulateMoveToLocation(target, speed); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateLookAt(class Actor&); -//// void simulateLookAt(class BlockPos const&); -//// void simulateLookAt(class Vec3 const&); -//Local PlayerClass::simulateLookAt(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// Vec3 target; -// int dimid = sp->getDimensionId(); -// if (IsInstanceOf(args[0])) { -// auto pos = IntPos::extractPos(args[0]); -// auto did = pos->getDimensionId(); -// if (dimid == did || did < 0 || did > 2) { -// sp->simulateLookAt(pos->getBlockPos()); -// return Boolean::newBoolean(true); -// } -// logger.debug("Can't simulate look at other dimension!"); -// return Boolean::newBoolean(false); -// } else if (IsInstanceOf(args[0])) { -// auto pos = FloatPos::extractPos(args[0]); -// auto did = pos->getDimensionId(); -// if (dimid == did || did < 0 || did > 2) { -// sp->simulateLookAt(pos->getVec3()); -// return Boolean::newBoolean(true); -// } -// logger.debug("Can't simulate look at other dimension!"); -// return Boolean::newBoolean(false); -// } else if (IsInstanceOf(args[0])) { -// auto block = EngineScope::currentEngine()->getNativeInstance(args[0]); -// auto pos = IntPos::extractPos(block->getPos()); -// auto did = pos->getDimensionId(); -// if (dimid == did || did < 0 || did > 2) { -// sp->simulateLookAt(pos->getBlockPos()); -// return Boolean::newBoolean(true); -// } -// logger.debug("Can't simulate look at other dimension!"); -// return Boolean::newBoolean(false); -// } else if (auto actor = EntityClass::tryExtractActor(args[0])) { -// if (!*actor) -// return Local(); -// sp->simulateLookAt(**actor); -// return Boolean::newBoolean(true); -// } -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateSetBodyRotation(float); -//Local PlayerClass::simulateSetBodyRotation(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateSetBodyRotation(args[0].asNumber().toFloat()); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//} -// -// -//// void simulateWorldMove(class Vec3 const&, float); -//// void simulateMoveToLocation(class Vec3 const&, float); -// -//inline Local NavigateResultToObject(ScriptModuleMinecraft::ScriptNavigationResult const& res) { -// auto obj = Object::newObject(); -// obj.set(String::newString("isFullPath"), Boolean::newBoolean(res.mIsFullPath)); -// auto path = Array::newArray(); -// for (auto& pos : res.mPath) { -// path.add(Array::newArray({Number::newNumber(pos.x), Number::newNumber(pos.y), Number::newNumber(pos.z)})); -// } -// obj.set(String::newString("path"), path); -// return obj; -//} -//// struct ScriptNavigationResult simulateNavigateToEntity(class Actor&, float); -//// struct ScriptNavigationResult simulateNavigateToLocation(class Vec3 const&, float); -//// void simulateNavigateToLocations(std::vector&&, float); -//Local PlayerClass::simulateNavigateTo(const Arguments& args) { -// CHECK_ARGS_COUNT(args, 1); -// -// try { -// -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// float speed = 1.f; -// if (args.size() > 1) { -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// speed = args[1].asNumber().toFloat(); -// } -// if (args[0].isArray()) { -// auto arr = args[0].asArray(); -// std::vector path; -// for (size_t index = 0; index < arr.size(); ++index) { -// if (IsInstanceOf(arr.get(index))) -// path.emplace_back(IntPos::extractPos(arr.get(index))->getBlockPos().center()); -// else if (IsInstanceOf(arr.get(index))) -// path.emplace_back(FloatPos::extractPos(arr.get(index))->getVec3()); -// else if (arr.get(index).isArray()) { -// auto posArr = arr.get(index).asArray(); -// if (posArr.size() != 3 || !posArr.get(0).isNumber()) { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// path.emplace_back(posArr.get(0).asNumber().toFloat(), posArr.get(1).asNumber().toFloat(), posArr.get(2).asNumber().toFloat()); -// } else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// } -// sp->simulateNavigateToLocations(std::move(path), speed); -// return Boolean::newBoolean(true); -// } else if (auto actor = EntityClass::tryExtractActor(args[0])) { -// if (!*actor) -// return Local(); -// auto res = sp->simulateNavigateToEntity(**actor, speed); -// return NavigateResultToObject(res); -// } else if (IsInstanceOf(args[0]) || IsInstanceOf(args[0])) { -// Vec3 pos = IsInstanceOf(args[0]) ? IntPos::extractPos(args[0])->getBlockPos().bottomCenter() : FloatPos::extractPos(args[0])->getVec3(); -// auto res = sp->simulateNavigateToLocation(pos, speed); -// return NavigateResultToObject(res); -// } -//#ifdef ENABLE_NUMBERS_AS_POS -// else if (args[0].isNumber()) { -// CHECK_ARGS_COUNT(args, 3); -// CHECK_ARG_TYPE(args[0], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[1], ValueKind::kNumber); -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// if (args.size() > 3) { -// CHECK_ARG_TYPE(args[3], ValueKind::kNumber); -// speed = args[3].asNumber().toFloat(); -// } -// Vec3 pos = Vec3(args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat()); -// auto res = sp->simulateNavigateToLocation(pos, speed); -// return NavigateResultToObject(res); -// } -//#endif // ENABLE_NUMBERS_AS_POS -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -// -//// bool simulateSetItem(class ItemStack&, bool, int); -// -// -//// bool simulateUseItem(); -//// bool simulateUseItemInSlot(int); -//// bool simulateUseItem(class ItemStack&); -//// bool simulateUseItemInSlotOnBlock(int, class BlockPos const&, enum ScriptFacing, class Vec3 const&); -//// bool simulateUseItemOnBlock(class ItemStack&, class BlockPos const&, enum ScriptFacing, class Vec3 const&); -//Local PlayerClass::simulateUseItem(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// -// if (args.size() == 0) -// return Boolean::newBoolean(sp->simulateUseItem()); -// -// int slot = -1; -// ItemStack* item = nullptr; -// if (args[0].isNumber()) -// slot = args[0].toInt(); -// else if (IsInstanceOf(args[0])) -// item = ItemClass::extract(args[0]); -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// if (args.size() == 1) { -// if (item) -// return Boolean::newBoolean(sp->simulateUseItem(*item)); -// else -// return Boolean::newBoolean(sp->simulateUseItemInSlot(slot)); -// } -// -// BlockPos bpos; -// ScriptModuleMinecraft::ScriptFacing face = (ScriptModuleMinecraft::ScriptFacing)0; -// Vec3 relativePos = {0.5, 0.5, 0.5}; -// if (IsInstanceOf(args[1])) -// bpos = IntPos::extractPos(args[1])->getBlockPos(); -// else if (IsInstanceOf(args[1])) -// bpos = FloatPos::extractPos(args[1])->getVec3(); -// else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// if (args.size() > 2) { -// CHECK_ARG_TYPE(args[2], ValueKind::kNumber); -// face = (ScriptModuleMinecraft::ScriptFacing)args[2].toInt(); -// if (args.size() > 3) { -// if (IsInstanceOf(args[3])) { -// relativePos = FloatPos::extractPos(args[3])->getVec3(); -// } else { -// LOG_WRONG_ARG_TYPE(); -// return Local(); -// } -// } -// } -// if (item) -// return Boolean::newBoolean(sp->simulateUseItemOnBlock(*item, bpos, face, relativePos)); -// else -// return Boolean::newBoolean(sp->simulateUseItemInSlotOnBlock(slot, bpos, face, relativePos)); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//// void simulateStopDestroyingBlock(); -//// void simulateStopInteracting(); -//// void simulateStopMoving(); -//// void simulateStopUsingItem(); -//Local PlayerClass::simulateStopDestroyingBlock(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateStopDestroyingBlock(); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//Local PlayerClass::simulateStopInteracting(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateStopInteracting(); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//Local PlayerClass::simulateStopMoving(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateStopMoving(); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//Local PlayerClass::simulateStopUsingItem(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// sp->simulateStopUsingItem(); -// return Boolean::newBoolean(true); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//}; -// -//Local PlayerClass::simulateStopSneaking(const Arguments& args) { -// try { -// auto sp = asSimulatedPlayer(); -// if (!sp) -// return Local(); -// -// return Boolean::newBoolean(sp->simulateStopSneaking()); -// } -// CATCH("Fail in " __FUNCTION__ "!") -//} diff --git a/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt index b44505f..6c4abd7 100644 --- a/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.21) -project(LiteLoader.Lua) +project(ScriptEngine-Lua) set(CMAKE_CXX_STANDARD 20) set(CMAKE_BUILD_TYPE Release) @@ -9,3 +9,14 @@ set(SCRIPTX_BACKEND Lua) set(LLSE_BACKEND_LIBRARY Lua) include(../../CMakeLists.txt) + +target_include_directories(${PROJECT_NAME} PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/Lua/) + +# copy target DLL and PDB to output directory +add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/output/plugins/LiteLoader/LiteLoader.Lua.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/pdb/LiteLoader.Lua.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" + VERBATIM +) diff --git a/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt index 1a9d06e..3d64299 100644 --- a/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.21) -project(LiteLoader.NodeJs) +project(ScriptEngine-NodeJs) set(CMAKE_CXX_STANDARD 17) set(CMAKE_BUILD_TYPE Release) @@ -9,3 +9,18 @@ set(SCRIPTX_BACKEND V8) set(LLSE_BACKEND_LIBRARY NodeJs) include(../../CMakeLists.txt) + +target_include_directories( + ${PROJECT_NAME} + PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/NodeJs + PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/NodeJs/v8 +) + +# copy target DLL and PDB to output directory +add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/output/plugins/LiteLoader/LiteLoader.NodeJs.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/pdb/LiteLoader.NodeJs.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" + VERBATIM +) diff --git a/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt index cf7e6d5..1036adc 100644 --- a/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.21) -project(LiteLoader.Js) +project(ScriptEngine-QuickJs) set(CMAKE_CXX_STANDARD 20) set(CMAKE_BUILD_TYPE Release) @@ -9,3 +9,14 @@ set(SCRIPTX_BACKEND QuickJs) set(LLSE_BACKEND_LIBRARY QuickJs) include(../../CMakeLists.txt) + +target_include_directories(${PROJECT_NAME} PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/QuickJs/) + +# copy target DLL and PDB to output directory +add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/output/plugins/LiteLoader/LiteLoader.Js.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/pdb/LiteLoader.Js.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" + VERBATIM +) diff --git a/ScriptEngine/CMakeLists.txt b/ScriptEngine/CMakeLists.txt index d84e9a5..fde15c3 100644 --- a/ScriptEngine/CMakeLists.txt +++ b/ScriptEngine/CMakeLists.txt @@ -14,25 +14,13 @@ endif () set(SCRIPTENGINE_DIR ${CMAKE_CURRENT_LIST_DIR}) -set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/x64) - -set(TARGET_DIR ${CMAKE_SOURCE_DIR}/x64/Release) - -file(GLOB_RECURSE SRC_FILES - ${SCRIPTENGINE_DIR}/Main/*.cpp - ${SCRIPTENGINE_DIR}/Main/*.hpp - ${SCRIPTENGINE_DIR}/Main/*.h - ${SCRIPTENGINE_DIR}/API/*.cpp - ${SCRIPTENGINE_DIR}/API/*.hpp - ${SCRIPTENGINE_DIR}/API/*.h - ${SCRIPTENGINE_DIR}/Engine/*.cpp - ${SCRIPTENGINE_DIR}/Engine/*.hpp - ${SCRIPTENGINE_DIR}/Engine/*.h - ${SCRIPTENGINE_DIR}/Tools/*.cpp - ${SCRIPTENGINE_DIR}/Tools/*.hpp - ${SCRIPTENGINE_DIR}/Tools/*.h - ${SCRIPTENGINE_DIR}/Resource/*.rc - ${SCRIPTENGINE_DIR}/Resource/*.h +file( + GLOB_RECURSE SRC_FILES + ${SCRIPTENGINE_DIR}/src/*.cpp + ${SCRIPTENGINE_DIR}/src/*.hpp + ${SCRIPTENGINE_DIR}/src/*.h + ${SCRIPTENGINE_DIR}/src/*.inc + ${SCRIPTENGINE_DIR}/src/*.rc ) add_definitions( @@ -41,11 +29,14 @@ add_definitions( -D_WINDLL -D_UNICODE -DUNICODE -D "LLSE_BACKEND_${LLSE_BACKEND}" -DCMAKE ) +# Replace Compile Flag /EHsc to /EHa +string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + add_compile_options( /permissive- /MP /GS /GL /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC - /EHa /nologo /diagnostics:column /utf-8 + /nologo /diagnostics:column /utf-8 ) add_link_options( @@ -58,39 +49,30 @@ add_link_options( add_library(${PROJECT_NAME} SHARED ${SRC_FILES}) -include_directories(${SCRIPTENGINE_DIR}/) -include_directories(${SCRIPTENGINE_DIR}/Main) -include_directories(${SCRIPTENGINE_DIR}/..) -include_directories(${LiteLoader_SOURCE_DIR}/Header) -include_directories(${LiteLoader_SOURCE_DIR}/Header/third-party) -include_directories(${SCRIPTENGINE_DIR}/third-party) -include_directories(${SCRIPTENGINE_DIR}/third-party/Lua/include) -include_directories(${SCRIPTENGINE_DIR}/third-party/NodeJs/include) -include_directories(${SCRIPTENGINE_DIR}/third-party/QuickJs/include) -include_directories(${SCRIPTENGINE_DIR}/third-party/ScriptX/src/include/ScriptX) -include_directories(${SCRIPTENGINE_DIR}/third-party/ScriptX/src/include) -include_directories(${SCRIPTENGINE_DIR}/third-party/NodeJs/include) -include_directories(${SCRIPTENGINE_DIR}/third-party/NodeJs/include/v8) -include_directories(${SCRIPTENGINE_DIR}/third-party/gsl) +target_include_directories( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_SOURCE_DIR} + ${LiteLoader_SOURCE_DIR}/include/ + ${LiteLoader_SOURCE_DIR}/third-party/include + ${SCRIPTENGINE_DIR}/src + ${SCRIPTENGINE_DIR}/third-party/include + ${SCRIPTENGINE_DIR}/third-party/ScriptX/src/include +) -link_directories(${SCRIPTENGINE_DIR}/) -link_directories(${CMAKE_SOURCE_DIR}/x64/Release/) +file( + GLOB_RECURSE SCRIPTENGINE_THIRD_PARTY_LIBS + ${SCRIPTENGINE_DIR}/third-party/lib/*.lib + ${SCRIPTENGINE_DIR}/third-party/backend/lib/${LLSE_BACKEND_LIBRARY}/*.lib +) -add_library(base64 STATIC IMPORTED) - -target_link_libraries(${PROJECT_NAME} LiteLoader ScriptX-${LLSE_BACKEND_LIBRARY} - "${CMAKE_SOURCE_DIR}/LiteLoader/Lib/third-party/openssl/libcrypto.lib" - "${CMAKE_SOURCE_DIR}/LiteLoader/Lib/third-party/openssl/libssl.lib" - "${SCRIPTENGINE_DIR}/third-party/dyncall/lib/libdyncall_s.lib" - "${SCRIPTENGINE_DIR}/third-party/dyncall/lib/libdyncallback_s.lib" - "${SCRIPTENGINE_DIR}/third-party/dyncall/lib/libdynload_s.lib" - "${SCRIPTENGINE_DIR}/third-party/LightWebSocketClient/lib/LightWSClient.lib" - "${SCRIPTENGINE_DIR}/third-party/NodeJs/lib/libnode.lib" - "${SCRIPTENGINE_DIR}/third-party/QuickJs/lib/quickjs.lib" - "${SCRIPTENGINE_DIR}/third-party/Lua/lib/lua.lib" - "${SCRIPTENGINE_DIR}/third-party/nbt-cpp/lib/nbt-cpp.lib" +target_link_libraries( + ${PROJECT_NAME} LiteLoader ScriptX-${LLSE_BACKEND_LIBRARY} + "${LiteLoader_SOURCE_DIR}/third-party/lib/openssl/libcrypto.lib" + "${LiteLoader_SOURCE_DIR}/third-party/lib/openssl/libssl.lib" + ${SCRIPTENGINE_THIRD_PARTY_LIBS} # Please make sure that the BDS APIs ImportLibrary is at the bottom of the list to ensure proper linking. - "${LiteLoader_SOURCE_DIR}/Lib/bedrock_server_api.lib" - "${LiteLoader_SOURCE_DIR}/Lib/bedrock_server_var.lib" + "${LiteLoader_SOURCE_DIR}/lib/bedrock_server_api.lib" + "${LiteLoader_SOURCE_DIR}/lib/bedrock_server_var.lib" SymDBHelper ) \ No newline at end of file diff --git a/ScriptEngine/Resource/ScriptEngine.rc b/ScriptEngine/Resource/ScriptEngine.rc deleted file mode 100644 index 3c5131f..0000000 --- a/ScriptEngine/Resource/ScriptEngine.rc +++ /dev/null @@ -1,111 +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 "../LiteLoader/Main/Version.h" -#include "Configs.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" - "#include ""../LiteLoader/Main/Version.h""\r\n" - "#include ""Configs.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#ifdef LLSE_BACKEND_QUICKJS -#define LLSE_OUTPUT_FILE_NAME "LiteLoader.Js.dll" -#define LLSE_FILE_DESCRIPTION "A QuickJs Script Plugin Engine for LiteLoader" -#elif defined LLSE_BACKEND_LUA -#define LLSE_OUTPUT_FILE_NAME "LiteLoader.Lua.dll" -#define LLSE_FILE_DESCRIPTION "A Lua Script Plugin Engine for LiteLoader" -#elif defined LLSE_BACKEND_NODEJS -#define LLSE_OUTPUT_FILE_NAME "LiteLoader.NodeJs.dll" -#define LLSE_FILE_DESCRIPTION "A NodeJs Script Plugin Engine for LiteLoader" -#endif - -///////////////////////////////////////////////////////////////////////////// -// -// 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", LLSE_FILE_DESCRIPTION - VALUE "FileVersion", LITELOADER_FILE_VERSION_STRING - VALUE "InternalName", LLSE_OUTPUT_FILE_NAME - VALUE "LegalCopyright", "LiteLoader Developer" - VALUE "OriginalFilename", LLSE_OUTPUT_FILE_NAME - VALUE "ProductName", "LiteLoader Script Engine 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 - diff --git a/ScriptEngine/Resource/resource.h b/ScriptEngine/Resource/resource.h deleted file mode 100644 index 136f81e..0000000 --- a/ScriptEngine/Resource/resource.h +++ /dev/null @@ -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 - diff --git a/ScriptEngine/BaseLib/BaseLib.js b/ScriptEngine/assets/BaseLib.js similarity index 100% rename from ScriptEngine/BaseLib/BaseLib.js rename to ScriptEngine/assets/BaseLib.js diff --git a/ScriptEngine/BaseLib/BaseLib.lua b/ScriptEngine/assets/BaseLib.lua similarity index 100% rename from ScriptEngine/BaseLib/BaseLib.lua rename to ScriptEngine/assets/BaseLib.lua diff --git a/ScriptEngine/API/APIHelp.cpp b/ScriptEngine/src/api/APIHelp.cpp similarity index 97% rename from ScriptEngine/API/APIHelp.cpp rename to ScriptEngine/src/api/APIHelp.cpp index e5bcfd5..674ee30 100644 --- a/ScriptEngine/API/APIHelp.cpp +++ b/ScriptEngine/src/api/APIHelp.cpp @@ -5,23 +5,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "BaseAPI.h" +#include "BlockAPI.h" +#include "EntityAPI.h" +#include "ItemAPI.h" +#include "PlayerAPI.h" +#include "DeviceAPI.h" +#include "ItemAPI.h" +#include "EntityAPI.h" +#include "ContainerAPI.h" +#include "NbtAPI.h" +#include "GuiAPI.h" +#include "DataAPI.h" +#include "DatabaseAPI.h" +#include "PlayerAPI.h" +#include "NetworkAPI.h" +#include
+#include #include "APIHelp.h" #include "NativeAPI.h" diff --git a/ScriptEngine/API/APIHelp.h b/ScriptEngine/src/api/APIHelp.h similarity index 96% rename from ScriptEngine/API/APIHelp.h rename to ScriptEngine/src/api/APIHelp.h index 4f3ae14..74150c8 100644 --- a/ScriptEngine/API/APIHelp.h +++ b/ScriptEngine/src/api/APIHelp.h @@ -1,36 +1,19 @@ #pragma once -#include -using script::Arguments; -using script::Array; -using script::Boolean; -using script::ByteBuffer; -using script::ClassDefine; -using script::defineClass; -using script::EngineScope; -using script::Exception; -using script::ExitEngineScope; -using script::Function; -using script::Local; -using script::Number; -using script::Object; -using script::ScriptClass; -using script::ScriptEngine; -using script::ScriptEngineImpl; -using script::selectOverloadedFunc; -using script::String; -using script::Value; -using script::ValueKind; -#include -#include -#include -#include #include #include #include #include + #include +#include + +#include +#include +#include
+#include + // 输出异常信息 inline void PrintException(const script::Exception& e) { ostringstream sout; diff --git a/ScriptEngine/API/BaseAPI.cpp b/ScriptEngine/src/api/BaseAPI.cpp similarity index 96% rename from ScriptEngine/API/BaseAPI.cpp rename to ScriptEngine/src/api/BaseAPI.cpp index e279025..de2090c 100644 --- a/ScriptEngine/API/BaseAPI.cpp +++ b/ScriptEngine/src/api/BaseAPI.cpp @@ -1,12 +1,15 @@ #include "BaseAPI.h" -#include "APIHelp.h" -#include -#include -#include -#include -#include "McAPI.h" + #include -#include + +#include +#include +#include +#include + +#include
+#include "APIHelp.h" +#include "McAPI.h" ///////////////////// Enum ////////////////////// ClassDefine DamageCauseEnumBuilder = EnumDefineBuilder::build("DamageCause"); @@ -241,14 +244,14 @@ Local McClass::newFloatPos(const Arguments& args) { Local McClass::getBDSVersion(const Arguments& args) { try { - return String::newString(LL::getBdsVersion()); + return String::newString(ll::getBdsVersion()); } CATCH("Fail in GetBDSVersion!") } Local McClass::getServerProtocolVersion(const Arguments& args) { try { - return Number::newNumber(LL::getServerProtocolVersion()); + return Number::newNumber(ll::getServerProtocolVersion()); } CATCH("Fail in GetServerProtocolVersion!") } \ No newline at end of file diff --git a/ScriptEngine/API/BaseAPI.h b/ScriptEngine/src/api/BaseAPI.h similarity index 97% rename from ScriptEngine/API/BaseAPI.h rename to ScriptEngine/src/api/BaseAPI.h index 17188b7..c83f983 100644 --- a/ScriptEngine/API/BaseAPI.h +++ b/ScriptEngine/src/api/BaseAPI.h @@ -1,6 +1,6 @@ #pragma once #include "APIHelp.h" -#include +#include
#include class BlockSource; diff --git a/ScriptEngine/API/BlockAPI.cpp b/ScriptEngine/src/api/BlockAPI.cpp similarity index 98% rename from ScriptEngine/API/BlockAPI.cpp rename to ScriptEngine/src/api/BlockAPI.cpp index 5676c8f..59cd34e 100644 --- a/ScriptEngine/API/BlockAPI.cpp +++ b/ScriptEngine/src/api/BlockAPI.cpp @@ -7,12 +7,12 @@ #include "BlockEntityAPI.h" #include "NbtAPI.h" #include "NativeAPI.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/BlockAPI.h b/ScriptEngine/src/api/BlockAPI.h similarity index 93% rename from ScriptEngine/API/BlockAPI.h rename to ScriptEngine/src/api/BlockAPI.h index 41d3567..c7e9951 100644 --- a/ScriptEngine/API/BlockAPI.h +++ b/ScriptEngine/src/api/BlockAPI.h @@ -1,7 +1,7 @@ #pragma once #include "APIHelp.h" -#include -#include +#include +#include
#include diff --git a/ScriptEngine/API/BlockEntityAPI.cpp b/ScriptEngine/src/api/BlockEntityAPI.cpp similarity index 96% rename from ScriptEngine/API/BlockEntityAPI.cpp rename to ScriptEngine/src/api/BlockEntityAPI.cpp index 9d9bcbd..a3742eb 100644 --- a/ScriptEngine/API/BlockEntityAPI.cpp +++ b/ScriptEngine/src/api/BlockEntityAPI.cpp @@ -4,9 +4,9 @@ #include "BlockEntityAPI.h" #include "NbtAPI.h" #include "NativeAPI.h" -#include -#include -#include +#include
+#include +#include //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/BlockEntityAPI.h b/ScriptEngine/src/api/BlockEntityAPI.h similarity index 100% rename from ScriptEngine/API/BlockEntityAPI.h rename to ScriptEngine/src/api/BlockEntityAPI.h diff --git a/ScriptEngine/API/CommandAPI.cpp b/ScriptEngine/src/api/CommandAPI.cpp similarity index 98% rename from ScriptEngine/API/CommandAPI.cpp rename to ScriptEngine/src/api/CommandAPI.cpp index 28d8c02..f4696da 100644 --- a/ScriptEngine/API/CommandAPI.cpp +++ b/ScriptEngine/src/api/CommandAPI.cpp @@ -6,23 +6,23 @@ #include "BlockAPI.h" #include "CommandOriginAPI.h" #include "CommandOutputAPI.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include
#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include "BaseAPI.h" +#include "EntityAPI.h" #include -#include +#include //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/CommandAPI.h b/ScriptEngine/src/api/CommandAPI.h similarity index 98% rename from ScriptEngine/API/CommandAPI.h rename to ScriptEngine/src/api/CommandAPI.h index 4d35ae9..63cc5da 100644 --- a/ScriptEngine/API/CommandAPI.h +++ b/ScriptEngine/src/api/CommandAPI.h @@ -1,6 +1,6 @@ #pragma once #include "CommandCompatibleAPI.h" -#include +#include extern ClassDefine ParamTypeStaticBuilder; extern ClassDefine PermissionStaticBuilder; diff --git a/ScriptEngine/API/CommandCompatibleAPI.cpp b/ScriptEngine/src/api/CommandCompatibleAPI.cpp similarity index 96% rename from ScriptEngine/API/CommandCompatibleAPI.cpp rename to ScriptEngine/src/api/CommandCompatibleAPI.cpp index 98d3145..1801bfe 100644 --- a/ScriptEngine/API/CommandCompatibleAPI.cpp +++ b/ScriptEngine/src/api/CommandCompatibleAPI.cpp @@ -2,15 +2,15 @@ #include "APIHelp.h" #include "McAPI.h" #include "PlayerAPI.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include
#include -#include +#include
#include #include using namespace std; diff --git a/ScriptEngine/API/CommandCompatibleAPI.h b/ScriptEngine/src/api/CommandCompatibleAPI.h similarity index 100% rename from ScriptEngine/API/CommandCompatibleAPI.h rename to ScriptEngine/src/api/CommandCompatibleAPI.h diff --git a/ScriptEngine/API/CommandOriginAPI.cpp b/ScriptEngine/src/api/CommandOriginAPI.cpp similarity index 93% rename from ScriptEngine/API/CommandOriginAPI.cpp rename to ScriptEngine/src/api/CommandOriginAPI.cpp index f54b5f6..6989768 100644 --- a/ScriptEngine/API/CommandOriginAPI.cpp +++ b/ScriptEngine/src/api/CommandOriginAPI.cpp @@ -10,14 +10,14 @@ #include "McAPI.h" #include "ContainerAPI.h" #include "NbtAPI.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/CommandOriginAPI.h b/ScriptEngine/src/api/CommandOriginAPI.h similarity index 95% rename from ScriptEngine/API/CommandOriginAPI.h rename to ScriptEngine/src/api/CommandOriginAPI.h index 0688034..2df0cd0 100644 --- a/ScriptEngine/API/CommandOriginAPI.h +++ b/ScriptEngine/src/api/CommandOriginAPI.h @@ -1,6 +1,6 @@ #pragma once #include "APIHelp.h" -#include +#include class CommandOriginClass; extern ClassDefine OriginTypeStaticBuilder; diff --git a/ScriptEngine/API/CommandOutputAPI.cpp b/ScriptEngine/src/api/CommandOutputAPI.cpp similarity index 100% rename from ScriptEngine/API/CommandOutputAPI.cpp rename to ScriptEngine/src/api/CommandOutputAPI.cpp diff --git a/ScriptEngine/API/CommandOutputAPI.h b/ScriptEngine/src/api/CommandOutputAPI.h similarity index 98% rename from ScriptEngine/API/CommandOutputAPI.h rename to ScriptEngine/src/api/CommandOutputAPI.h index 0d808ed..bd41dbf 100644 --- a/ScriptEngine/API/CommandOutputAPI.h +++ b/ScriptEngine/src/api/CommandOutputAPI.h @@ -1,6 +1,6 @@ #pragma once #include "APIHelp.h" -#include +#include class CommandOutputClass; extern ClassDefine CommandOutputClassBuilder; diff --git a/ScriptEngine/API/ContainerAPI.cpp b/ScriptEngine/src/api/ContainerAPI.cpp similarity index 98% rename from ScriptEngine/API/ContainerAPI.cpp rename to ScriptEngine/src/api/ContainerAPI.cpp index db7ef6b..476d870 100644 --- a/ScriptEngine/API/ContainerAPI.cpp +++ b/ScriptEngine/src/api/ContainerAPI.cpp @@ -2,8 +2,8 @@ #include "APIHelp.h" #include "ItemAPI.h" #include "NativeAPI.h" -#include -#include +#include +#include using namespace std; //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/ContainerAPI.h b/ScriptEngine/src/api/ContainerAPI.h similarity index 100% rename from ScriptEngine/API/ContainerAPI.h rename to ScriptEngine/src/api/ContainerAPI.h diff --git a/ScriptEngine/API/DataAPI.cpp b/ScriptEngine/src/api/DataAPI.cpp similarity index 99% rename from ScriptEngine/API/DataAPI.cpp rename to ScriptEngine/src/api/DataAPI.cpp index 6cecbea..c796872 100644 --- a/ScriptEngine/API/DataAPI.cpp +++ b/ScriptEngine/src/api/DataAPI.cpp @@ -5,13 +5,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include
#include using namespace std; diff --git a/ScriptEngine/API/DataAPI.h b/ScriptEngine/src/api/DataAPI.h similarity index 97% rename from ScriptEngine/API/DataAPI.h rename to ScriptEngine/src/api/DataAPI.h index 8c88375..d54f4de 100644 --- a/ScriptEngine/API/DataAPI.h +++ b/ScriptEngine/src/api/DataAPI.h @@ -2,9 +2,9 @@ #include "APIHelp.h" #include #include -#include -#include -#include +#include +#include +#include //////////////////// Data Static //////////////////// diff --git a/ScriptEngine/API/DatabaseAPI.cpp b/ScriptEngine/src/api/DatabaseAPI.cpp similarity index 100% rename from ScriptEngine/API/DatabaseAPI.cpp rename to ScriptEngine/src/api/DatabaseAPI.cpp diff --git a/ScriptEngine/API/DatabaseAPI.h b/ScriptEngine/src/api/DatabaseAPI.h similarity index 97% rename from ScriptEngine/API/DatabaseAPI.h rename to ScriptEngine/src/api/DatabaseAPI.h index 841d0ee..bba0d54 100644 --- a/ScriptEngine/API/DatabaseAPI.h +++ b/ScriptEngine/src/api/DatabaseAPI.h @@ -1,7 +1,7 @@ #pragma once #include "APIHelp.h" -#include -#include +#include +#include //////////////////// Classes //////////////////// diff --git a/ScriptEngine/API/DeviceAPI.cpp b/ScriptEngine/src/api/DeviceAPI.cpp similarity index 97% rename from ScriptEngine/API/DeviceAPI.cpp rename to ScriptEngine/src/api/DeviceAPI.cpp index ac4232f..8ced5c7 100644 --- a/ScriptEngine/API/DeviceAPI.cpp +++ b/ScriptEngine/src/api/DeviceAPI.cpp @@ -1,9 +1,9 @@ #include "APIHelp.h" #include "DeviceAPI.h" #include -#include -#include -#include +#include +#include +#include using namespace std; diff --git a/ScriptEngine/API/DeviceAPI.h b/ScriptEngine/src/api/DeviceAPI.h similarity index 100% rename from ScriptEngine/API/DeviceAPI.h rename to ScriptEngine/src/api/DeviceAPI.h diff --git a/ScriptEngine/API/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp similarity index 99% rename from ScriptEngine/API/EntityAPI.cpp rename to ScriptEngine/src/api/EntityAPI.cpp index 243373c..65c235b 100644 --- a/ScriptEngine/API/EntityAPI.cpp +++ b/ScriptEngine/src/api/EntityAPI.cpp @@ -9,12 +9,12 @@ #include "ContainerAPI.h" #include "NbtAPI.h" #include "NativeAPI.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //////////////////// Class Definition //////////////////// @@ -321,7 +321,7 @@ Local EntityClass::isAngry() { CATCH("Fail in isAngry!") } -#include +#include Local EntityClass::getName() { try { Actor* entity = get(); diff --git a/ScriptEngine/API/EntityAPI.h b/ScriptEngine/src/api/EntityAPI.h similarity index 100% rename from ScriptEngine/API/EntityAPI.h rename to ScriptEngine/src/api/EntityAPI.h diff --git a/ScriptEngine/API/EventAPI.cpp b/ScriptEngine/src/api/EventAPI.cpp similarity index 98% rename from ScriptEngine/API/EventAPI.cpp rename to ScriptEngine/src/api/EventAPI.cpp index f3c5b1a..b320d66 100644 --- a/ScriptEngine/API/EventAPI.cpp +++ b/ScriptEngine/src/api/EventAPI.cpp @@ -8,14 +8,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include
+#include +#include +#include +#include +#include
#include "APIHelp.h" -#include +#include
#include "BaseAPI.h" #include "BlockAPI.h" #include "GuiAPI.h" @@ -23,21 +23,21 @@ #include "ItemAPI.h" #include "EntityAPI.h" #include "PlayerAPI.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include
+#include
+#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; //////////////////// Listeners //////////////////// @@ -1141,7 +1141,7 @@ void InitBasicEventListeners() { // Plugin Hot Management Event::ScriptPluginManagerEvent::subscribe_ref([](ScriptPluginManagerEvent& ev) { - // if (!LL::isDebugMode()) + // if (!ll::isDebugMode()) // return false; switch (ev.operation) { diff --git a/ScriptEngine/API/EventAPI.h b/ScriptEngine/src/api/EventAPI.h similarity index 92% rename from ScriptEngine/API/EventAPI.h rename to ScriptEngine/src/api/EventAPI.h index c376f4a..8fa32ba 100644 --- a/ScriptEngine/API/EventAPI.h +++ b/ScriptEngine/src/api/EventAPI.h @@ -1,7 +1,7 @@ #pragma once #include "APIHelp.h" -#include +#include
//////////////////// Funcs //////////////////// diff --git a/ScriptEngine/API/FileSystemAPI.cpp b/ScriptEngine/src/api/FileSystemAPI.cpp similarity index 98% rename from ScriptEngine/API/FileSystemAPI.cpp rename to ScriptEngine/src/api/FileSystemAPI.cpp index 4afc75d..55d0bc8 100644 --- a/ScriptEngine/API/FileSystemAPI.cpp +++ b/ScriptEngine/src/api/FileSystemAPI.cpp @@ -1,12 +1,12 @@ #include "APIHelp.h" #include "FileSystemAPI.h" -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include using namespace std::filesystem; using namespace std; @@ -233,7 +233,7 @@ Local FileClass::read(const Arguments& args) { pool.enqueue([cnt, fp{&file}, isBinary{isBinary}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -267,7 +267,7 @@ Local FileClass::readLine(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -297,7 +297,7 @@ Local FileClass::readAll(const Arguments& args) { pool.enqueue([fp{&file}, isBinary{isBinary}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -342,7 +342,7 @@ Local FileClass::write(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, data{std::move(data)}, isString, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -383,7 +383,7 @@ Local FileClass::writeLine(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, data{std::move(data)}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; diff --git a/ScriptEngine/API/FileSystemAPI.h b/ScriptEngine/src/api/FileSystemAPI.h similarity index 100% rename from ScriptEngine/API/FileSystemAPI.h rename to ScriptEngine/src/api/FileSystemAPI.h diff --git a/ScriptEngine/API/GameUtilsAPI.cpp b/ScriptEngine/src/api/GameUtilsAPI.cpp similarity index 100% rename from ScriptEngine/API/GameUtilsAPI.cpp rename to ScriptEngine/src/api/GameUtilsAPI.cpp diff --git a/ScriptEngine/API/GameUtilsAPI.h b/ScriptEngine/src/api/GameUtilsAPI.h similarity index 100% rename from ScriptEngine/API/GameUtilsAPI.h rename to ScriptEngine/src/api/GameUtilsAPI.h diff --git a/ScriptEngine/API/GlobalNativePointer.cpp b/ScriptEngine/src/api/GlobalNativePointer.cpp similarity index 100% rename from ScriptEngine/API/GlobalNativePointer.cpp rename to ScriptEngine/src/api/GlobalNativePointer.cpp diff --git a/ScriptEngine/API/GuiAPI.cpp b/ScriptEngine/src/api/GuiAPI.cpp similarity index 97% rename from ScriptEngine/API/GuiAPI.cpp rename to ScriptEngine/src/api/GuiAPI.cpp index b89efa9..15eb845 100644 --- a/ScriptEngine/API/GuiAPI.cpp +++ b/ScriptEngine/src/api/GuiAPI.cpp @@ -2,11 +2,11 @@ #include "GuiAPI.h" #include "PlayerAPI.h" #include "McAPI.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace std; @@ -58,7 +58,7 @@ bool SimpleFormClass::sendForm(Form::SimpleForm* form, Player* player, script::L return form->sendTo(player, [engine{EngineScope::currentEngine()}, callback{std::move(callbackFunc)}](Player* pl, int chosen) { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -140,7 +140,7 @@ bool CustomFormClass::sendForm(Form::CustomForm* form, Player* player, script::L return form->sendToForRawJson(player, [engine{EngineScope::currentEngine()}, callback{std::move(callbackFunc)}](Player* pl, string data) { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; diff --git a/ScriptEngine/API/GuiAPI.h b/ScriptEngine/src/api/GuiAPI.h similarity index 94% rename from ScriptEngine/API/GuiAPI.h rename to ScriptEngine/src/api/GuiAPI.h index c29d76a..96f260a 100644 --- a/ScriptEngine/API/GuiAPI.h +++ b/ScriptEngine/src/api/GuiAPI.h @@ -1,7 +1,7 @@ #pragma once #include "APIHelp.h" -#include +#include //////////////////// Classes //////////////////// diff --git a/ScriptEngine/API/InternationalAPI.cpp b/ScriptEngine/src/api/InternationalAPI.cpp similarity index 99% rename from ScriptEngine/API/InternationalAPI.cpp rename to ScriptEngine/src/api/InternationalAPI.cpp index 075376c..6904466 100644 --- a/ScriptEngine/API/InternationalAPI.cpp +++ b/ScriptEngine/src/api/InternationalAPI.cpp @@ -1,7 +1,7 @@ #define NEW_DEFINES #include "InternationalAPI.h" -#include -#include +#include +#include void FormatHelper(std::vector>& args, const std::vector& names, bool enableObject, fmt::dynamic_format_arg_store& s, diff --git a/ScriptEngine/API/InternationalAPI.h b/ScriptEngine/src/api/InternationalAPI.h similarity index 100% rename from ScriptEngine/API/InternationalAPI.h rename to ScriptEngine/src/api/InternationalAPI.h diff --git a/ScriptEngine/API/ItemAPI.cpp b/ScriptEngine/src/api/ItemAPI.cpp similarity index 99% rename from ScriptEngine/API/ItemAPI.cpp rename to ScriptEngine/src/api/ItemAPI.cpp index 451edb1..9ff416a 100644 --- a/ScriptEngine/API/ItemAPI.cpp +++ b/ScriptEngine/src/api/ItemAPI.cpp @@ -5,8 +5,8 @@ #include "EntityAPI.h" #include "NbtAPI.h" #include "NativeAPI.h" -#include -#include +#include +#include #include #include diff --git a/ScriptEngine/API/ItemAPI.h b/ScriptEngine/src/api/ItemAPI.h similarity index 100% rename from ScriptEngine/API/ItemAPI.h rename to ScriptEngine/src/api/ItemAPI.h diff --git a/ScriptEngine/API/LlAPI.cpp b/ScriptEngine/src/api/LlAPI.cpp similarity index 93% rename from ScriptEngine/API/LlAPI.cpp rename to ScriptEngine/src/api/LlAPI.cpp index c197820..ae0d08b 100644 --- a/ScriptEngine/API/LlAPI.cpp +++ b/ScriptEngine/src/api/LlAPI.cpp @@ -1,12 +1,12 @@ #include "APIHelp.h" -#include +#include #include "LlAPI.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include
+#include +#include #include #include #include @@ -54,7 +54,7 @@ Local LlClass::registerPlugin(const Arguments& args) { string name = args[0].toStr(); string desc = args.size() >= 2 ? args[1].toStr() : ""; - LL::Version ver = LL::Version(1, 0, 0); + ll::Version ver = ll::Version(1, 0, 0); if (args.size() >= 3) { if (args[2].isArray()) { Local verInfo = args[2].asArray(); @@ -118,7 +118,7 @@ Local LlClass::getPluginInfo(const Arguments& args) { try { std::string name = args[0].toStr(); - auto plugin = LL::getPlugin(name); + auto plugin = ll::getPlugin(name); if (plugin) { auto result = Object::newObject(); @@ -150,11 +150,11 @@ Local LlClass::getVersionStatus(const Arguments& args) { try { int versionStatusValue; - if (LITELOADER_VERSION_STATUS == LL::Version::Status::Release) { + if (LITELOADER_VERSION_STATUS == ll::Version::Status::Release) { versionStatusValue = 0; - } else if (LITELOADER_VERSION_STATUS == LL::Version::Status::Beta) { + } else if (LITELOADER_VERSION_STATUS == ll::Version::Status::Beta) { versionStatusValue = 1; - } else if (LITELOADER_VERSION_STATUS == LL::Version::Status::Dev) { + } else if (LITELOADER_VERSION_STATUS == ll::Version::Status::Dev) { versionStatusValue = 2; } @@ -169,9 +169,9 @@ Local LlClass::version(const Arguments& args) { ver.set("major", LITELOADER_VERSION_MAJOR); ver.set("minor", LITELOADER_VERSION_MINOR); ver.set("revision", LITELOADER_VERSION_REVISION); - ver.set("isBeta", LITELOADER_VERSION_STATUS == LL::Version::Status::Beta); - ver.set("isRelease", LITELOADER_VERSION_STATUS == LL::Version::Status::Release); - ver.set("isDev", LITELOADER_VERSION_STATUS == LL::Version::Status::Dev); + ver.set("isBeta", LITELOADER_VERSION_STATUS == ll::Version::Status::Beta); + ver.set("isRelease", LITELOADER_VERSION_STATUS == ll::Version::Status::Release); + ver.set("isDev", LITELOADER_VERSION_STATUS == ll::Version::Status::Dev); return ver; } CATCH("Fail in LLSEGetVersion!") @@ -179,21 +179,21 @@ Local LlClass::version(const Arguments& args) { Local LlClass::getLanguage() { try { - return String::newString(PluginOwnData::getImpl(LL::getLoaderHandle(), I18nBase::POD_KEY).defaultLocaleName); + return String::newString(PluginOwnData::getImpl(ll::getLoaderHandle(), I18nBase::POD_KEY).defaultLocaleName); } CATCH("Fail in LLSEGetLanguage") } Local LlClass::isDebugMode(const Arguments& args) { try { - return Boolean::newBoolean(LL::isDebugMode()); + return Boolean::newBoolean(ll::isDebugMode()); } CATCH("Fail in LLSEGetIsDebugMode") } Local LlClass::versionString(const Arguments& args) { try { - return String::newString(LL::getLoaderVersionString()); + return String::newString(ll::getLoaderVersionString()); } CATCH("Fail in LLSEGetVersionString!") } diff --git a/ScriptEngine/API/LlAPI.h b/ScriptEngine/src/api/LlAPI.h similarity index 100% rename from ScriptEngine/API/LlAPI.h rename to ScriptEngine/src/api/LlAPI.h diff --git a/ScriptEngine/API/LoggerAPI.cpp b/ScriptEngine/src/api/LoggerAPI.cpp similarity index 98% rename from ScriptEngine/API/LoggerAPI.cpp rename to ScriptEngine/src/api/LoggerAPI.cpp index aa3d2fa..5b10f1b 100644 --- a/ScriptEngine/API/LoggerAPI.cpp +++ b/ScriptEngine/src/api/LoggerAPI.cpp @@ -1,13 +1,13 @@ #include "APIHelp.h" #include "LoggerAPI.h" #include "PlayerAPI.h" -#include +#include #include #include #include #include -#include -#include +#include +#include using namespace std; diff --git a/ScriptEngine/API/LoggerAPI.h b/ScriptEngine/src/api/LoggerAPI.h similarity index 100% rename from ScriptEngine/API/LoggerAPI.h rename to ScriptEngine/src/api/LoggerAPI.h diff --git a/ScriptEngine/API/McAPI.cpp b/ScriptEngine/src/api/McAPI.cpp similarity index 100% rename from ScriptEngine/API/McAPI.cpp rename to ScriptEngine/src/api/McAPI.cpp diff --git a/ScriptEngine/API/McAPI.h b/ScriptEngine/src/api/McAPI.h similarity index 100% rename from ScriptEngine/API/McAPI.h rename to ScriptEngine/src/api/McAPI.h diff --git a/ScriptEngine/API/NativeAPI.cpp b/ScriptEngine/src/api/NativeAPI.cpp similarity index 99% rename from ScriptEngine/API/NativeAPI.cpp rename to ScriptEngine/src/api/NativeAPI.cpp index 2279256..ec7489f 100644 --- a/ScriptEngine/API/NativeAPI.cpp +++ b/ScriptEngine/src/api/NativeAPI.cpp @@ -1,8 +1,8 @@ #include "NativeAPI.h" -#include +#include #include -#include "../Tools/Demangler/include/MicrosoftDemangle.h" +#include Concurrency::concurrent_unordered_map NativeFunction::parsedSymbol; diff --git a/ScriptEngine/API/NativeAPI.h b/ScriptEngine/src/api/NativeAPI.h similarity index 100% rename from ScriptEngine/API/NativeAPI.h rename to ScriptEngine/src/api/NativeAPI.h diff --git a/ScriptEngine/API/NativePatch.cpp b/ScriptEngine/src/api/NativePatch.cpp similarity index 96% rename from ScriptEngine/API/NativePatch.cpp rename to ScriptEngine/src/api/NativePatch.cpp index d9437e6..64e978e 100644 --- a/ScriptEngine/API/NativePatch.cpp +++ b/ScriptEngine/src/api/NativePatch.cpp @@ -1,7 +1,7 @@ #include "NativeAPI.h" -#include -#include +#include +#include Local NativePatch::search(const Arguments& args) { CHECK_ARGS_COUNT(args, 1); diff --git a/ScriptEngine/API/NativePointer.cpp b/ScriptEngine/src/api/NativePointer.cpp similarity index 99% rename from ScriptEngine/API/NativePointer.cpp rename to ScriptEngine/src/api/NativePointer.cpp index f8dab41..20fe3cf 100644 --- a/ScriptEngine/API/NativePointer.cpp +++ b/ScriptEngine/src/api/NativePointer.cpp @@ -1,7 +1,7 @@ #include "APIHelp.h" #include "NativeAPI.h" #include "NativeStdString.h" -#include +#include //////////////////// NativePointer //////////////////// ClassDefine diff --git a/ScriptEngine/API/NativeStdString.cpp b/ScriptEngine/src/api/NativeStdString.cpp similarity index 100% rename from ScriptEngine/API/NativeStdString.cpp rename to ScriptEngine/src/api/NativeStdString.cpp diff --git a/ScriptEngine/API/NativeStdString.h b/ScriptEngine/src/api/NativeStdString.h similarity index 100% rename from ScriptEngine/API/NativeStdString.h rename to ScriptEngine/src/api/NativeStdString.h diff --git a/ScriptEngine/API/NbtAPI.cpp b/ScriptEngine/src/api/NbtAPI.cpp similarity index 99% rename from ScriptEngine/API/NbtAPI.cpp rename to ScriptEngine/src/api/NbtAPI.cpp index 5f16348..ba0c540 100644 --- a/ScriptEngine/API/NbtAPI.cpp +++ b/ScriptEngine/src/api/NbtAPI.cpp @@ -4,17 +4,17 @@ #include #include "ItemAPI.h" #include "BlockAPI.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; diff --git a/ScriptEngine/API/NbtAPI.h b/ScriptEngine/src/api/NbtAPI.h similarity index 96% rename from ScriptEngine/API/NbtAPI.h rename to ScriptEngine/src/api/NbtAPI.h index 05d70cc..0307916 100644 --- a/ScriptEngine/API/NbtAPI.h +++ b/ScriptEngine/src/api/NbtAPI.h @@ -1,17 +1,17 @@ #pragma once #include "APIHelp.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern struct Tag; diff --git a/ScriptEngine/API/NetworkAPI.cpp b/ScriptEngine/src/api/NetworkAPI.cpp similarity index 95% rename from ScriptEngine/API/NetworkAPI.cpp rename to ScriptEngine/src/api/NetworkAPI.cpp index 8404da2..58b5fd9 100644 --- a/ScriptEngine/API/NetworkAPI.cpp +++ b/ScriptEngine/src/api/NetworkAPI.cpp @@ -1,15 +1,14 @@ #include "APIHelp.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "NetworkAPI.h" -#include +#include
#include #include -#include -#include +#include +#include using namespace std; using namespace cyanray; @@ -154,10 +153,10 @@ void WSClientClass::initListeners() { void WSClientClass::initListeners_s() { ws->OnTextReceived([nowList{&listeners[int(WSClientEvents::onTextReceived)]}, engine = EngineScope::currentEngine()](WebSocketClient& client, string msg) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; Schedule::nextTick([nowList, engine, msg = std::move(msg)]() { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); if (!nowList->empty()) @@ -168,10 +167,10 @@ void WSClientClass::initListeners_s() { }); ws->OnBinaryReceived([nowList{&listeners[int(WSClientEvents::onBinaryReceived)]}, engine = EngineScope::currentEngine()](WebSocketClient& client, vector data) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; Schedule::nextTick([nowList, engine, data = std::move(data)]() mutable { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); if (!nowList->empty()) @@ -182,10 +181,10 @@ void WSClientClass::initListeners_s() { }); ws->OnError([nowList{&listeners[int(WSClientEvents::onError)]}, engine = EngineScope::currentEngine()](WebSocketClient& client, string msg) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; Schedule::nextTick([nowList, engine, msg = std::move(msg)]() { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); if (!nowList->empty()) @@ -196,10 +195,10 @@ void WSClientClass::initListeners_s() { }); ws->OnLostConnection([nowList{&listeners[int(WSClientEvents::onLostConnection)]}, engine = EngineScope::currentEngine()](WebSocketClient& client, int code) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; Schedule::nextTick([nowList, engine, code]() { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); if (!nowList->empty()) @@ -278,7 +277,7 @@ Local WSClientClass::connectAsync(const Arguments& args) { #ifdef DEBUG SetThreadDescription(GetCurrentThread(), L"LLSE Connect WebSocket"); #endif // DEBUG - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { bool result = false; @@ -288,7 +287,7 @@ Local WSClientClass::connectAsync(const Arguments& args) { } catch (const std::runtime_error& e) { result = false; } - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); // fix get on empty Global @@ -382,10 +381,10 @@ using namespace httplib; #define ADD_CALLBACK(method, path, func) \ callbacks.emplace(make_pair(path, HttpServerCallback{EngineScope::currentEngine(), script::Global{func}, HttpRequestType::method, path})); \ svr->##method##(path.c_str(), [this, engine = EngineScope::currentEngine()](const Request& req, Response& resp) { \ - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) \ + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) \ return; \ auto task = Schedule::nextTick([this, engine, req, &resp] { \ - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) \ + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) \ return; \ EngineScope enter(engine); \ for (auto& [k, v] : this->callbacks) { \ @@ -437,10 +436,10 @@ Local HttpServerClass::onGet(const Arguments& args) { /* for debug callbacks.emplace(make_pair(path, HttpServerCallback{EngineScope::currentEngine(), script::Global{func}, HttpRequestType::Get, path})); svr->Get(path.c_str(), [this, engine = EngineScope::currentEngine()](const Request& req, Response& resp) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; auto task = Schedule::nextTick([this, engine, req, &resp] { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); for (auto& [k, v] : this->callbacks) @@ -548,11 +547,11 @@ Local HttpServerClass::onPreRouting(const Arguments& args) { try { preRoutingCallback = {EngineScope::currentEngine(), script::Global{args[0].asFunction()}}; svr->set_pre_routing_handler([this, engine = EngineScope::currentEngine()](const Request& req, Response& resp) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return Server::HandlerResponse::Unhandled; bool handled = false; auto task = Schedule::nextTick([this, engine, req, &resp, &handled] { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); auto reqObj = new HttpRequestClass(req); @@ -579,10 +578,10 @@ Local HttpServerClass::onPostRouting(const Arguments& args) { try { postRoutingCallback = {EngineScope::currentEngine(), script::Global{args[0].asFunction()}}; svr->set_post_routing_handler([this, engine = EngineScope::currentEngine()](const Request& req, Response& resp) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; auto task = Schedule::nextTick([this, engine, req, &resp] { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); auto reqObj = new HttpRequestClass(req); @@ -605,10 +604,10 @@ Local HttpServerClass::onError(const Arguments& args) { try { errorCallback = {EngineScope::currentEngine(), script::Global{args[0].asFunction()}}; svr->set_error_handler([this, engine = EngineScope::currentEngine()](const Request& req, Response& resp) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; auto task = Schedule::nextTick([this, engine, req, &resp] { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); auto reqObj = new HttpRequestClass(req); @@ -631,10 +630,10 @@ Local HttpServerClass::onException(const Arguments& args) { try { exceptionCallback = {EngineScope::currentEngine(), script::Global{args[0].asFunction()}}; svr->set_exception_handler([this, engine = EngineScope::currentEngine()](const Request& req, Response& resp, std::exception_ptr e) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; auto task = Schedule::nextTick([this, engine, req, &resp, e] { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope enter(engine); auto reqObj = new HttpRequestClass(req); @@ -1010,7 +1009,7 @@ Local NetworkClass::httpGet(const Arguments& args) { script::Global callbackFunc{args[args.size() - 1].asFunction()}; auto lambda = [callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](int status, string body) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope scope(engine); @@ -1056,7 +1055,7 @@ Local NetworkClass::httpPost(const Arguments& args) { script::Global callbackFunc{args[args.size() - 1].asFunction()}; auto lambda = [callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](int status, string body) { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return; EngineScope scope(engine); diff --git a/ScriptEngine/API/NetworkAPI.h b/ScriptEngine/src/api/NetworkAPI.h similarity index 96% rename from ScriptEngine/API/NetworkAPI.h rename to ScriptEngine/src/api/NetworkAPI.h index 9b9d02a..17877b5 100644 --- a/ScriptEngine/API/NetworkAPI.h +++ b/ScriptEngine/src/api/NetworkAPI.h @@ -2,8 +2,8 @@ #include "APIHelp.h" #include -#include -#include +#include +#include using namespace cyanray; //////////////////// Types //////////////////// diff --git a/ScriptEngine/API/PacketAPI.cpp b/ScriptEngine/src/api/PacketAPI.cpp similarity index 99% rename from ScriptEngine/API/PacketAPI.cpp rename to ScriptEngine/src/api/PacketAPI.cpp index 7b2d5a1..7853b11 100644 --- a/ScriptEngine/API/PacketAPI.cpp +++ b/ScriptEngine/src/api/PacketAPI.cpp @@ -7,9 +7,9 @@ #include "BlockEntityAPI.h" #include "NbtAPI.h" #include "NativeAPI.h" -#include +#include #include "PacketAPI.h" -#include +#include //////////////////// Class Definition //////////////////// diff --git a/ScriptEngine/API/PacketAPI.h b/ScriptEngine/src/api/PacketAPI.h similarity index 93% rename from ScriptEngine/API/PacketAPI.h rename to ScriptEngine/src/api/PacketAPI.h index 262baa2..978e43b 100644 --- a/ScriptEngine/API/PacketAPI.h +++ b/ScriptEngine/src/api/PacketAPI.h @@ -1,9 +1,9 @@ #pragma once #include "APIHelp.h" -#include -#include +#include +#include
#include -#include +#include //////////////////// Classes //////////////////// diff --git a/ScriptEngine/API/ParticleAPI.cpp b/ScriptEngine/src/api/ParticleAPI.cpp similarity index 100% rename from ScriptEngine/API/ParticleAPI.cpp rename to ScriptEngine/src/api/ParticleAPI.cpp diff --git a/ScriptEngine/API/ParticleAPI.h b/ScriptEngine/src/api/ParticleAPI.h similarity index 92% rename from ScriptEngine/API/ParticleAPI.h rename to ScriptEngine/src/api/ParticleAPI.h index bbbe8d4..b72dfcd 100644 --- a/ScriptEngine/API/ParticleAPI.h +++ b/ScriptEngine/src/api/ParticleAPI.h @@ -3,8 +3,8 @@ // #pragma once #include "APIHelp.h" -#include -#include "../../LiteLoader/Header/ParticleAPI.h" +#include
+#include class ParticleSpawner : public ParticleCUI, public ScriptClass { public: diff --git a/ScriptEngine/API/PermissionAPI.cpp b/ScriptEngine/src/api/PermissionAPI.cpp similarity index 100% rename from ScriptEngine/API/PermissionAPI.cpp rename to ScriptEngine/src/api/PermissionAPI.cpp diff --git a/ScriptEngine/API/PermissionAPI.h b/ScriptEngine/src/api/PermissionAPI.h similarity index 96% rename from ScriptEngine/API/PermissionAPI.h rename to ScriptEngine/src/api/PermissionAPI.h index 0927289..d82d64a 100644 --- a/ScriptEngine/API/PermissionAPI.h +++ b/ScriptEngine/src/api/PermissionAPI.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "APIHelp.h" class RoleClass : public ScriptClass { diff --git a/ScriptEngine/API/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp similarity index 99% rename from ScriptEngine/API/PlayerAPI.cpp rename to ScriptEngine/src/api/PlayerAPI.cpp index 50a8b20..5130ee8 100644 --- a/ScriptEngine/API/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -11,21 +11,21 @@ #include "NbtAPI.h" #include "PacketAPI.h" #include "NativeAPI.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include
#include #include #include @@ -1752,7 +1752,7 @@ Local PlayerClass::sendSimpleForm(const Arguments& args) { player->sendSimpleFormPacket(args[0].toStr(), args[1].toStr(), texts, images, [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](int chosen) { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -1790,7 +1790,7 @@ Local PlayerClass::sendModalForm(const Arguments& args) { player->sendModalFormPacket(args[0].toStr(), args[1].toStr(), args[2].toStr(), args[3].toStr(), [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](bool chosen) { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -1827,7 +1827,7 @@ Local PlayerClass::sendCustomForm(const Arguments& args) { player->sendCustomFormPacket(data, [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[1].asFunction())}](string result) { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; diff --git a/ScriptEngine/API/PlayerAPI.h b/ScriptEngine/src/api/PlayerAPI.h similarity index 82% rename from ScriptEngine/API/PlayerAPI.h rename to ScriptEngine/src/api/PlayerAPI.h index cde8ee9..39070ac 100644 --- a/ScriptEngine/API/PlayerAPI.h +++ b/ScriptEngine/src/api/PlayerAPI.h @@ -158,29 +158,6 @@ public: //Local isSimulatedPlayer(const Arguments& args); // Local quickEvalMolangScript(const Arguments& args); - // SimulatedPlayer API (API/SimulatedPlayerAPI.cpp) - -// Local simulateSneak(const Arguments& args); -// Local simulateAttack(const Arguments& args); -// Local simulateDestroy(const Arguments& args); -// Local simulateDisconnect(const Arguments& args); -// Local simulateInteract(const Arguments& args); -// Local simulateJump(const Arguments& args); -// Local simulateLocalMove(const Arguments& args); -// Local simulateWorldMove(const Arguments& args); -// Local simulateMoveTo(const Arguments& args); -// Local simulateLookAt(const Arguments& args); -// Local simulateSetBodyRotation(const Arguments& args); -// Local simulateNavigateTo(const Arguments& args); -// Local simulateUseItem(const Arguments& args); -// Local simulateStopDestroyingBlock(const Arguments& args); -// Local simulateStopInteracting(const Arguments& args); -// Local simulateStopMoving(const Arguments& args); -// Local simulateStopUsingItem(const Arguments& args); -// Local simulateStopSneaking(const Arguments& args); - - // bool simulateSetItem(class ItemStack&, bool, int); - // bool simulateGiveItem(class ItemStack&, bool); // For Compatibility Local getIP(); diff --git a/ScriptEngine/API/RemoteCallAPI.cpp b/ScriptEngine/src/api/RemoteCallAPI.cpp similarity index 97% rename from ScriptEngine/API/RemoteCallAPI.cpp rename to ScriptEngine/src/api/RemoteCallAPI.cpp index b6adb81..ef3576d 100644 --- a/ScriptEngine/API/RemoteCallAPI.cpp +++ b/ScriptEngine/src/api/RemoteCallAPI.cpp @@ -1,5 +1,5 @@ #include "RemoteCallAPI.h" -#include +#include #include "PlayerAPI.h" #include "EntityAPI.h" #include "ItemAPI.h" @@ -8,16 +8,16 @@ #include "BaseAPI.h" #include "ContainerAPI.h" #include "NbtAPI.h" -#include -#include -#include -#include -#include +#include "APIHelp.h" +#include "LlAPI.h" +#include +#include +#include #include #include #include #include -#include +#include
using namespace std; @@ -233,7 +233,7 @@ bool LLSEExportFunc(ScriptEngine* engine, const Local& func, const str // script::Global callback = script::Global(func); std::string identifier = nameSpace + "::" + funcName; RemoteCall::CallbackFn cb = [engine, identifier /*, scriptCallback = std::move(callback)*/](std::vector params) -> RemoteCall::ValueType { - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return ""; EngineScope enter(engine); try { diff --git a/ScriptEngine/API/RemoteCallAPI.h b/ScriptEngine/src/api/RemoteCallAPI.h similarity index 100% rename from ScriptEngine/API/RemoteCallAPI.h rename to ScriptEngine/src/api/RemoteCallAPI.h diff --git a/ScriptEngine/API/ScoreboardAPI.cpp b/ScriptEngine/src/api/ScoreboardAPI.cpp similarity index 98% rename from ScriptEngine/API/ScoreboardAPI.cpp rename to ScriptEngine/src/api/ScoreboardAPI.cpp index 0e62203..0e43694 100644 --- a/ScriptEngine/API/ScoreboardAPI.cpp +++ b/ScriptEngine/src/api/ScoreboardAPI.cpp @@ -1,7 +1,7 @@ #include "APIHelp.h" -#include -#include -#include +#include +#include +#include #include "ScoreboardAPI.h" #include "McAPI.h" #include "PlayerAPI.h" diff --git a/ScriptEngine/API/ScoreboardAPI.h b/ScriptEngine/src/api/ScoreboardAPI.h similarity index 100% rename from ScriptEngine/API/ScoreboardAPI.h rename to ScriptEngine/src/api/ScoreboardAPI.h diff --git a/ScriptEngine/API/ScriptAPI.cpp b/ScriptEngine/src/api/ScriptAPI.cpp similarity index 96% rename from ScriptEngine/API/ScriptAPI.cpp rename to ScriptEngine/src/api/ScriptAPI.cpp index 72cafb1..fa1b7d9 100644 --- a/ScriptEngine/API/ScriptAPI.cpp +++ b/ScriptEngine/src/api/ScriptAPI.cpp @@ -1,9 +1,9 @@ #include "ScriptAPI.h" #include "APIHelp.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -85,7 +85,7 @@ Local ColorLog(const Arguments& args) { LOG_ERROR_WITH_SCRIPT_INFO("Invalid color!"); break; } - // if (!LL::globalConfig.colorLog) + // if (!ll::globalConfig.colorLog) // prefix = ""; auto& infoOut = ENGINE_OWN_DATA()->logger.info; infoOut << prefix; diff --git a/ScriptEngine/API/ScriptAPI.h b/ScriptEngine/src/api/ScriptAPI.h similarity index 100% rename from ScriptEngine/API/ScriptAPI.h rename to ScriptEngine/src/api/ScriptAPI.h diff --git a/ScriptEngine/API/ServerAPI.cpp b/ScriptEngine/src/api/ServerAPI.cpp similarity index 83% rename from ScriptEngine/API/ServerAPI.cpp rename to ScriptEngine/src/api/ServerAPI.cpp index 8adcf36..249e7ce 100644 --- a/ScriptEngine/API/ServerAPI.cpp +++ b/ScriptEngine/src/api/ServerAPI.cpp @@ -1,24 +1,24 @@ #include "APIHelp.h" #include "APIHelp.h" #include "ServerAPI.h" -#include +#include #include "McAPI.h" -#include -#include +#include +#include
Local McClass::setMotd(const Arguments& args) { CHECK_ARGS_COUNT(args, 1) CHECK_ARG_TYPE(args[0], ValueKind::kString) try { - return Boolean::newBoolean(LL::setServerMotd(args[0].asString().toString())); + return Boolean::newBoolean(ll::setServerMotd(args[0].asString().toString())); } CATCH("Fail in SetServerMotd!") } Local McClass::crashBDS(const Arguments& args) //===========??? { - if (LL::isDebugMode()) { + if (ll::isDebugMode()) { RecordOperation(ENGINE_OWN_DATA()->pluginName, "Crash Server", "Execute mc.crash() to crash server."); throw; return Boolean::newBoolean(true); diff --git a/ScriptEngine/API/ServerAPI.h b/ScriptEngine/src/api/ServerAPI.h similarity index 100% rename from ScriptEngine/API/ServerAPI.h rename to ScriptEngine/src/api/ServerAPI.h diff --git a/ScriptEngine/API/StructureAPI.cpp b/ScriptEngine/src/api/StructureAPI.cpp similarity index 95% rename from ScriptEngine/API/StructureAPI.cpp rename to ScriptEngine/src/api/StructureAPI.cpp index ba7f782..eee55e8 100644 --- a/ScriptEngine/API/StructureAPI.cpp +++ b/ScriptEngine/src/api/StructureAPI.cpp @@ -2,10 +2,10 @@ #include "BaseAPI.h" #include "McAPI.h" #include "NbtAPI.h" -#include -#include -#include -#include +#include +#include +#include +#include Local McClass::getStructure(const Arguments& args) { CHECK_ARGS_COUNT(args, 2); diff --git a/ScriptEngine/API/SystemAPI.cpp b/ScriptEngine/src/api/SystemAPI.cpp similarity index 94% rename from ScriptEngine/API/SystemAPI.cpp rename to ScriptEngine/src/api/SystemAPI.cpp index 9a0753a..910c19d 100644 --- a/ScriptEngine/API/SystemAPI.cpp +++ b/ScriptEngine/src/api/SystemAPI.cpp @@ -1,12 +1,12 @@ #include "SystemAPI.h" #include "APIHelp.h" -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include
+#include using namespace std::filesystem; @@ -40,7 +40,7 @@ Local SystemClass::cmd(const Arguments& args) { [callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](int exitCode, string output) { Schedule::nextTick( [engine, callback = std::move(callback), exitCode, output = std::move(output)]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -75,7 +75,7 @@ Local SystemClass::newProcess(const Arguments& args) { [callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](int exitCode, string output) { Schedule::nextTick( [engine, callback = std::move(callback), exitCode, output = std::move(output)]() { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; diff --git a/ScriptEngine/API/SystemAPI.h b/ScriptEngine/src/api/SystemAPI.h similarity index 100% rename from ScriptEngine/API/SystemAPI.h rename to ScriptEngine/src/api/SystemAPI.h diff --git a/ScriptEngine/Engine/EngineManager.cpp b/ScriptEngine/src/engine/EngineManager.cpp similarity index 97% rename from ScriptEngine/Engine/EngineManager.cpp rename to ScriptEngine/src/engine/EngineManager.cpp index 8e23ea4..71ab5fb 100644 --- a/ScriptEngine/Engine/EngineManager.cpp +++ b/ScriptEngine/src/engine/EngineManager.cpp @@ -1,8 +1,8 @@ #include "EngineManager.h" #include "EngineOwnData.h" #include "GlobalShareData.h" -#include -#include +#include
+#include #include using namespace std; using namespace script; diff --git a/ScriptEngine/Engine/EngineManager.h b/ScriptEngine/src/engine/EngineManager.h similarity index 91% rename from ScriptEngine/Engine/EngineManager.h rename to ScriptEngine/src/engine/EngineManager.h index 1b66b9d..e851114 100644 --- a/ScriptEngine/Engine/EngineManager.h +++ b/ScriptEngine/src/engine/EngineManager.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "ScriptX/ScriptX.h" +#include
#include #include #include diff --git a/ScriptEngine/Engine/EngineOwnData.h b/ScriptEngine/src/engine/EngineOwnData.h similarity index 94% rename from ScriptEngine/Engine/EngineOwnData.h rename to ScriptEngine/src/engine/EngineOwnData.h index 974f15b..f399518 100644 --- a/ScriptEngine/Engine/EngineOwnData.h +++ b/ScriptEngine/src/engine/EngineOwnData.h @@ -1,13 +1,13 @@ #pragma once -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include struct FormCallbackData { script::ScriptEngine* engine; diff --git a/ScriptEngine/Engine/GlobalShareData.cpp b/ScriptEngine/src/engine/GlobalShareData.cpp similarity index 93% rename from ScriptEngine/Engine/GlobalShareData.cpp rename to ScriptEngine/src/engine/GlobalShareData.cpp index ae1cb8f..a15c349 100644 --- a/ScriptEngine/Engine/GlobalShareData.cpp +++ b/ScriptEngine/src/engine/GlobalShareData.cpp @@ -1,11 +1,11 @@ -#include -#include +#include +#include "GlobalShareData.h" #include #include #include #include #include -#include +#include
#include "LocalShareData.h" using namespace std; diff --git a/ScriptEngine/Engine/GlobalShareData.h b/ScriptEngine/src/engine/GlobalShareData.h similarity index 94% rename from ScriptEngine/Engine/GlobalShareData.h rename to ScriptEngine/src/engine/GlobalShareData.h index 11229c5..2e46619 100644 --- a/ScriptEngine/Engine/GlobalShareData.h +++ b/ScriptEngine/src/engine/GlobalShareData.h @@ -1,11 +1,11 @@ -#include +#include #include "EngineManager.h" #include #include #include #include #include -#include +#include //////////////////// Structs //////////////////// diff --git a/ScriptEngine/Engine/LocalShareData.cpp b/ScriptEngine/src/engine/LocalShareData.cpp similarity index 93% rename from ScriptEngine/Engine/LocalShareData.cpp rename to ScriptEngine/src/engine/LocalShareData.cpp index 1676f5f..221c14d 100644 --- a/ScriptEngine/Engine/LocalShareData.cpp +++ b/ScriptEngine/src/engine/LocalShareData.cpp @@ -1,5 +1,5 @@ #include "LocalShareData.h" -#include +#include
#include #include diff --git a/ScriptEngine/Engine/LocalShareData.h b/ScriptEngine/src/engine/LocalShareData.h similarity index 93% rename from ScriptEngine/Engine/LocalShareData.h rename to ScriptEngine/src/engine/LocalShareData.h index 4b2ba14..22db198 100644 --- a/ScriptEngine/Engine/LocalShareData.h +++ b/ScriptEngine/src/engine/LocalShareData.h @@ -1,8 +1,8 @@ #pragma once -#include +#include #include #include -#include +#include #include diff --git a/ScriptEngine/Engine/MessageSystem.cpp b/ScriptEngine/src/engine/MessageSystem.cpp similarity index 97% rename from ScriptEngine/Engine/MessageSystem.cpp rename to ScriptEngine/src/engine/MessageSystem.cpp index 313c002..55eff68 100644 --- a/ScriptEngine/Engine/MessageSystem.cpp +++ b/ScriptEngine/src/engine/MessageSystem.cpp @@ -1,14 +1,14 @@ #include "MessageSystem.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "LocalShareData.h" #include "GlobalShareData.h" #include #include #include -#include +#include using namespace std; using namespace script; @@ -315,16 +315,16 @@ void InitMessageSystem() { SetThreadDescription(GetCurrentThread(), L"LLSE MessageSystem " _CRT_WIDE(LLSE_MODULE_TYPE)); #endif // DEBUG // Set global SEH-Exception handler - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); globalShareData->messageThreads[LLSE_BACKEND_TYPE] = GetCurrentThread(); while (true) { MessageSystemLoopOnce(); - if (LL::getServerStatus() >= LL::ServerStatus::Stopping) + if (ll::getServerStatus() >= ll::ServerStatus::Stopping) return; SleepEx(5, true); - if (LL::getServerStatus() >= LL::ServerStatus::Stopping) + if (ll::getServerStatus() >= ll::ServerStatus::Stopping) return; } }).detach(); diff --git a/ScriptEngine/Engine/MessageSystem.h b/ScriptEngine/src/engine/MessageSystem.h similarity index 97% rename from ScriptEngine/Engine/MessageSystem.h rename to ScriptEngine/src/engine/MessageSystem.h index 43c1a07..cb59190 100644 --- a/ScriptEngine/Engine/MessageSystem.h +++ b/ScriptEngine/src/engine/MessageSystem.h @@ -1,7 +1,8 @@ #pragma once + #include #include -#include +#include #include "OperationCount.h" #include #include diff --git a/ScriptEngine/Engine/OperationCount.cpp b/ScriptEngine/src/engine/OperationCount.cpp similarity index 96% rename from ScriptEngine/Engine/OperationCount.cpp rename to ScriptEngine/src/engine/OperationCount.cpp index fb44d34..e0c860b 100644 --- a/ScriptEngine/Engine/OperationCount.cpp +++ b/ScriptEngine/src/engine/OperationCount.cpp @@ -1,7 +1,7 @@ #include "GlobalShareData.h" #include "OperationCount.h" -#include -#include +#include
+#include
#include OperationCount::OperationCount(const string& name) diff --git a/ScriptEngine/Engine/OperationCount.h b/ScriptEngine/src/engine/OperationCount.h similarity index 100% rename from ScriptEngine/Engine/OperationCount.h rename to ScriptEngine/src/engine/OperationCount.h diff --git a/ScriptEngine/Engine/RemoteCall.cpp b/ScriptEngine/src/engine/RemoteCall.cpp similarity index 95% rename from ScriptEngine/Engine/RemoteCall.cpp rename to ScriptEngine/src/engine/RemoteCall.cpp index 8a02c33..03bc37f 100644 --- a/ScriptEngine/Engine/RemoteCall.cpp +++ b/ScriptEngine/src/engine/RemoteCall.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include "RemoteCall.h" +#include "GlobalShareData.h" +#include "MessageSystem.h" +#include #include #include #include #include -#include +#include
using namespace std; @@ -129,7 +129,7 @@ bool LLSEExportFunc(ScriptEngine *engine, const Local &func, const str return ""; } auto engine = data->second.engine; - if (LL::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) + if (ll::isServerStopping() || !EngineManager::isValid(engine) || engine->isDestroying()) return ""; EngineScope enter(data->second.engine); std::vector> scriptParams; diff --git a/ScriptEngine/Engine/RemoteCall.h b/ScriptEngine/src/engine/RemoteCall.h similarity index 81% rename from ScriptEngine/Engine/RemoteCall.h rename to ScriptEngine/src/engine/RemoteCall.h index 2ea6bf5..08b41a4 100644 --- a/ScriptEngine/Engine/RemoteCall.h +++ b/ScriptEngine/src/engine/RemoteCall.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include //////////////////// Funcs //////////////////// diff --git a/ScriptEngine/Engine/TimeTaskSystem.cpp b/ScriptEngine/src/engine/TimeTaskSystem.cpp similarity index 96% rename from ScriptEngine/Engine/TimeTaskSystem.cpp rename to ScriptEngine/src/engine/TimeTaskSystem.cpp index 55e7d65..7fe2957 100644 --- a/ScriptEngine/Engine/TimeTaskSystem.cpp +++ b/ScriptEngine/src/engine/TimeTaskSystem.cpp @@ -1,10 +1,10 @@ -#include +#include #include "TimeTaskSystem.h" #include "MessageSystem.h" -#include -#include -#include -#include +#include "EngineOwnData.h" +#include "EngineManager.h" +#include +#include #include #include using namespace std; @@ -65,7 +65,7 @@ std::unordered_map timeTaskMap; // } // Schedule::delay( // [engine, func = std::move(func), paras = std::move(tmp)]() { -// if (LL::isServerStopping()) +// if (ll::isServerStopping()) // return; // if (!EngineManager::isValid(engine)) // return; @@ -100,7 +100,7 @@ int NewTimeout(Local func, vector> paras, int timeout) { data.task = Schedule::delay( [engine{EngineScope::currentEngine()}, id{tid}]() { try { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -150,7 +150,7 @@ int NewTimeout(Local func, int timeout) { data.task = Schedule::delay( [engine{EngineScope::currentEngine()}, id{tid}]() { try { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) return; @@ -192,7 +192,7 @@ int NewInterval(Local func, vector> paras, int timeout) { data.task = Schedule::repeat( [engine{EngineScope::currentEngine()}, id{tid}]() { try { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) { ClearTimeTask(id); @@ -248,7 +248,7 @@ int NewInterval(Local func, int timeout) { data.task = Schedule::repeat( [engine{EngineScope::currentEngine()}, id{tid}]() { try { - if (LL::isServerStopping()) + if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) { ClearTimeTask(id); diff --git a/ScriptEngine/Engine/TimeTaskSystem.h b/ScriptEngine/src/engine/TimeTaskSystem.h similarity index 89% rename from ScriptEngine/Engine/TimeTaskSystem.h rename to ScriptEngine/src/engine/TimeTaskSystem.h index fed4a1a..a0c09bd 100644 --- a/ScriptEngine/Engine/TimeTaskSystem.h +++ b/ScriptEngine/src/engine/TimeTaskSystem.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include "MessageSystem.h" diff --git a/ScriptEngine/Main/BindAPIs.cpp b/ScriptEngine/src/main/BindAPIs.cpp similarity index 84% rename from ScriptEngine/Main/BindAPIs.cpp rename to ScriptEngine/src/main/BindAPIs.cpp index 9588d8f..2e83bb6 100644 --- a/ScriptEngine/Main/BindAPIs.cpp +++ b/ScriptEngine/src/main/BindAPIs.cpp @@ -1,35 +1,35 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void BindAPIs(ScriptEngine* engine) { diff --git a/ScriptEngine/Main/BuiltinCommands.cpp b/ScriptEngine/src/main/BuiltinCommands.cpp similarity index 94% rename from ScriptEngine/Main/BuiltinCommands.cpp rename to ScriptEngine/src/main/BuiltinCommands.cpp index 2b2995e..86354c5 100644 --- a/ScriptEngine/Main/BuiltinCommands.cpp +++ b/ScriptEngine/src/main/BuiltinCommands.cpp @@ -1,8 +1,8 @@ #include "BuiltinCommands.h" -#include -#include +#include +#include #include -#include +#include using namespace std; extern Logger logger; diff --git a/ScriptEngine/Main/BuiltinCommands.h b/ScriptEngine/src/main/BuiltinCommands.h similarity index 100% rename from ScriptEngine/Main/BuiltinCommands.h rename to ScriptEngine/src/main/BuiltinCommands.h diff --git a/ScriptEngine/Main/Configs.h b/ScriptEngine/src/main/Configs.h similarity index 100% rename from ScriptEngine/Main/Configs.h rename to ScriptEngine/src/main/Configs.h diff --git a/ScriptEngine/Main/EconomicSystem.h b/ScriptEngine/src/main/EconomicSystem.h similarity index 100% rename from ScriptEngine/Main/EconomicSystem.h rename to ScriptEngine/src/main/EconomicSystem.h diff --git a/ScriptEngine/Main/EconomySystem.cpp b/ScriptEngine/src/main/EconomySystem.cpp similarity index 97% rename from ScriptEngine/Main/EconomySystem.cpp rename to ScriptEngine/src/main/EconomySystem.cpp index 29fc8a4..5187578 100644 --- a/ScriptEngine/Main/EconomySystem.cpp +++ b/ScriptEngine/src/main/EconomySystem.cpp @@ -1,8 +1,8 @@ -#include +#include #include "EconomicSystem.h" -#include "API/EventAPI.h" -#include -#include +#include +#include +#include #include Logger economicLogger("EconomicSystem"); @@ -39,7 +39,7 @@ struct dynamicSymbolsMap_type bool EconomySystem::init() { - auto llmoney = LL::getPlugin("LLMoney"); + auto llmoney = ll::getPlugin("LLMoney"); if (!llmoney) { if (localShareData->isFirstInstance) { diff --git a/ScriptEngine/Main/Global.cpp b/ScriptEngine/src/main/Global.cpp similarity index 79% rename from ScriptEngine/Main/Global.cpp rename to ScriptEngine/src/main/Global.cpp index e3a711d..b463e49 100644 --- a/ScriptEngine/Main/Global.cpp +++ b/ScriptEngine/src/main/Global.cpp @@ -1,4 +1,4 @@ -#include "Global.h" +#include using namespace std; //声明 diff --git a/ScriptEngine/Main/Global.hpp b/ScriptEngine/src/main/Global.hpp similarity index 89% rename from ScriptEngine/Main/Global.hpp rename to ScriptEngine/src/main/Global.hpp index f10e41b..91b0c83 100644 --- a/ScriptEngine/Main/Global.hpp +++ b/ScriptEngine/src/main/Global.hpp @@ -7,11 +7,11 @@ #define CPPHTTPLIB_OPENSSL_SUPPORT #endif -#include -#include -#include -#include -#include +#include "Configs.h" +#include +#include +#include +#include #include #include using std::string; diff --git a/ScriptEngine/Main/Loader.cpp b/ScriptEngine/src/main/Loader.cpp similarity index 95% rename from ScriptEngine/Main/Loader.cpp rename to ScriptEngine/src/main/Loader.cpp index 4c0945c..ed11b2c 100644 --- a/ScriptEngine/Main/Loader.cpp +++ b/ScriptEngine/src/main/Loader.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include "PluginManager.h" +#include "NodeJsHelper.h" #include #include #include @@ -13,7 +13,7 @@ #include #include #include -#include +#include "Configs.h" extern ::Logger logger; diff --git a/ScriptEngine/Main/Loader.h b/ScriptEngine/src/main/Loader.h similarity index 100% rename from ScriptEngine/Main/Loader.h rename to ScriptEngine/src/main/Loader.h diff --git a/ScriptEngine/Main/NodeJsHelper.cpp b/ScriptEngine/src/main/NodeJsHelper.cpp similarity index 96% rename from ScriptEngine/Main/NodeJsHelper.cpp rename to ScriptEngine/src/main/NodeJsHelper.cpp index 238102e..cced273 100644 --- a/ScriptEngine/Main/NodeJsHelper.cpp +++ b/ScriptEngine/src/main/NodeJsHelper.cpp @@ -2,18 +2,18 @@ #include "Configs.h" #if defined(LLSE_BACKEND_NODEJS) #include "Global.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "NodeJsHelper.h" -#include "Engine/EngineManager.h" -#include "Engine/EngineOwnData.h" -#include -#include +#include +#include +#include +#include // pre-declare extern void BindAPIs(ScriptEngine* engine); @@ -150,11 +150,11 @@ bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, s // Start libuv event loop uvLoopTask[env] = Schedule::repeat([engine, env, isRunningMap{&isRunning}, eventLoop{it->second->event_loop()}]() { - if (!LL::isServerStopping() && (*isRunningMap)[env]) { + if (!ll::isServerStopping() && (*isRunningMap)[env]) { EngineScope enter(engine); uv_run(eventLoop, UV_RUN_NOWAIT); } - if (LL::isServerStopping()) { + if (ll::isServerStopping()) { uv_stop(eventLoop); logger.debug("Destroy ServerStopping"); } @@ -288,7 +288,7 @@ bool loadNodeJsPlugin(std::string dirPath, const std::string& packagePath, bool if (!PluginManager::getPlugin(pluginName)) { // Plugin did't register itself. Help to register it string description = pluginName; - LL::Version ver(1, 0, 0); + ll::Version ver(1, 0, 0); std::map others = {}; // Read information from package.json @@ -305,7 +305,7 @@ bool loadNodeJsPlugin(std::string dirPath, const std::string& packagePath, bool } // version if (j.contains("version") && j["version"].is_string()) { - ver = LL::Version::parse(j["version"].get()); + ver = ll::Version::parse(j["version"].get()); } // license if (j.contains("license") && j["license"].is_string()) { diff --git a/ScriptEngine/Main/NodeJsHelper.h b/ScriptEngine/src/main/NodeJsHelper.h similarity index 93% rename from ScriptEngine/Main/NodeJsHelper.h rename to ScriptEngine/src/main/NodeJsHelper.h index ca35ad4..6cbdf5a 100644 --- a/ScriptEngine/Main/NodeJsHelper.h +++ b/ScriptEngine/src/main/NodeJsHelper.h @@ -2,9 +2,9 @@ #if defined(LLSE_BACKEND_NODEJS) #pragma warning(disable : 4251) #include -#include +#include #include -#include +#include "Configs.h" #include namespace NodeJsHelper { diff --git a/ScriptEngine/Main/PluginManager.cpp b/ScriptEngine/src/main/PluginManager.cpp similarity index 90% rename from ScriptEngine/Main/PluginManager.cpp rename to ScriptEngine/src/main/PluginManager.cpp index fc65612..c18ec22 100644 --- a/ScriptEngine/Main/PluginManager.cpp +++ b/ScriptEngine/src/main/PluginManager.cpp @@ -1,24 +1,23 @@ -#include -#include "PluginManager.h" -#include -#include +#include +#include "Global.hpp" +#include "Configs.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include "PluginManager.h" +#include "Loader.h" +#include +#include +#include +#include #ifdef LLSE_BACKEND_NODEJS #pragma warning(disable : 4251) -#include +#include "NodeJsHelper.h" #endif #define H(x) do_hash(x) using namespace std; @@ -153,7 +152,7 @@ bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad, // If plugin itself doesn't register, help it to do so if (!PluginManager::getPlugin(pluginName)) - PluginManager::registerPlugin(realPath, pluginName, pluginName, LL::Version(1, 0, 0), {}); + PluginManager::registerPlugin(realPath, pluginName, pluginName, ll::Version(1, 0, 0), {}); // Call necessary events when at hot load if (isHotLoad) @@ -275,19 +274,19 @@ bool PluginManager::reloadAllPlugins() { return true; } -LL::Plugin* PluginManager::getPlugin(std::string name) { - return LL::PluginManager::getPlugin(name, true); +ll::Plugin* PluginManager::getPlugin(std::string name) { + return ll::PluginManager::getPlugin(name, true); } // Get all plugins of current language -std::unordered_map PluginManager::getLocalPlugins() { - std::unordered_map res; +std::unordered_map PluginManager::getLocalPlugins() { + std::unordered_map res; auto engines = EngineManager::getLocalEngines(); for (auto& engine : engines) { string name = ENGINE_GET_DATA(engine)->pluginName; if (name != LLSE_DEBUG_ENGINE_NAME) { - LL::Plugin* plugin = PluginManager::getPlugin(name); + ll::Plugin* plugin = PluginManager::getPlugin(name); if (plugin) res[plugin->name] = plugin; } @@ -295,28 +294,28 @@ std::unordered_map PluginManager::getLocalPlugins() { return res; } -std::unordered_map PluginManager::getAllScriptPlugins() { +std::unordered_map PluginManager::getAllScriptPlugins() { auto res = getAllPlugins(); erase_if(res, [](auto& item) { - return item.second->type != LL::Plugin::PluginType::ScriptPlugin; + return item.second->type != ll::Plugin::PluginType::ScriptPlugin; }); return res; } // Get all plugins -std::unordered_map PluginManager::getAllPlugins() { - return LL::PluginManager::getAllPlugins(); +std::unordered_map PluginManager::getAllPlugins() { + return ll::PluginManager::getAllPlugins(); } bool PluginManager::registerPlugin(std::string filePath, std::string name, std::string desc, - LL::Version version, std::map others) { + ll::Version version, std::map others) { others["PluginType"] = "Script Plugin"; others["PluginFilePath"] = filePath; - return LL::PluginManager::registerPlugin(NULL, name, desc, version, others); + return ll::PluginManager::registerPlugin(NULL, name, desc, version, others); } bool PluginManager::unRegisterPlugin(std::string name) { - return LL::PluginManager::unRegisterPlugin(name); + return ll::PluginManager::unRegisterPlugin(name); } // Get plugin backend type from its file path (single file plugin) diff --git a/ScriptEngine/Main/PluginManager.h b/ScriptEngine/src/main/PluginManager.h similarity index 69% rename from ScriptEngine/Main/PluginManager.h rename to ScriptEngine/src/main/PluginManager.h index 14138d6..d24c9e6 100644 --- a/ScriptEngine/Main/PluginManager.h +++ b/ScriptEngine/src/main/PluginManager.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include class PluginManager { @@ -16,13 +16,13 @@ public: static bool reloadPlugin(const std::string& name); static bool reloadAllPlugins(); - static LL::Plugin* getPlugin(std::string name); - static std::unordered_map getLocalPlugins(); - static std::unordered_map getAllScriptPlugins(); - static std::unordered_map getAllPlugins(); + static ll::Plugin* getPlugin(std::string name); + static std::unordered_map getLocalPlugins(); + static std::unordered_map getAllScriptPlugins(); + static std::unordered_map getAllPlugins(); static std::string getPluginBackendType(const std::string &path); static bool registerPlugin(std::string filePath, std::string name, std::string desc, - LL::Version version, std::map others); + ll::Version version, std::map others); }; \ No newline at end of file diff --git a/ScriptEngine/Main/SafeGuardRecord.cpp b/ScriptEngine/src/main/SafeGuardRecord.cpp similarity index 95% rename from ScriptEngine/Main/SafeGuardRecord.cpp rename to ScriptEngine/src/main/SafeGuardRecord.cpp index 4befd53..f4a7efd 100644 --- a/ScriptEngine/Main/SafeGuardRecord.cpp +++ b/ScriptEngine/src/main/SafeGuardRecord.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include "Configs.h" using namespace std; ofstream record; diff --git a/ScriptEngine/Main/SafeGuardRecord.h b/ScriptEngine/src/main/SafeGuardRecord.h similarity index 100% rename from ScriptEngine/Main/SafeGuardRecord.h rename to ScriptEngine/src/main/SafeGuardRecord.h diff --git a/ScriptEngine/Main/ScriptEngine.cpp b/ScriptEngine/src/main/ScriptEngine.cpp similarity index 61% rename from ScriptEngine/Main/ScriptEngine.cpp rename to ScriptEngine/src/main/ScriptEngine.cpp index bd917c7..cefc004 100644 --- a/ScriptEngine/Main/ScriptEngine.cpp +++ b/ScriptEngine/src/main/ScriptEngine.cpp @@ -1,26 +1,25 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "SafeGuardRecord.h" #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include +#include "Configs.h" +#include +#include +#include +#include +#include "EconomicSystem.h" using namespace std; // Global vars @@ -35,15 +34,15 @@ extern void LoadDebugEngine(); void entry() { // Enable thread SEH protection - if (!LL::isDebugMode()) + if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); // Register myself - LL::registerPlugin(LLSE_LOADER_NAME, LLSE_LOADER_DESCRIPTION, LITELOADER_VERSION, + ll::registerPlugin(LLSE_LOADER_NAME, LLSE_LOADER_DESCRIPTION, LITELOADER_VERSION, {{"GitHub", "github.com/LiteLDev/LiteLoaderBDS"}}); // Load i18n files - Translation::loadFromImpl(GetCurrentModule(), LL::getLoaderHandle()); + Translation::loadFromImpl(GetCurrentModule(), ll::getLoaderHandle()); // Init global share data InitLocalShareData(); @@ -56,7 +55,7 @@ void entry() { } // Init builtin economy system - if (LL::globalConfig.enableEconomyCore) { + if (ll::globalConfig.enableEconomyCore) { EconomySystem::init(); } diff --git a/ScriptEngine/Main/dllmain.cpp b/ScriptEngine/src/main/dllmain.cpp similarity index 99% rename from ScriptEngine/Main/dllmain.cpp rename to ScriptEngine/src/main/dllmain.cpp index ac26621..b6d7294 100644 --- a/ScriptEngine/Main/dllmain.cpp +++ b/ScriptEngine/src/main/dllmain.cpp @@ -1,3 +1,4 @@ + #include #include diff --git a/ScriptEngine/Tools/IniHelper.cpp b/ScriptEngine/src/utils/IniHelper.cpp similarity index 97% rename from ScriptEngine/Tools/IniHelper.cpp rename to ScriptEngine/src/utils/IniHelper.cpp index b2973c7..15e6baa 100644 --- a/ScriptEngine/Tools/IniHelper.cpp +++ b/ScriptEngine/src/utils/IniHelper.cpp @@ -1,7 +1,7 @@ #include "IniHelper.h" #include -#include -#include +#include +#include using namespace std; extern Logger logger; diff --git a/ScriptEngine/Tools/IniHelper.h b/ScriptEngine/src/utils/IniHelper.h similarity index 100% rename from ScriptEngine/Tools/IniHelper.h rename to ScriptEngine/src/utils/IniHelper.h diff --git a/ScriptEngine/Tools/JsonHelper.h b/ScriptEngine/src/utils/JsonHelper.h similarity index 96% rename from ScriptEngine/Tools/JsonHelper.h rename to ScriptEngine/src/utils/JsonHelper.h index e514be2..cd4b018 100644 --- a/ScriptEngine/Tools/JsonHelper.h +++ b/ScriptEngine/src/utils/JsonHelper.h @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include +#include using namespace nlohmann; using namespace std; diff --git a/ScriptEngine/src/utils/UsingScriptX.inc b/ScriptEngine/src/utils/UsingScriptX.inc new file mode 100644 index 0000000..1b82259 --- /dev/null +++ b/ScriptEngine/src/utils/UsingScriptX.inc @@ -0,0 +1,24 @@ +#pragma once + +#include + +using script::Arguments; +using script::Array; +using script::Boolean; +using script::ByteBuffer; +using script::ClassDefine; +using script::defineClass; +using script::EngineScope; +using script::Exception; +using script::ExitEngineScope; +using script::Function; +using script::Local; +using script::Number; +using script::Object; +using script::ScriptClass; +using script::ScriptEngine; +using script::ScriptEngineImpl; +using script::selectOverloadedFunc; +using script::String; +using script::Value; +using script::ValueKind; diff --git a/ScriptEngine/Tools/Utils.cpp b/ScriptEngine/src/utils/Utils.cpp similarity index 97% rename from ScriptEngine/Tools/Utils.cpp rename to ScriptEngine/src/utils/Utils.cpp index 8291a15..f3a5a47 100644 --- a/ScriptEngine/Tools/Utils.cpp +++ b/ScriptEngine/src/utils/Utils.cpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include using namespace std; vector SplitCmdLine(const string& paras) diff --git a/ScriptEngine/Tools/Utils.h b/ScriptEngine/src/utils/Utils.h similarity index 94% rename from ScriptEngine/Tools/Utils.h rename to ScriptEngine/src/utils/Utils.h index 9b4a1c4..1060b20 100644 --- a/ScriptEngine/Tools/Utils.h +++ b/ScriptEngine/src/utils/Utils.h @@ -1,5 +1,5 @@ #pragma once -#include "Global.h" +#include #include #include #include diff --git a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt b/ScriptEngine/third-party/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt deleted file mode 100644 index 3740ed4..0000000 --- a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required (VERSION 3.8) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) - -set(SCRIPTX_BACKEND V8) - -project(ScriptX-NodeJs) - -include_directories(../../../NodeJs/include/v8) -include(../../CMakeLists.txt) \ No newline at end of file diff --git a/ScriptEngine/third-party/SimpleIni/SimpleIni.h b/ScriptEngine/third-party/SimpleIni/SimpleIni.h deleted file mode 100644 index d6336db..0000000 --- a/ScriptEngine/third-party/SimpleIni/SimpleIni.h +++ /dev/null @@ -1,3474 +0,0 @@ -/** @mainpage - - -
Library SimpleIni -
File SimpleIni.h -
Author Brodie Thiesfield [brofield at gmail dot com] -
Source https://github.com/brofield/simpleini -
Version 4.17 -
- - Jump to the @link CSimpleIniTempl CSimpleIni @endlink interface documentation. - - @section intro INTRODUCTION - - This component allows an INI-style configuration file to be used on both - Windows and Linux/Unix. It is fast, simple and source code using this - component will compile unchanged on either OS. - - - @section features FEATURES - - - MIT Licence allows free use in all software (including GPL and commercial) - - multi-platform (Windows CE/9x/NT..10/etc, Linux, MacOSX, Unix) - - loading and saving of INI-style configuration files - - configuration files can have any newline format on all platforms - - liberal acceptance of file format - - key/values with no section - - removal of whitespace around sections, keys and values - - support for multi-line values (values with embedded newline characters) - - optional support for multiple keys with the same name - - optional case-insensitive sections and keys (for ASCII characters only) - - saves files with sections and keys in the same order as they were loaded - - preserves comments on the file, section and keys where possible. - - supports both char or wchar_t programming interfaces - - supports both MBCS (system locale) and UTF-8 file encodings - - system locale does not need to be UTF-8 on Linux/Unix to load UTF-8 file - - support for non-ASCII characters in section, keys, values and comments - - support for non-standard character types or file encodings - via user-written converter classes - - support for adding/modifying values programmatically - - compiles cleanly in the following compilers: - - Windows/VC6 (warning level 3) - - Windows/VC.NET 2003 (warning level 4) - - Windows/VC 2005 (warning level 4) - - Linux/gcc (-Wall) - - - @section usage USAGE SUMMARY - - -# Define the appropriate symbol for the converter you wish to use and - include the SimpleIni.h header file. If no specific converter is defined - then the default converter is used. The default conversion mode uses - SI_CONVERT_WIN32 on Windows and SI_CONVERT_GENERIC on all other - platforms. If you are using ICU then SI_CONVERT_ICU is supported on all - platforms. - -# Declare an instance the appropriate class. Note that the following - definitions are just shortcuts for commonly used types. Other types - (PRUnichar, unsigned short, unsigned char) are also possible. - -
Interface Case-sensitive Load UTF-8 Load MBCS Typedef -
SI_CONVERT_GENERIC -
char No Yes Yes #1 CSimpleIniA -
char Yes Yes Yes CSimpleIniCaseA -
wchar_t No Yes Yes CSimpleIniW -
wchar_t Yes Yes Yes CSimpleIniCaseW -
SI_CONVERT_WIN32 -
char No No #2 Yes CSimpleIniA -
char Yes Yes Yes CSimpleIniCaseA -
wchar_t No Yes Yes CSimpleIniW -
wchar_t Yes Yes Yes CSimpleIniCaseW -
SI_CONVERT_ICU -
char No Yes Yes CSimpleIniA -
char Yes Yes Yes CSimpleIniCaseA -
UChar No Yes Yes CSimpleIniW -
UChar Yes Yes Yes CSimpleIniCaseW -
- #1 On Windows you are better to use CSimpleIniA with SI_CONVERT_WIN32.
- #2 Only affects Windows. On Windows this uses MBCS functions and - so may fold case incorrectly leading to uncertain results. - -# Call LoadData() or LoadFile() to load and parse the INI configuration file - -# Access and modify the data of the file using the following functions - -
GetAllSections Return all section names -
GetAllKeys Return all key names within a section -
GetAllValues Return all values within a section & key -
GetSection Return all key names and values in a section -
GetSectionSize Return the number of keys in a section -
GetValue Return a value for a section & key -
SetValue Add or update a value for a section & key -
Delete Remove a section, or a key from a section -
- -# Call Save() or SaveFile() to save the INI configuration data - - @section iostreams IO STREAMS - - SimpleIni supports reading from and writing to STL IO streams. Enable this - by defining SI_SUPPORT_IOSTREAMS before including the SimpleIni.h header - file. Ensure that if the streams are backed by a file (e.g. ifstream or - ofstream) then the flag ios_base::binary has been used when the file was - opened. - - @section multiline MULTI-LINE VALUES - - Values that span multiple lines are created using the following format. - - 
-        key = <<
-
-    Note the following:
-    - The text used for ENDTAG can be anything and is used to find
-      where the multi-line text ends.
-    - The newline after ENDTAG in the start tag, and the newline
-      before ENDTAG in the end tag is not included in the data value.
-    - The ending tag must be on it's own line with no whitespace before
-      or after it.
-    - The multi-line value is modified at load so that each line in the value
-      is delimited by a single '\\n' character on all platforms. At save time
-      it will be converted into the newline format used by the current
-      platform.
-
-    @section comments COMMENTS
-
-    Comments are preserved in the file within the following restrictions:
-    - Every file may have a single "file comment". It must start with the
-      first character in the file, and will end with the first non-comment
-      line in the file.
-    - Every section may have a single "section comment". It will start
-      with the first comment line following the file comment, or the last
-      data entry. It ends at the beginning of the section.
-    - Every key may have a single "key comment". This comment will start
-      with the first comment line following the section start, or the file
-      comment if there is no section name.
-    - Comments are set at the time that the file, section or key is first
-      created. The only way to modify a comment on a section or a key is to
-      delete that entry and recreate it with the new comment. There is no
-      way to change the file comment.
-
-    @section save SAVE ORDER
-
-    The sections and keys are written out in the same order as they were
-    read in from the file. Sections and keys added to the data after the
-    file has been loaded will be added to the end of the file when it is
-    written. There is no way to specify the location of a section or key
-    other than in first-created, first-saved order.
-
-    @section notes NOTES
-
-    - To load UTF-8 data on Windows 95, you need to use Microsoft Layer for
-      Unicode, or SI_CONVERT_GENERIC, or SI_CONVERT_ICU.
-    - When using SI_CONVERT_GENERIC, ConvertUTF.c must be compiled and linked.
-    - When using SI_CONVERT_ICU, ICU header files must be on the include
-      path and icuuc.lib must be linked in.
-    - To load a UTF-8 file on Windows AND expose it with SI_CHAR == char,
-      you should use SI_CONVERT_GENERIC.
-    - The collation (sorting) order used for sections and keys returned from
-      iterators is NOT DEFINED. If collation order of the text is important
-      then it should be done yourself by either supplying a replacement
-      SI_STRLESS class, or by sorting the strings external to this library.
-    - Usage of the  header on Windows can be disabled by defining
-      SI_NO_MBCS. This is defined automatically on Windows CE platforms.
-    - Not thread-safe so manage your own locking
-
-    @section contrib CONTRIBUTIONS
-    
-    - 2010/05/03: Tobias Gehrig: added GetDoubleValue()
-
-    @section licence MIT LICENCE
-
-    The licence text below is the boilerplate "MIT Licence" used from:
-    http://www.opensource.org/licenses/mit-license.php
-
-    Copyright (c) 2006-2012, Brodie Thiesfield
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is furnished
-    to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef INCLUDED_SimpleIni_h
-#define INCLUDED_SimpleIni_h
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-// Disable these warnings in MSVC:
-//  4127 "conditional expression is constant" as the conversion classes trigger
-//  it with the statement if (sizeof(SI_CHAR) == sizeof(char)). This test will
-//  be optimized away in a release build.
-//  4503 'insert' : decorated name length exceeded, name was truncated
-//  4702 "unreachable code" as the MS STL header causes it in release mode.
-//  Again, the code causing the warning will be cleaned up by the compiler.
-//  4786 "identifier truncated to 256 characters" as this is thrown hundreds
-//  of times VC6 as soon as STL is used.
-#ifdef _MSC_VER
-# pragma warning (push)
-# pragma warning (disable: 4127 4503 4702 4786)
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#ifdef SI_SUPPORT_IOSTREAMS
-# include 
-#endif // SI_SUPPORT_IOSTREAMS
-
-#ifdef _DEBUG
-# ifndef assert
-#  include 
-# endif
-# define SI_ASSERT(x)   assert(x)
-#else
-# define SI_ASSERT(x)
-#endif
-
-enum SI_Error {
-    SI_OK       =  0,   //!< No error
-    SI_UPDATED  =  1,   //!< An existing value was updated
-    SI_INSERTED =  2,   //!< A new value was inserted
-
-    // note: test for any error with (retval < 0)
-    SI_FAIL     = -1,   //!< Generic failure
-    SI_NOMEM    = -2,   //!< Out of memory error
-    SI_FILE     = -3    //!< File error (see errno for detail error)
-};
-
-#define SI_UTF8_SIGNATURE     "\xEF\xBB\xBF"
-
-#ifdef _WIN32
-# define SI_NEWLINE_A   "\r\n"
-# define SI_NEWLINE_W   L"\r\n"
-#else // !_WIN32
-# define SI_NEWLINE_A   "\n"
-# define SI_NEWLINE_W   L"\n"
-#endif // _WIN32
-
-#if defined(SI_CONVERT_ICU)
-# include 
-#endif
-
-#if defined(_WIN32)
-# define SI_HAS_WIDE_FILE
-# define SI_WCHAR_T     wchar_t
-#elif defined(SI_CONVERT_ICU)
-# define SI_HAS_WIDE_FILE
-# define SI_WCHAR_T     UChar
-#endif
-
-
-// ---------------------------------------------------------------------------
-//                              MAIN TEMPLATE CLASS
-// ---------------------------------------------------------------------------
-
-/** Simple INI file reader.
-
-    This can be instantiated with the choice of unicode or native characterset,
-    and case sensitive or insensitive comparisons of section and key names.
-    The supported combinations are pre-defined with the following typedefs:
-
-    
-        
Interface   Case-sensitive  Typedef
-        
char        No              CSimpleIniA
-        
char        Yes             CSimpleIniCaseA
-        
wchar_t     No              CSimpleIniW
-        
wchar_t     Yes             CSimpleIniCaseW
-    

-
-    Note that using other types for the SI_CHAR is supported. For instance,
-    unsigned char, unsigned short, etc. Note that where the alternative type
-    is a different size to char/wchar_t you may need to supply new helper
-    classes for SI_STRLESS and SI_CONVERTER.
- */
-template
-class CSimpleIniTempl
-{
-public:
-    typedef SI_CHAR SI_CHAR_T;
-
-    /** key entry */
-    struct Entry {
-        const SI_CHAR * pItem;
-        const SI_CHAR * pComment;
-        int             nOrder;
-
-        Entry(const SI_CHAR * a_pszItem = NULL, int a_nOrder = 0)
-            : pItem(a_pszItem)
-            , pComment(NULL)
-            , nOrder(a_nOrder)
-        { }
-        Entry(const SI_CHAR * a_pszItem, const SI_CHAR * a_pszComment, int a_nOrder)
-            : pItem(a_pszItem)
-            , pComment(a_pszComment)
-            , nOrder(a_nOrder)
-        { }
-        Entry(const Entry & rhs) { operator=(rhs); }
-        Entry & operator=(const Entry & rhs) {
-            pItem    = rhs.pItem;
-            pComment = rhs.pComment;
-            nOrder   = rhs.nOrder;
-            return *this;
-        }
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-        /** STL of VC6 doesn't allow me to specify my own comparator for list::sort() */
-        bool operator<(const Entry & rhs) const { return LoadOrder()(*this, rhs); }
-        bool operator>(const Entry & rhs) const { return LoadOrder()(rhs, *this); }
-#endif
-
-        /** Strict less ordering by name of key only */
-        struct KeyOrder {
-            bool operator()(const Entry & lhs, const Entry & rhs) const {
-                const static SI_STRLESS isLess = SI_STRLESS();
-                return isLess(lhs.pItem, rhs.pItem);
-            }
-        };
-
-        /** Strict less ordering by order, and then name of key */
-        struct LoadOrder {
-            bool operator()(const Entry & lhs, const Entry & rhs) const {
-                if (lhs.nOrder != rhs.nOrder) {
-                    return lhs.nOrder < rhs.nOrder;
-                }
-                return KeyOrder()(lhs.pItem, rhs.pItem);
-            }
-        };
-    };
-
-    /** map keys to values */
-    typedef std::multimap TKeyVal;
-
-    /** map sections to key/value map */
-    typedef std::map TSection;
-
-    /** set of dependent string pointers. Note that these pointers are
-        dependent on memory owned by CSimpleIni.
-    */
-    typedef std::list TNamesDepend;
-
-    /** interface definition for the OutputWriter object to pass to Save()
-        in order to output the INI file data.
-    */
-    class OutputWriter {
-    public:
-        OutputWriter() { }
-        virtual ~OutputWriter() { }
-        virtual void Write(const char * a_pBuf) = 0;
-    private:
-        OutputWriter(const OutputWriter &);             // disable
-        OutputWriter & operator=(const OutputWriter &); // disable
-    };
-
-    /** OutputWriter class to write the INI data to a file */
-    class FileWriter : public OutputWriter {
-        FILE * m_file;
-    public:
-        FileWriter(FILE * a_file) : m_file(a_file) { }
-        void Write(const char * a_pBuf) {
-            fputs(a_pBuf, m_file);
-        }
-    private:
-        FileWriter(const FileWriter &);             // disable
-        FileWriter & operator=(const FileWriter &); // disable
-    };
-
-    /** OutputWriter class to write the INI data to a string */
-    class StringWriter : public OutputWriter {
-        std::string & m_string;
-    public:
-        StringWriter(std::string & a_string) : m_string(a_string) { }
-        void Write(const char * a_pBuf) {
-            m_string.append(a_pBuf);
-        }
-    private:
-        StringWriter(const StringWriter &);             // disable
-        StringWriter & operator=(const StringWriter &); // disable
-    };
-
-#ifdef SI_SUPPORT_IOSTREAMS
-    /** OutputWriter class to write the INI data to an ostream */
-    class StreamWriter : public OutputWriter {
-        std::ostream & m_ostream;
-    public:
-        StreamWriter(std::ostream & a_ostream) : m_ostream(a_ostream) { }
-        void Write(const char * a_pBuf) {
-            m_ostream << a_pBuf;
-        }
-    private:
-        StreamWriter(const StreamWriter &);             // disable
-        StreamWriter & operator=(const StreamWriter &); // disable
-    };
-#endif // SI_SUPPORT_IOSTREAMS
-
-    /** Characterset conversion utility class to convert strings to the
-        same format as is used for the storage.
-    */
-    class Converter : private SI_CONVERTER {
-    public:
-        Converter(bool a_bStoreIsUtf8) : SI_CONVERTER(a_bStoreIsUtf8) {
-            m_scratch.resize(1024);
-        }
-        Converter(const Converter & rhs) { operator=(rhs); }
-        Converter & operator=(const Converter & rhs) {
-            m_scratch = rhs.m_scratch;
-            return *this;
-        }
-        bool ConvertToStore(const SI_CHAR * a_pszString) {
-            size_t uLen = SI_CONVERTER::SizeToStore(a_pszString);
-            if (uLen == (size_t)(-1)) {
-                return false;
-            }
-            while (uLen > m_scratch.size()) {
-                m_scratch.resize(m_scratch.size() * 2);
-            }
-            return SI_CONVERTER::ConvertToStore(
-                a_pszString,
-                const_cast(m_scratch.data()),
-                m_scratch.size());
-        }
-        const char * Data() { return m_scratch.data(); }
-    private:
-        std::string m_scratch;
-    };
-
-public:
-    /*-----------------------------------------------------------------------*/
-
-    /** Default constructor.
-
-        @param a_bIsUtf8     See the method SetUnicode() for details.
-        @param a_bMultiKey   See the method SetMultiKey() for details.
-        @param a_bMultiLine  See the method SetMultiLine() for details.
-     */
-    CSimpleIniTempl(
-        bool a_bIsUtf8    = false,
-        bool a_bMultiKey  = false,
-        bool a_bMultiLine = false
-        );
-
-    /** Destructor */
-    ~CSimpleIniTempl();
-
-    /** Deallocate all memory stored by this object */
-    void Reset();
-
-    /** Has any data been loaded */
-    bool IsEmpty() const { return m_data.empty(); }
-
-    /*-----------------------------------------------------------------------*/
-    /** @{ @name Settings */
-
-    /** Set the storage format of the INI data. This affects both the loading
-        and saving of the INI data using all of the Load/Save API functions.
-        This value cannot be changed after any INI data has been loaded.
-
-        If the file is not set to Unicode (UTF-8), then the data encoding is
-        assumed to be the OS native encoding. This encoding is the system
-        locale on Linux/Unix and the legacy MBCS encoding on Windows NT/2K/XP.
-        If the storage format is set to Unicode then the file will be loaded
-        as UTF-8 encoded data regardless of the native file encoding. If
-        SI_CHAR == char then all of the char* parameters take and return UTF-8
-        encoded data regardless of the system locale.
-
-        \param a_bIsUtf8     Assume UTF-8 encoding for the source?
-     */
-    void SetUnicode(bool a_bIsUtf8 = true) {
-        if (!m_pData) m_bStoreIsUtf8 = a_bIsUtf8;
-    }
-
-    /** Get the storage format of the INI data. */
-    bool IsUnicode() const { return m_bStoreIsUtf8; }
-
-    /** Should multiple identical keys be permitted in the file. If set to false
-        then the last value encountered will be used as the value of the key.
-        If set to true, then all values will be available to be queried. For
-        example, with the following input:
-
-        
-        [section]
-        test=value1
-        test=value2
-        

-
-        Then with SetMultiKey(true), both of the values "value1" and "value2"
-        will be returned for the key test. If SetMultiKey(false) is used, then
-        the value for "test" will only be "value2". This value may be changed
-        at any time.
-
-        \param a_bAllowMultiKey  Allow multi-keys in the source?
-     */
-    void SetMultiKey(bool a_bAllowMultiKey = true) {
-        m_bAllowMultiKey = a_bAllowMultiKey;
-    }
-
-    /** Get the storage format of the INI data. */
-    bool IsMultiKey() const { return m_bAllowMultiKey; }
-
-    /** Should data values be permitted to span multiple lines in the file. If
-        set to false then the multi-line construct <<
-            SI_CHAR     FORMAT
-            char        same format as when loaded (MBCS or UTF-8)
-            wchar_t     UTF-8
-            other       UTF-8
-        
-
-        Note that comments from the original data is preserved as per the
-        documentation on comments. The order of the sections and values
-        from the original file will be preserved.
-
-        Any data prepended or appended to the output device must use the the
-        same format (MBCS or UTF-8). You may use the GetConverter() method to
-        convert text to the correct format regardless of the output format
-        being used by SimpleIni.
-
-        To add a BOM to UTF-8 data, write it out manually at the very beginning
-        like is done in SaveFile when a_bUseBOM is true.
-
-        @param a_oOutput    Output writer to write the data to.
-
-        @param a_bAddSignature  Prepend the UTF-8 BOM if the output data is in
-                            UTF-8 format. If it is not UTF-8 then this value is
-                            ignored. Do not set this to true if anything has
-                            already been written to the OutputWriter.
-
-        @return SI_Error    See error definitions
-     */
-    SI_Error Save(
-        OutputWriter &  a_oOutput,
-        bool            a_bAddSignature = false
-        ) const;
-
-#ifdef SI_SUPPORT_IOSTREAMS
-    /** Save the INI data to an ostream. See Save() for details.
-
-        @param a_ostream    String to have the INI data appended to.
-
-        @param a_bAddSignature  Prepend the UTF-8 BOM if the output data is in
-                            UTF-8 format. If it is not UTF-8 then this value is
-                            ignored. Do not set this to true if anything has
-                            already been written to the stream.
-
-        @return SI_Error    See error definitions
-     */
-    SI_Error Save(
-        std::ostream &  a_ostream,
-        bool            a_bAddSignature = false
-        ) const
-    {
-        StreamWriter writer(a_ostream);
-        return Save(writer, a_bAddSignature);
-    }
-#endif // SI_SUPPORT_IOSTREAMS
-
-    /** Append the INI data to a string. See Save() for details.
-
-        @param a_sBuffer    String to have the INI data appended to.
-
-        @param a_bAddSignature  Prepend the UTF-8 BOM if the output data is in
-                            UTF-8 format. If it is not UTF-8 then this value is
-                            ignored. Do not set this to true if anything has
-                            already been written to the string.
-
-        @return SI_Error    See error definitions
-     */
-    SI_Error Save(
-        std::string &   a_sBuffer,
-        bool            a_bAddSignature = false
-        ) const
-    {
-        StringWriter writer(a_sBuffer);
-        return Save(writer, a_bAddSignature);
-    }
-
-    /*-----------------------------------------------------------------------*/
-    /** @}
-        @{ @name Accessing INI Data */
-
-    /** Retrieve all section names. The list is returned as an STL vector of
-        names and can be iterated or searched as necessary. Note that the
-        sort order of the returned strings is NOT DEFINED. You can sort
-        the names into the load order if desired. Search this file for ".sort"
-        for an example.
-
-        NOTE! This structure contains only pointers to strings. The actual
-        string data is stored in memory owned by CSimpleIni. Ensure that the
-        CSimpleIni object is not destroyed or Reset() while these pointers
-        are in use!
-
-        @param a_names          Vector that will receive all of the section
-                                 names. See note above!
-     */
-    void GetAllSections(
-        TNamesDepend & a_names
-        ) const;
-
-    /** Retrieve all unique key names in a section. The sort order of the
-        returned strings is NOT DEFINED. You can sort the names into the load 
-        order if desired. Search this file for ".sort" for an example. Only 
-        unique key names are returned.
-
-        NOTE! This structure contains only pointers to strings. The actual
-        string data is stored in memory owned by CSimpleIni. Ensure that the
-        CSimpleIni object is not destroyed or Reset() while these strings
-        are in use!
-
-        @param a_pSection       Section to request data for
-        @param a_names          List that will receive all of the key
-                                 names. See note above!
-
-        @return true            Section was found.
-        @return false           Matching section was not found.
-     */
-    bool GetAllKeys(
-        const SI_CHAR * a_pSection,
-        TNamesDepend &  a_names
-        ) const;
-
-    /** Retrieve all values for a specific key. This method can be used when
-        multiple keys are both enabled and disabled. Note that the sort order 
-        of the returned strings is NOT DEFINED. You can sort the names into 
-        the load order if desired. Search this file for ".sort" for an example.
-
-        NOTE! The returned values are pointers to string data stored in memory
-        owned by CSimpleIni. Ensure that the CSimpleIni object is not destroyed
-        or Reset while you are using this pointer!
-
-        @param a_pSection       Section to search
-        @param a_pKey           Key to search for
-        @param a_values         List to return if the key is not found
-
-        @return true            Key was found.
-        @return false           Matching section/key was not found.
-     */
-    bool GetAllValues(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        TNamesDepend &  a_values
-        ) const;
-
-    /** Query the number of keys in a specific section. Note that if multiple
-        keys are enabled, then this value may be different to the number of
-        keys returned by GetAllKeys.
-
-        @param a_pSection       Section to request data for
-
-        @return -1              Section does not exist in the file
-        @return >=0             Number of keys in the section
-     */
-    int GetSectionSize(
-        const SI_CHAR * a_pSection
-        ) const;
-
-    /** Retrieve all key and value pairs for a section. The data is returned
-        as a pointer to an STL map and can be iterated or searched as
-        desired. Note that multiple entries for the same key may exist when
-        multiple keys have been enabled.
-
-        NOTE! This structure contains only pointers to strings. The actual
-        string data is stored in memory owned by CSimpleIni. Ensure that the
-        CSimpleIni object is not destroyed or Reset() while these strings
-        are in use!
-
-        @param a_pSection       Name of the section to return
-        @return boolean         Was a section matching the supplied
-                                name found.
-     */
-    const TKeyVal * GetSection(
-        const SI_CHAR * a_pSection
-        ) const;
-
-    /** Retrieve the value for a specific key. If multiple keys are enabled
-        (see SetMultiKey) then only the first value associated with that key
-        will be returned, see GetAllValues for getting all values with multikey.
-
-        NOTE! The returned value is a pointer to string data stored in memory
-        owned by CSimpleIni. Ensure that the CSimpleIni object is not destroyed
-        or Reset while you are using this pointer!
-
-        @param a_pSection       Section to search
-        @param a_pKey           Key to search for
-        @param a_pDefault       Value to return if the key is not found
-        @param a_pHasMultiple   Optionally receive notification of if there are
-                                multiple entries for this key.
-
-        @return a_pDefault      Key was not found in the section
-        @return other           Value of the key
-     */
-    const SI_CHAR * GetValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        const SI_CHAR * a_pDefault     = NULL,
-        bool *          a_pHasMultiple = NULL
-        ) const;
-
-    /** Retrieve a numeric value for a specific key. If multiple keys are enabled
-        (see SetMultiKey) then only the first value associated with that key
-        will be returned, see GetAllValues for getting all values with multikey.
-
-        @param a_pSection       Section to search
-        @param a_pKey           Key to search for
-        @param a_nDefault       Value to return if the key is not found
-        @param a_pHasMultiple   Optionally receive notification of if there are
-                                multiple entries for this key.
-
-        @return a_nDefault      Key was not found in the section
-        @return other           Value of the key
-     */
-    long GetLongValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        long            a_nDefault     = 0,
-        bool *          a_pHasMultiple = NULL
-        ) const;
-
-    /** Retrieve a numeric value for a specific key. If multiple keys are enabled
-        (see SetMultiKey) then only the first value associated with that key
-        will be returned, see GetAllValues for getting all values with multikey.
-
-        @param a_pSection       Section to search
-        @param a_pKey           Key to search for
-        @param a_nDefault       Value to return if the key is not found
-        @param a_pHasMultiple   Optionally receive notification of if there are
-                                multiple entries for this key.
-
-        @return a_nDefault      Key was not found in the section
-        @return other           Value of the key
-     */
-    double GetDoubleValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        double          a_nDefault     = 0,
-        bool *          a_pHasMultiple = NULL
-        ) const;
-
-    /** Retrieve a boolean value for a specific key. If multiple keys are enabled
-        (see SetMultiKey) then only the first value associated with that key
-        will be returned, see GetAllValues for getting all values with multikey.
-
-        Strings starting with "t", "y", "on" or "1" are returned as logically true.
-        Strings starting with "f", "n", "of" or "0" are returned as logically false.
-        For all other values the default is returned. Character comparisons are 
-        case-insensitive.
-
-        @param a_pSection       Section to search
-        @param a_pKey           Key to search for
-        @param a_bDefault       Value to return if the key is not found
-        @param a_pHasMultiple   Optionally receive notification of if there are
-                                multiple entries for this key.
-
-        @return a_nDefault      Key was not found in the section
-        @return other           Value of the key
-     */
-    bool GetBoolValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        bool            a_bDefault     = false,
-        bool *          a_pHasMultiple = NULL
-        ) const;
-
-    /** Add or update a section or value. This will always insert
-        when multiple keys are enabled.
-
-        @param a_pSection   Section to add or update
-        @param a_pKey       Key to add or update. Set to NULL to
-                            create an empty section.
-        @param a_pValue     Value to set. Set to NULL to create an
-                            empty section.
-        @param a_pComment   Comment to be associated with the section or the
-                            key. If a_pKey is NULL then it will be associated
-                            with the section, otherwise the key. Note that a
-                            comment may be set ONLY when the section or key is
-                            first created (i.e. when this function returns the
-                            value SI_INSERTED). If you wish to create a section
-                            with a comment then you need to create the section
-                            separately to the key. The comment string must be
-                            in full comment form already (have a comment
-                            character starting every line).
-        @param a_bForceReplace  Should all existing values in a multi-key INI
-                            file be replaced with this entry. This option has
-                            no effect if not using multi-key files. The 
-                            difference between Delete/SetValue and SetValue
-                            with a_bForceReplace = true, is that the load 
-                            order and comment will be preserved this way.
-
-        @return SI_Error    See error definitions
-        @return SI_UPDATED  Value was updated
-        @return SI_INSERTED Value was inserted
-     */
-    SI_Error SetValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        const SI_CHAR * a_pValue,
-        const SI_CHAR * a_pComment      = NULL,
-        bool            a_bForceReplace = false
-        )
-    {
-        return AddEntry(a_pSection, a_pKey, a_pValue, a_pComment, a_bForceReplace, true);
-    }
-
-    /** Add or update a numeric value. This will always insert
-        when multiple keys are enabled.
-
-        @param a_pSection   Section to add or update
-        @param a_pKey       Key to add or update. 
-        @param a_nValue     Value to set. 
-        @param a_pComment   Comment to be associated with the key. See the 
-                            notes on SetValue() for comments.
-        @param a_bUseHex    By default the value will be written to the file 
-                            in decimal format. Set this to true to write it 
-                            as hexadecimal.
-        @param a_bForceReplace  Should all existing values in a multi-key INI
-                            file be replaced with this entry. This option has
-                            no effect if not using multi-key files. The 
-                            difference between Delete/SetLongValue and 
-                            SetLongValue with a_bForceReplace = true, is that 
-                            the load order and comment will be preserved this 
-                            way.
-
-        @return SI_Error    See error definitions
-        @return SI_UPDATED  Value was updated
-        @return SI_INSERTED Value was inserted
-     */
-    SI_Error SetLongValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        long            a_nValue,
-        const SI_CHAR * a_pComment      = NULL,
-        bool            a_bUseHex       = false,
-        bool            a_bForceReplace = false
-        );
-
-    /** Add or update a double value. This will always insert
-        when multiple keys are enabled.
-
-        @param a_pSection   Section to add or update
-        @param a_pKey       Key to add or update. 
-        @param a_nValue     Value to set. 
-        @param a_pComment   Comment to be associated with the key. See the 
-                            notes on SetValue() for comments.
-        @param a_bForceReplace  Should all existing values in a multi-key INI
-                            file be replaced with this entry. This option has
-                            no effect if not using multi-key files. The 
-                            difference between Delete/SetDoubleValue and 
-                            SetDoubleValue with a_bForceReplace = true, is that 
-                            the load order and comment will be preserved this 
-                            way.
-
-        @return SI_Error    See error definitions
-        @return SI_UPDATED  Value was updated
-        @return SI_INSERTED Value was inserted
-     */
-    SI_Error SetDoubleValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        double          a_nValue,
-        const SI_CHAR * a_pComment      = NULL,
-        bool            a_bForceReplace = false
-        );
-
-    /** Add or update a boolean value. This will always insert
-        when multiple keys are enabled.
-
-        @param a_pSection   Section to add or update
-        @param a_pKey       Key to add or update. 
-        @param a_bValue     Value to set. 
-        @param a_pComment   Comment to be associated with the key. See the 
-                            notes on SetValue() for comments.
-        @param a_bForceReplace  Should all existing values in a multi-key INI
-                            file be replaced with this entry. This option has
-                            no effect if not using multi-key files. The 
-                            difference between Delete/SetBoolValue and 
-                            SetBoolValue with a_bForceReplace = true, is that 
-                            the load order and comment will be preserved this 
-                            way.
-
-        @return SI_Error    See error definitions
-        @return SI_UPDATED  Value was updated
-        @return SI_INSERTED Value was inserted
-     */
-    SI_Error SetBoolValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        bool            a_bValue,
-        const SI_CHAR * a_pComment      = NULL,
-        bool            a_bForceReplace = false
-        );
-
-    /** Delete an entire section, or a key from a section. Note that the
-        data returned by GetSection is invalid and must not be used after
-        anything has been deleted from that section using this method.
-        Note when multiple keys is enabled, this will delete all keys with
-        that name; to selectively delete individual key/values, use
-        DeleteValue.
-
-        @param a_pSection       Section to delete key from, or if
-                                a_pKey is NULL, the section to remove.
-        @param a_pKey           Key to remove from the section. Set to
-                                NULL to remove the entire section.
-        @param a_bRemoveEmpty   If the section is empty after this key has
-                                been deleted, should the empty section be
-                                removed?
-
-        @return true            Key or section was deleted.
-        @return false           Key or section was not found.
-     */
-    bool Delete(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        bool            a_bRemoveEmpty = false
-        );
-
-    /** Delete an entire section, or a key from a section. If value is
-        provided, only remove keys with the value. Note that the data
-        returned by GetSection is invalid and must not be used after
-        anything has been deleted from that section using this method.
-        Note when multiple keys is enabled, all keys with the value will
-        be deleted.
-
-        @param a_pSection       Section to delete key from, or if
-                                a_pKey is NULL, the section to remove.
-        @param a_pKey           Key to remove from the section. Set to
-                                NULL to remove the entire section.
-        @param a_pValue         Value of key to remove from the section.
-                                Set to NULL to remove all keys.
-        @param a_bRemoveEmpty   If the section is empty after this key has
-                                been deleted, should the empty section be
-                                removed?
-
-        @return true            Key/value or section was deleted.
-        @return false           Key/value or section was not found.
-     */
-    bool DeleteValue(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        const SI_CHAR * a_pValue,
-        bool            a_bRemoveEmpty = false
-        );
-
-    /*-----------------------------------------------------------------------*/
-    /** @}
-        @{ @name Converter */
-
-    /** Return a conversion object to convert text to the same encoding
-        as is used by the Save(), SaveFile() and SaveString() functions.
-        Use this to prepare the strings that you wish to append or prepend
-        to the output INI data.
-     */
-    Converter GetConverter() const {
-        return Converter(m_bStoreIsUtf8);
-    }
-
-    /*-----------------------------------------------------------------------*/
-    /** @} */
-
-private:
-    // copying is not permitted
-    CSimpleIniTempl(const CSimpleIniTempl &); // disabled
-    CSimpleIniTempl & operator=(const CSimpleIniTempl &); // disabled
-
-    /** Parse the data looking for a file comment and store it if found.
-    */
-    SI_Error FindFileComment(
-        SI_CHAR *&      a_pData,
-        bool            a_bCopyStrings
-        );
-
-    /** Parse the data looking for the next valid entry. The memory pointed to
-        by a_pData is modified by inserting NULL characters. The pointer is
-        updated to the current location in the block of text.
-    */
-    bool FindEntry(
-        SI_CHAR *&  a_pData,
-        const SI_CHAR *&  a_pSection,
-        const SI_CHAR *&  a_pKey,
-        const SI_CHAR *&  a_pVal,
-        const SI_CHAR *&  a_pComment
-        ) const;
-
-    /** Add the section/key/value to our data.
-
-        @param a_pSection   Section name. Sections will be created if they
-                            don't already exist.
-        @param a_pKey       Key name. May be NULL to create an empty section.
-                            Existing entries will be updated. New entries will
-                            be created.
-        @param a_pValue     Value for the key.
-        @param a_pComment   Comment to be associated with the section or the
-                            key. If a_pKey is NULL then it will be associated
-                            with the section, otherwise the key. This must be
-                            a string in full comment form already (have a
-                            comment character starting every line).
-        @param a_bForceReplace  Should all existing values in a multi-key INI
-                            file be replaced with this entry. This option has
-                            no effect if not using multi-key files. The 
-                            difference between Delete/AddEntry and AddEntry
-                            with a_bForceReplace = true, is that the load 
-                            order and comment will be preserved this way.
-        @param a_bCopyStrings   Should copies of the strings be made or not.
-                            If false then the pointers will be used as is.
-    */
-    SI_Error AddEntry(
-        const SI_CHAR * a_pSection,
-        const SI_CHAR * a_pKey,
-        const SI_CHAR * a_pValue,
-        const SI_CHAR * a_pComment,
-        bool            a_bForceReplace,
-        bool            a_bCopyStrings
-        );
-
-    /** Is the supplied character a whitespace character? */
-    inline bool IsSpace(SI_CHAR ch) const {
-        return (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n');
-    }
-
-    /** Does the supplied character start a comment line? */
-    inline bool IsComment(SI_CHAR ch) const {
-        return (ch == ';' || ch == '#');
-    }
-
-
-    /** Skip over a newline character (or characters) for either DOS or UNIX */
-    inline void SkipNewLine(SI_CHAR *& a_pData) const {
-        a_pData += (*a_pData == '\r' && *(a_pData+1) == '\n') ? 2 : 1;
-    }
-
-    /** Make a copy of the supplied string, replacing the original pointer */
-    SI_Error CopyString(const SI_CHAR *& a_pString);
-
-    /** Delete a string from the copied strings buffer if necessary */
-    void DeleteString(const SI_CHAR * a_pString);
-
-    /** Internal use of our string comparison function */
-    bool IsLess(const SI_CHAR * a_pLeft, const SI_CHAR * a_pRight) const {
-        const static SI_STRLESS isLess = SI_STRLESS();
-        return isLess(a_pLeft, a_pRight);
-    }
-
-    bool IsMultiLineTag(const SI_CHAR * a_pData) const;
-    bool IsMultiLineData(const SI_CHAR * a_pData) const;
-    bool LoadMultiLineText(
-        SI_CHAR *&          a_pData,
-        const SI_CHAR *&    a_pVal,
-        const SI_CHAR *     a_pTagName,
-        bool                a_bAllowBlankLinesInComment = false
-        ) const;
-    bool IsNewLineChar(SI_CHAR a_c) const;
-
-    bool OutputMultiLineText(
-        OutputWriter &  a_oOutput,
-        Converter &     a_oConverter,
-        const SI_CHAR * a_pText
-        ) const;
-
-private:
-    /** Copy of the INI file data in our character format. This will be
-        modified when parsed to have NULL characters added after all
-        interesting string entries. All of the string pointers to sections,
-        keys and values point into this block of memory.
-     */
-    SI_CHAR * m_pData;
-
-    /** Length of the data that we have stored. Used when deleting strings
-        to determine if the string is stored here or in the allocated string
-        buffer.
-     */
-    size_t m_uDataLen;
-
-    /** File comment for this data, if one exists. */
-    const SI_CHAR * m_pFileComment;
-
-    /** Parsed INI data. Section -> (Key -> Value). */
-    TSection m_data;
-
-    /** This vector stores allocated memory for copies of strings that have
-        been supplied after the file load. It will be empty unless SetValue()
-        has been called.
-     */
-    TNamesDepend m_strings;
-
-    /** Is the format of our datafile UTF-8 or MBCS? */
-    bool m_bStoreIsUtf8;
-
-    /** Are multiple values permitted for the same key? */
-    bool m_bAllowMultiKey;
-
-    /** Are data values permitted to span multiple lines? */
-    bool m_bAllowMultiLine;
-
-    /** Should spaces be written out surrounding the equals sign? */
-    bool m_bSpaces;
-    
-    /** Next order value, used to ensure sections and keys are output in the
-        same order that they are loaded/added.
-     */
-    int m_nOrder;
-};
-
-// ---------------------------------------------------------------------------
-//                                  IMPLEMENTATION
-// ---------------------------------------------------------------------------
-
-template
-CSimpleIniTempl::CSimpleIniTempl(
-    bool a_bIsUtf8,
-    bool a_bAllowMultiKey,
-    bool a_bAllowMultiLine
-    )
-  : m_pData(0)
-  , m_uDataLen(0)
-  , m_pFileComment(NULL)
-  , m_bStoreIsUtf8(a_bIsUtf8)
-  , m_bAllowMultiKey(a_bAllowMultiKey)
-  , m_bAllowMultiLine(a_bAllowMultiLine)
-  , m_bSpaces(true)
-  , m_nOrder(0)
-{ }
-
-template
-CSimpleIniTempl::~CSimpleIniTempl()
-{
-    Reset();
-}
-
-template
-void
-CSimpleIniTempl::Reset()
-{
-    // remove all data
-    delete[] m_pData;
-    m_pData = NULL;
-    m_uDataLen = 0;
-    m_pFileComment = NULL;
-    if (!m_data.empty()) {
-        m_data.erase(m_data.begin(), m_data.end());
-    }
-
-    // remove all strings
-    if (!m_strings.empty()) {
-        typename TNamesDepend::iterator i = m_strings.begin();
-        for (; i != m_strings.end(); ++i) {
-            delete[] const_cast(i->pItem);
-        }
-        m_strings.erase(m_strings.begin(), m_strings.end());
-    }
-}
-
-template
-SI_Error
-CSimpleIniTempl::LoadFile(
-    const char * a_pszFile
-    )
-{
-    FILE * fp = NULL;
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-    fopen_s(&fp, a_pszFile, "rb");
-#else // !__STDC_WANT_SECURE_LIB__
-    fp = fopen(a_pszFile, "rb");
-#endif // __STDC_WANT_SECURE_LIB__
-    if (!fp) {
-        return SI_FILE;
-    }
-    SI_Error rc = LoadFile(fp);
-    fclose(fp);
-    return rc;
-}
-
-#ifdef SI_HAS_WIDE_FILE
-template
-SI_Error
-CSimpleIniTempl::LoadFile(
-    const SI_WCHAR_T * a_pwszFile
-    )
-{
-#ifdef _WIN32
-    FILE * fp = NULL;
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-    _wfopen_s(&fp, a_pwszFile, L"rb");
-#else // !__STDC_WANT_SECURE_LIB__
-    fp = _wfopen(a_pwszFile, L"rb");
-#endif // __STDC_WANT_SECURE_LIB__
-    if (!fp) return SI_FILE;
-    SI_Error rc = LoadFile(fp);
-    fclose(fp);
-    return rc;
-#else // !_WIN32 (therefore SI_CONVERT_ICU)
-    char szFile[256];
-    u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
-    return LoadFile(szFile);
-#endif // _WIN32
-}
-#endif // SI_HAS_WIDE_FILE
-
-template
-SI_Error
-CSimpleIniTempl::LoadFile(
-    FILE * a_fpFile
-    )
-{
-    // load the raw file data
-    int retval = fseek(a_fpFile, 0, SEEK_END);
-    if (retval != 0) {
-        return SI_FILE;
-    }
-    long lSize = ftell(a_fpFile);
-    if (lSize < 0) {
-        return SI_FILE;
-    }
-    if (lSize == 0) {
-        return SI_OK;
-    }
-    
-    // allocate and ensure NULL terminated
-    char * pData = new(std::nothrow) char[lSize+1];
-    if (!pData) {
-        return SI_NOMEM;
-    }
-    pData[lSize] = 0;
-    
-    // load data into buffer
-    fseek(a_fpFile, 0, SEEK_SET);
-    size_t uRead = fread(pData, sizeof(char), lSize, a_fpFile);
-    if (uRead != (size_t) lSize) {
-        delete[] pData;
-        return SI_FILE;
-    }
-
-    // convert the raw data to unicode
-    SI_Error rc = LoadData(pData, uRead);
-    delete[] pData;
-    return rc;
-}
-
-template
-SI_Error
-CSimpleIniTempl::LoadData(
-    const char *    a_pData,
-    size_t          a_uDataLen
-    )
-{
-    if (!a_pData) {
-        return SI_OK;
-    }
-    
-    // if the UTF-8 BOM exists, consume it and set mode to unicode, if we have
-    // already loaded data and try to change mode half-way through then this will
-    // be ignored and we will assert in debug versions
-    if (a_uDataLen >= 3 && memcmp(a_pData, SI_UTF8_SIGNATURE, 3) == 0) {
-        a_pData    += 3;
-        a_uDataLen -= 3;
-        SI_ASSERT(m_bStoreIsUtf8 || !m_pData); // we don't expect mixed mode data
-        SetUnicode();
-    }
-
-    if (a_uDataLen == 0) {
-        return SI_OK;
-    }
-
-    // determine the length of the converted data
-    SI_CONVERTER converter(m_bStoreIsUtf8);
-    size_t uLen = converter.SizeFromStore(a_pData, a_uDataLen);
-    if (uLen == (size_t)(-1)) {
-        return SI_FAIL;
-    }
-
-    // allocate memory for the data, ensure that there is a NULL
-    // terminator wherever the converted data ends
-    SI_CHAR * pData = new(std::nothrow) SI_CHAR[uLen+1];
-    if (!pData) {
-        return SI_NOMEM;
-    }
-    memset(pData, 0, sizeof(SI_CHAR)*(uLen+1));
-
-    // convert the data
-    if (!converter.ConvertFromStore(a_pData, a_uDataLen, pData, uLen)) {
-        delete[] pData;
-        return SI_FAIL;
-    }
-
-    // parse it
-    const static SI_CHAR empty = 0;
-    SI_CHAR * pWork = pData;
-    const SI_CHAR * pSection = ∅
-    const SI_CHAR * pItem = NULL;
-    const SI_CHAR * pVal = NULL;
-    const SI_CHAR * pComment = NULL;
-
-    // We copy the strings if we are loading data into this class when we
-    // already have stored some.
-    bool bCopyStrings = (m_pData != NULL);
-
-    // find a file comment if it exists, this is a comment that starts at the
-    // beginning of the file and continues until the first blank line.
-    SI_Error rc = FindFileComment(pWork, bCopyStrings);
-    if (rc < 0) return rc;
-
-    // add every entry in the file to the data table
-    while (FindEntry(pWork, pSection, pItem, pVal, pComment)) {
-        rc = AddEntry(pSection, pItem, pVal, pComment, false, bCopyStrings);
-        if (rc < 0) return rc;
-    }
-
-    // store these strings if we didn't copy them
-    if (bCopyStrings) {
-        delete[] pData;
-    }
-    else {
-        m_pData = pData;
-        m_uDataLen = uLen+1;
-    }
-
-    return SI_OK;
-}
-
-#ifdef SI_SUPPORT_IOSTREAMS
-template
-SI_Error
-CSimpleIniTempl::LoadData(
-    std::istream & a_istream
-    )
-{
-    std::string strData;
-    char szBuf[512];
-    do {
-        a_istream.get(szBuf, sizeof(szBuf), '\0');
-        strData.append(szBuf);
-    }
-    while (a_istream.good());
-    return LoadData(strData);
-}
-#endif // SI_SUPPORT_IOSTREAMS
-
-template
-SI_Error
-CSimpleIniTempl::FindFileComment(
-    SI_CHAR *&      a_pData,
-    bool            a_bCopyStrings
-    )
-{
-    // there can only be a single file comment
-    if (m_pFileComment) {
-        return SI_OK;
-    }
-
-    // Load the file comment as multi-line text, this will modify all of
-    // the newline characters to be single \n chars
-    if (!LoadMultiLineText(a_pData, m_pFileComment, NULL, false)) {
-        return SI_OK;
-    }
-
-    // copy the string if necessary
-    if (a_bCopyStrings) {
-        SI_Error rc = CopyString(m_pFileComment);
-        if (rc < 0) return rc;
-    }
-
-    return SI_OK;
-}
-
-template
-bool
-CSimpleIniTempl::FindEntry(
-    SI_CHAR *&        a_pData,
-    const SI_CHAR *&  a_pSection,
-    const SI_CHAR *&  a_pKey,
-    const SI_CHAR *&  a_pVal,
-    const SI_CHAR *&  a_pComment
-    ) const
-{
-    a_pComment = NULL;
-
-    SI_CHAR * pTrail = NULL;
-    while (*a_pData) {
-        // skip spaces and empty lines
-        while (*a_pData && IsSpace(*a_pData)) {
-            ++a_pData;
-        }
-        if (!*a_pData) {
-            break;
-        }
-
-        // skip processing of comment lines but keep a pointer to
-        // the start of the comment.
-        if (IsComment(*a_pData)) {
-            LoadMultiLineText(a_pData, a_pComment, NULL, true);
-            continue;
-        }
-
-        // process section names
-        if (*a_pData == '[') {
-            // skip leading spaces
-            ++a_pData;
-            while (*a_pData && IsSpace(*a_pData)) {
-                ++a_pData;
-            }
-
-            // find the end of the section name (it may contain spaces)
-            // and convert it to lowercase as necessary
-            a_pSection = a_pData;
-            while (*a_pData && *a_pData != ']' && !IsNewLineChar(*a_pData)) {
-                ++a_pData;
-            }
-
-            // if it's an invalid line, just skip it
-            if (*a_pData != ']') {
-                continue;
-            }
-
-            // remove trailing spaces from the section
-            pTrail = a_pData - 1;
-            while (pTrail >= a_pSection && IsSpace(*pTrail)) {
-                --pTrail;
-            }
-            ++pTrail;
-            *pTrail = 0;
-
-            // skip to the end of the line
-            ++a_pData;  // safe as checked that it == ']' above
-            while (*a_pData && !IsNewLineChar(*a_pData)) {
-                ++a_pData;
-            }
-
-            a_pKey = NULL;
-            a_pVal = NULL;
-            return true;
-        }
-
-        // find the end of the key name (it may contain spaces)
-        // and convert it to lowercase as necessary
-        a_pKey = a_pData;
-        while (*a_pData && *a_pData != '=' && !IsNewLineChar(*a_pData)) {
-            ++a_pData;
-        }
-
-        // if it's an invalid line, just skip it
-        if (*a_pData != '=') {
-            continue;
-        }
-
-        // empty keys are invalid
-        if (a_pKey == a_pData) {
-            while (*a_pData && !IsNewLineChar(*a_pData)) {
-                ++a_pData;
-            }
-            continue;
-        }
-
-        // remove trailing spaces from the key
-        pTrail = a_pData - 1;
-        while (pTrail >= a_pKey && IsSpace(*pTrail)) {
-            --pTrail;
-        }
-        ++pTrail;
-        *pTrail = 0;
-
-        // skip leading whitespace on the value
-        ++a_pData;  // safe as checked that it == '=' above
-        while (*a_pData && !IsNewLineChar(*a_pData) && IsSpace(*a_pData)) {
-            ++a_pData;
-        }
-
-        // find the end of the value which is the end of this line
-        a_pVal = a_pData;
-        while (*a_pData && !IsNewLineChar(*a_pData)) {
-            ++a_pData;
-        }
-
-        // remove trailing spaces from the value
-        pTrail = a_pData - 1;
-        if (*a_pData) { // prepare for the next round
-            SkipNewLine(a_pData);
-        }
-        while (pTrail >= a_pVal && IsSpace(*pTrail)) {
-            --pTrail;
-        }
-        ++pTrail;
-        *pTrail = 0;
-
-        // check for multi-line entries
-        if (m_bAllowMultiLine && IsMultiLineTag(a_pVal)) {
-            // skip the "<<<" to get the tag that will end the multiline
-            const SI_CHAR * pTagName = a_pVal + 3;
-            return LoadMultiLineText(a_pData, a_pVal, pTagName);
-        }
-
-        // return the standard entry
-        return true;
-    }
-
-    return false;
-}
-
-template
-bool
-CSimpleIniTempl::IsMultiLineTag(
-    const SI_CHAR * a_pVal
-    ) const
-{
-    // check for the "<<<" prefix for a multi-line entry
-    if (*a_pVal++ != '<') return false;
-    if (*a_pVal++ != '<') return false;
-    if (*a_pVal++ != '<') return false;
-    return true;
-}
-
-template
-bool
-CSimpleIniTempl::IsMultiLineData(
-    const SI_CHAR * a_pData
-    ) const
-{
-    // data is multi-line if it has any of the following features:
-    //  * whitespace prefix
-    //  * embedded newlines
-    //  * whitespace suffix
-
-    // empty string
-    if (!*a_pData) {
-        return false;
-    }
-
-    // check for prefix
-    if (IsSpace(*a_pData)) {
-        return true;
-    }
-
-    // embedded newlines
-    while (*a_pData) {
-        if (IsNewLineChar(*a_pData)) {
-            return true;
-        }
-        ++a_pData;
-    }
-
-    // check for suffix
-    if (IsSpace(*--a_pData)) {
-        return true;
-    }
-
-    return false;
-}
-
-template
-bool
-CSimpleIniTempl::IsNewLineChar(
-    SI_CHAR a_c
-    ) const
-{
-    return (a_c == '\n' || a_c == '\r');
-}
-
-template
-bool
-CSimpleIniTempl::LoadMultiLineText(
-    SI_CHAR *&          a_pData,
-    const SI_CHAR *&    a_pVal,
-    const SI_CHAR *     a_pTagName,
-    bool                a_bAllowBlankLinesInComment
-    ) const
-{
-    // we modify this data to strip all newlines down to a single '\n'
-    // character. This means that on Windows we need to strip out some
-    // characters which will make the data shorter.
-    // i.e.  LINE1-LINE1\r\nLINE2-LINE2\0 will become
-    //       LINE1-LINE1\nLINE2-LINE2\0
-    // The pDataLine entry is the pointer to the location in memory that
-    // the current line needs to start to run following the existing one.
-    // This may be the same as pCurrLine in which case no move is needed.
-    SI_CHAR * pDataLine = a_pData;
-    SI_CHAR * pCurrLine;
-
-    // value starts at the current line
-    a_pVal = a_pData;
-
-    // find the end tag. This tag must start in column 1 and be
-    // followed by a newline. We ignore any whitespace after the end
-    // tag but not whitespace before it.
-    SI_CHAR cEndOfLineChar = *a_pData;
-    for(;;) {
-        // if we are loading comments then we need a comment character as
-        // the first character on every line
-        if (!a_pTagName && !IsComment(*a_pData)) {
-            // if we aren't allowing blank lines then we're done
-            if (!a_bAllowBlankLinesInComment) {
-                break;
-            }
-
-            // if we are allowing blank lines then we only include them
-            // in this comment if another comment follows, so read ahead
-            // to find out.
-            SI_CHAR * pCurr = a_pData;
-            int nNewLines = 0;
-            while (IsSpace(*pCurr)) {
-                if (IsNewLineChar(*pCurr)) {
-                    ++nNewLines;
-                    SkipNewLine(pCurr);
-                }
-                else {
-                    ++pCurr;
-                }
-            }
-
-            // we have a comment, add the blank lines to the output
-            // and continue processing from here
-            if (IsComment(*pCurr)) {
-                for (; nNewLines > 0; --nNewLines) *pDataLine++ = '\n';
-                a_pData = pCurr;
-                continue;
-            }
-
-            // the comment ends here
-            break;
-        }
-
-        // find the end of this line
-        pCurrLine = a_pData;
-        while (*a_pData && !IsNewLineChar(*a_pData)) ++a_pData;
-
-        // move this line down to the location that it should be if necessary
-        if (pDataLine < pCurrLine) {
-            size_t nLen = (size_t) (a_pData - pCurrLine);
-            memmove(pDataLine, pCurrLine, nLen * sizeof(SI_CHAR));
-            pDataLine[nLen] = '\0';
-        }
-
-        // end the line with a NULL
-        cEndOfLineChar = *a_pData;
-        *a_pData = 0;
-
-        // if are looking for a tag then do the check now. This is done before
-        // checking for end of the data, so that if we have the tag at the end
-        // of the data then the tag is removed correctly.
-        if (a_pTagName) {
-            // strip whitespace from the end of this tag
-            SI_CHAR* pc = a_pData - 1;
-            while (pc > pDataLine && IsSpace(*pc)) --pc;
-            SI_CHAR ch = *++pc;
-            *pc = 0;
-
-            if (!IsLess(pDataLine, a_pTagName) && !IsLess(a_pTagName, pDataLine)) {
-                break;
-            }
-
-            *pc = ch;
-        }
-
-        // if we are at the end of the data then we just automatically end
-        // this entry and return the current data.
-        if (!cEndOfLineChar) {
-            return true;
-        }
-
-        // otherwise we need to process this newline to ensure that it consists
-        // of just a single \n character.
-        pDataLine += (a_pData - pCurrLine);
-        *a_pData = cEndOfLineChar;
-        SkipNewLine(a_pData);
-        *pDataLine++ = '\n';
-    }
-
-    // if we didn't find a comment at all then return false
-    if (a_pVal == a_pData) {
-        a_pVal = NULL;
-        return false;
-    }
-
-    // the data (which ends at the end of the last line) needs to be
-    // null-terminated BEFORE before the newline character(s). If the
-    // user wants a new line in the multi-line data then they need to
-    // add an empty line before the tag.
-    *--pDataLine = '\0';
-
-    // if looking for a tag and if we aren't at the end of the data,
-    // then move a_pData to the start of the next line.
-    if (a_pTagName && cEndOfLineChar) {
-        SI_ASSERT(IsNewLineChar(cEndOfLineChar));
-        *a_pData = cEndOfLineChar;
-        SkipNewLine(a_pData);
-    }
-
-    return true;
-}
-
-template
-SI_Error
-CSimpleIniTempl::CopyString(
-    const SI_CHAR *& a_pString
-    )
-{
-    size_t uLen = 0;
-    if (sizeof(SI_CHAR) == sizeof(char)) {
-        uLen = strlen((const char *)a_pString);
-    }
-    else if (sizeof(SI_CHAR) == sizeof(wchar_t)) {
-        uLen = wcslen((const wchar_t *)a_pString);
-    }
-    else {
-        for ( ; a_pString[uLen]; ++uLen) /*loop*/ ;
-    }
-    ++uLen; // NULL character
-    SI_CHAR * pCopy = new(std::nothrow) SI_CHAR[uLen];
-    if (!pCopy) {
-        return SI_NOMEM;
-    }
-    memcpy(pCopy, a_pString, sizeof(SI_CHAR)*uLen);
-    m_strings.push_back(pCopy);
-    a_pString = pCopy;
-    return SI_OK;
-}
-
-template
-SI_Error
-CSimpleIniTempl::AddEntry(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    const SI_CHAR * a_pValue,
-    const SI_CHAR * a_pComment,
-    bool            a_bForceReplace,
-    bool            a_bCopyStrings
-    )
-{
-    SI_Error rc;
-    bool bInserted = false;
-
-    SI_ASSERT(!a_pComment || IsComment(*a_pComment));
-
-    // if we are copying strings then make a copy of the comment now
-    // because we will need it when we add the entry.
-    if (a_bCopyStrings && a_pComment) {
-        rc = CopyString(a_pComment);
-        if (rc < 0) return rc;
-    }
-
-    // create the section entry if necessary
-    typename TSection::iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        // if the section doesn't exist then we need a copy as the
-        // string needs to last beyond the end of this function
-        if (a_bCopyStrings) {
-            rc = CopyString(a_pSection);
-            if (rc < 0) return rc;
-        }
-
-        // only set the comment if this is a section only entry
-        Entry oSection(a_pSection, ++m_nOrder);
-        if (a_pComment && (!a_pKey || !a_pValue)) {
-            oSection.pComment = a_pComment;
-        }
-
-        typename TSection::value_type oEntry(oSection, TKeyVal());
-        typedef typename TSection::iterator SectionIterator;
-        std::pair i = m_data.insert(oEntry);
-        iSection = i.first;
-        bInserted = true;
-    }
-    if (!a_pKey || !a_pValue) {
-        // section only entries are specified with pItem and pVal as NULL
-        return bInserted ? SI_INSERTED : SI_UPDATED;
-    }
-
-    // check for existence of the key
-    TKeyVal & keyval = iSection->second;
-    typename TKeyVal::iterator iKey = keyval.find(a_pKey);
-    bInserted = iKey == keyval.end();
-
-    // remove all existing entries but save the load order and
-    // comment of the first entry
-    int nLoadOrder = ++m_nOrder;
-    if (iKey != keyval.end() && m_bAllowMultiKey && a_bForceReplace) {
-        const SI_CHAR * pComment = NULL;
-        while (iKey != keyval.end() && !IsLess(a_pKey, iKey->first.pItem)) {
-            if (iKey->first.nOrder < nLoadOrder) {
-                nLoadOrder = iKey->first.nOrder;
-                pComment   = iKey->first.pComment;
-            }
-            ++iKey;
-        }
-        if (pComment) {
-            DeleteString(a_pComment);
-            a_pComment = pComment;
-            CopyString(a_pComment);
-        }
-        Delete(a_pSection, a_pKey);
-        iKey = keyval.end();
-    }
-
-    // make string copies if necessary
-    bool bForceCreateNewKey = m_bAllowMultiKey && !a_bForceReplace;
-    if (a_bCopyStrings) {
-        if (bForceCreateNewKey || iKey == keyval.end()) {
-            // if the key doesn't exist then we need a copy as the
-            // string needs to last beyond the end of this function
-            // because we will be inserting the key next
-            rc = CopyString(a_pKey);
-            if (rc < 0) return rc;
-        }
-
-        // we always need a copy of the value
-        rc = CopyString(a_pValue);
-        if (rc < 0) return rc;
-    }
-
-    // create the key entry
-    if (iKey == keyval.end() || bForceCreateNewKey) {
-        Entry oKey(a_pKey, nLoadOrder);
-        if (a_pComment) {
-            oKey.pComment = a_pComment;
-        }
-        typename TKeyVal::value_type oEntry(oKey, static_cast(NULL));
-        iKey = keyval.insert(oEntry);
-    }
-
-    iKey->second = a_pValue;
-    return bInserted ? SI_INSERTED : SI_UPDATED;
-}
-
-template
-const SI_CHAR *
-CSimpleIniTempl::GetValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    const SI_CHAR * a_pDefault,
-    bool *          a_pHasMultiple
-    ) const
-{
-    if (a_pHasMultiple) {
-        *a_pHasMultiple = false;
-    }
-    if (!a_pSection || !a_pKey) {
-        return a_pDefault;
-    }
-    typename TSection::const_iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        return a_pDefault;
-    }
-    typename TKeyVal::const_iterator iKeyVal = iSection->second.find(a_pKey);
-    if (iKeyVal == iSection->second.end()) {
-        return a_pDefault;
-    }
-
-    // check for multiple entries with the same key
-    if (m_bAllowMultiKey && a_pHasMultiple) {
-        typename TKeyVal::const_iterator iTemp = iKeyVal;
-        if (++iTemp != iSection->second.end()) {
-            if (!IsLess(a_pKey, iTemp->first.pItem)) {
-                *a_pHasMultiple = true;
-            }
-        }
-    }
-
-    return iKeyVal->second;
-}
-
-template
-long
-CSimpleIniTempl::GetLongValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    long            a_nDefault,
-    bool *          a_pHasMultiple
-    ) const
-{
-    // return the default if we don't have a value
-    const SI_CHAR * pszValue = GetValue(a_pSection, a_pKey, NULL, a_pHasMultiple);
-    if (!pszValue || !*pszValue) return a_nDefault;
-
-    // convert to UTF-8/MBCS which for a numeric value will be the same as ASCII
-    char szValue[64] = { 0 };
-    SI_CONVERTER c(m_bStoreIsUtf8);
-    if (!c.ConvertToStore(pszValue, szValue, sizeof(szValue))) {
-        return a_nDefault;
-    }
-
-    // handle the value as hex if prefaced with "0x"
-    long nValue = a_nDefault;
-    char * pszSuffix = szValue;
-    if (szValue[0] == '0' && (szValue[1] == 'x' || szValue[1] == 'X')) {
-    	if (!szValue[2]) return a_nDefault;
-        nValue = strtol(&szValue[2], &pszSuffix, 16);
-    }
-    else {
-        nValue = strtol(szValue, &pszSuffix, 10);
-    }
-
-    // any invalid strings will return the default value
-    if (*pszSuffix) { 
-        return a_nDefault; 
-    }
-
-    return nValue;
-}
-
-template
-SI_Error 
-CSimpleIniTempl::SetLongValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    long            a_nValue,
-    const SI_CHAR * a_pComment,
-    bool            a_bUseHex,
-    bool            a_bForceReplace
-    )
-{
-    // use SetValue to create sections
-    if (!a_pSection || !a_pKey) return SI_FAIL;
-
-    // convert to an ASCII string
-    char szInput[64];
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-    sprintf_s(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue);
-#else // !__STDC_WANT_SECURE_LIB__
-    sprintf(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue);
-#endif // __STDC_WANT_SECURE_LIB__
-
-    // convert to output text
-    SI_CHAR szOutput[64];
-    SI_CONVERTER c(m_bStoreIsUtf8);
-    c.ConvertFromStore(szInput, strlen(szInput) + 1, 
-        szOutput, sizeof(szOutput) / sizeof(SI_CHAR));
-
-    // actually add it
-    return AddEntry(a_pSection, a_pKey, szOutput, a_pComment, a_bForceReplace, true);
-}
-
-template
-double
-CSimpleIniTempl::GetDoubleValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    double          a_nDefault,
-    bool *          a_pHasMultiple
-    ) const
-{
-    // return the default if we don't have a value
-    const SI_CHAR * pszValue = GetValue(a_pSection, a_pKey, NULL, a_pHasMultiple);
-    if (!pszValue || !*pszValue) return a_nDefault;
-
-    // convert to UTF-8/MBCS which for a numeric value will be the same as ASCII
-    char szValue[64] = { 0 };
-    SI_CONVERTER c(m_bStoreIsUtf8);
-    if (!c.ConvertToStore(pszValue, szValue, sizeof(szValue))) {
-        return a_nDefault;
-    }
-
-    char * pszSuffix = NULL;
-    double nValue = strtod(szValue, &pszSuffix);
-
-    // any invalid strings will return the default value
-    if (!pszSuffix || *pszSuffix) { 
-        return a_nDefault; 
-    }
-
-    return nValue;
-}
-
-template
-SI_Error 
-CSimpleIniTempl::SetDoubleValue(
-	const SI_CHAR * a_pSection,
-	const SI_CHAR * a_pKey,
-	double          a_nValue,
-	const SI_CHAR * a_pComment,
-	bool            a_bForceReplace
-	)
-{
-	// use SetValue to create sections
-	if (!a_pSection || !a_pKey) return SI_FAIL;
-
-	// convert to an ASCII string
-	char szInput[64];
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-	sprintf_s(szInput, "%f", a_nValue);
-#else // !__STDC_WANT_SECURE_LIB__
-	sprintf(szInput, "%f", a_nValue);
-#endif // __STDC_WANT_SECURE_LIB__
-
-	// convert to output text
-	SI_CHAR szOutput[64];
-	SI_CONVERTER c(m_bStoreIsUtf8);
-	c.ConvertFromStore(szInput, strlen(szInput) + 1, 
-		szOutput, sizeof(szOutput) / sizeof(SI_CHAR));
-
-	// actually add it
-	return AddEntry(a_pSection, a_pKey, szOutput, a_pComment, a_bForceReplace, true);
-}
-
-template
-bool
-CSimpleIniTempl::GetBoolValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    bool            a_bDefault,
-    bool *          a_pHasMultiple
-    ) const
-{
-    // return the default if we don't have a value
-    const SI_CHAR * pszValue = GetValue(a_pSection, a_pKey, NULL, a_pHasMultiple);
-    if (!pszValue || !*pszValue) return a_bDefault;
-
-    // we only look at the minimum number of characters
-    switch (pszValue[0]) {
-    case 't': case 'T': // true
-    case 'y': case 'Y': // yes
-    case '1':           // 1 (one)
-        return true;
-
-    case 'f': case 'F': // false
-    case 'n': case 'N': // no
-    case '0':           // 0 (zero)
-        return false;
-
-    case 'o': case 'O':
-        if (pszValue[1] == 'n' || pszValue[1] == 'N') return true;  // on
-        if (pszValue[1] == 'f' || pszValue[1] == 'F') return false; // off
-        break;
-    }
-
-    // no recognized value, return the default
-    return a_bDefault;
-}
-
-template
-SI_Error 
-CSimpleIniTempl::SetBoolValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    bool            a_bValue,
-    const SI_CHAR * a_pComment,
-    bool            a_bForceReplace
-    )
-{
-    // use SetValue to create sections
-    if (!a_pSection || !a_pKey) return SI_FAIL;
-
-    // convert to an ASCII string
-    const char * pszInput = a_bValue ? "true" : "false";
-
-    // convert to output text
-    SI_CHAR szOutput[64];
-    SI_CONVERTER c(m_bStoreIsUtf8);
-    c.ConvertFromStore(pszInput, strlen(pszInput) + 1, 
-        szOutput, sizeof(szOutput) / sizeof(SI_CHAR));
-
-    // actually add it
-    return AddEntry(a_pSection, a_pKey, szOutput, a_pComment, a_bForceReplace, true);
-}
-    
-template
-bool
-CSimpleIniTempl::GetAllValues(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    TNamesDepend &  a_values
-    ) const
-{
-    a_values.clear();
-
-    if (!a_pSection || !a_pKey) {
-        return false;
-    }
-    typename TSection::const_iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        return false;
-    }
-    typename TKeyVal::const_iterator iKeyVal = iSection->second.find(a_pKey);
-    if (iKeyVal == iSection->second.end()) {
-        return false;
-    }
-
-    // insert all values for this key
-    a_values.push_back(Entry(iKeyVal->second, iKeyVal->first.pComment, iKeyVal->first.nOrder));
-    if (m_bAllowMultiKey) {
-        ++iKeyVal;
-        while (iKeyVal != iSection->second.end() && !IsLess(a_pKey, iKeyVal->first.pItem)) {
-            a_values.push_back(Entry(iKeyVal->second, iKeyVal->first.pComment, iKeyVal->first.nOrder));
-            ++iKeyVal;
-        }
-    }
-
-    return true;
-}
-
-template
-int
-CSimpleIniTempl::GetSectionSize(
-    const SI_CHAR * a_pSection
-    ) const
-{
-    if (!a_pSection) {
-        return -1;
-    }
-
-    typename TSection::const_iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        return -1;
-    }
-    const TKeyVal & section = iSection->second;
-
-    // if multi-key isn't permitted then the section size is
-    // the number of keys that we have.
-    if (!m_bAllowMultiKey || section.empty()) {
-        return (int) section.size();
-    }
-
-    // otherwise we need to count them
-    int nCount = 0;
-    const SI_CHAR * pLastKey = NULL;
-    typename TKeyVal::const_iterator iKeyVal = section.begin();
-    for (int n = 0; iKeyVal != section.end(); ++iKeyVal, ++n) {
-        if (!pLastKey || IsLess(pLastKey, iKeyVal->first.pItem)) {
-            ++nCount;
-            pLastKey = iKeyVal->first.pItem;
-        }
-    }
-    return nCount;
-}
-
-template
-const typename CSimpleIniTempl::TKeyVal *
-CSimpleIniTempl::GetSection(
-    const SI_CHAR * a_pSection
-    ) const
-{
-    if (a_pSection) {
-        typename TSection::const_iterator i = m_data.find(a_pSection);
-        if (i != m_data.end()) {
-            return &(i->second);
-        }
-    }
-    return 0;
-}
-
-template
-void
-CSimpleIniTempl::GetAllSections(
-    TNamesDepend & a_names
-    ) const
-{
-    a_names.clear();
-    typename TSection::const_iterator i = m_data.begin();
-    for (int n = 0; i != m_data.end(); ++i, ++n ) {
-        a_names.push_back(i->first);
-    }
-}
-
-template
-bool
-CSimpleIniTempl::GetAllKeys(
-    const SI_CHAR * a_pSection,
-    TNamesDepend &  a_names
-    ) const
-{
-    a_names.clear();
-
-    if (!a_pSection) {
-        return false;
-    }
-
-    typename TSection::const_iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        return false;
-    }
-
-    const TKeyVal & section = iSection->second;
-    const SI_CHAR * pLastKey = NULL;
-    typename TKeyVal::const_iterator iKeyVal = section.begin();
-    for (int n = 0; iKeyVal != section.end(); ++iKeyVal, ++n ) {
-        if (!pLastKey || IsLess(pLastKey, iKeyVal->first.pItem)) {
-            a_names.push_back(iKeyVal->first);
-            pLastKey = iKeyVal->first.pItem;
-        }
-    }
-
-    return true;
-}
-
-template
-SI_Error
-CSimpleIniTempl::SaveFile(
-    const char *    a_pszFile,
-    bool            a_bAddSignature
-    ) const
-{
-    FILE * fp = NULL;
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-    fopen_s(&fp, a_pszFile, "wb");
-#else // !__STDC_WANT_SECURE_LIB__
-    fp = fopen(a_pszFile, "wb");
-#endif // __STDC_WANT_SECURE_LIB__
-    if (!fp) return SI_FILE;
-    SI_Error rc = SaveFile(fp, a_bAddSignature);
-    fclose(fp);
-    return rc;
-}
-
-#ifdef SI_HAS_WIDE_FILE
-template
-SI_Error
-CSimpleIniTempl::SaveFile(
-    const SI_WCHAR_T *  a_pwszFile,
-    bool                a_bAddSignature
-    ) const
-{
-#ifdef _WIN32
-    FILE * fp = NULL;
-#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-    _wfopen_s(&fp, a_pwszFile, L"wb");
-#else // !__STDC_WANT_SECURE_LIB__
-    fp = _wfopen(a_pwszFile, L"wb");
-#endif // __STDC_WANT_SECURE_LIB__
-    if (!fp) return SI_FILE;
-    SI_Error rc = SaveFile(fp, a_bAddSignature);
-    fclose(fp);
-    return rc;
-#else // !_WIN32 (therefore SI_CONVERT_ICU)
-    char szFile[256];
-    u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
-    return SaveFile(szFile, a_bAddSignature);
-#endif // _WIN32
-}
-#endif // SI_HAS_WIDE_FILE
-
-template
-SI_Error
-CSimpleIniTempl::SaveFile(
-    FILE *  a_pFile,
-    bool    a_bAddSignature
-    ) const
-{
-    FileWriter writer(a_pFile);
-    return Save(writer, a_bAddSignature);
-}
-
-template
-SI_Error
-CSimpleIniTempl::Save(
-    OutputWriter &  a_oOutput,
-    bool            a_bAddSignature
-    ) const
-{
-    Converter convert(m_bStoreIsUtf8);
-
-    // add the UTF-8 signature if it is desired
-    if (m_bStoreIsUtf8 && a_bAddSignature) {
-        a_oOutput.Write(SI_UTF8_SIGNATURE);
-    }
-
-    // get all of the sections sorted in load order
-    TNamesDepend oSections;
-    GetAllSections(oSections);
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-    oSections.sort();
-#elif defined(__BORLANDC__)
-    oSections.sort(Entry::LoadOrder());
-#else
-    oSections.sort(typename Entry::LoadOrder());
-#endif
-
-    // if there is an empty section name, then it must be written out first
-    // regardless of the load order
-    typename TNamesDepend::iterator is = oSections.begin();
-    for (; is != oSections.end(); ++is) {
-        if (!*is->pItem) {
-            // move the empty section name to the front of the section list
-            if (is != oSections.begin()) {
-                oSections.splice(oSections.begin(), oSections, is, std::next(is));
-            }
-            break;
-        }
-    }
-
-    // write the file comment if we have one
-    bool bNeedNewLine = false;
-    if (m_pFileComment) {
-        if (!OutputMultiLineText(a_oOutput, convert, m_pFileComment)) {
-            return SI_FAIL;
-        }
-        bNeedNewLine = true;
-    }
-
-    // iterate through our sections and output the data
-    typename TNamesDepend::const_iterator iSection = oSections.begin();
-    for ( ; iSection != oSections.end(); ++iSection ) {
-        // write out the comment if there is one
-        if (iSection->pComment) {
-            if (bNeedNewLine) {
-                a_oOutput.Write(SI_NEWLINE_A);
-                a_oOutput.Write(SI_NEWLINE_A);
-            }
-            if (!OutputMultiLineText(a_oOutput, convert, iSection->pComment)) {
-                return SI_FAIL;
-            }
-            bNeedNewLine = false;
-        }
-
-        if (bNeedNewLine) {
-            a_oOutput.Write(SI_NEWLINE_A);
-            a_oOutput.Write(SI_NEWLINE_A);
-            bNeedNewLine = false;
-        }
-
-        // write the section (unless there is no section name)
-        if (*iSection->pItem) {
-            if (!convert.ConvertToStore(iSection->pItem)) {
-                return SI_FAIL;
-            }
-            a_oOutput.Write("[");
-            a_oOutput.Write(convert.Data());
-            a_oOutput.Write("]");
-            a_oOutput.Write(SI_NEWLINE_A);
-        }
-
-        // get all of the keys sorted in load order
-        TNamesDepend oKeys;
-        GetAllKeys(iSection->pItem, oKeys);
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-        oKeys.sort();
-#elif defined(__BORLANDC__)
-        oKeys.sort(Entry::LoadOrder());
-#else
-        oKeys.sort(typename Entry::LoadOrder());
-#endif
-
-        // write all keys and values
-        typename TNamesDepend::const_iterator iKey = oKeys.begin();
-        for ( ; iKey != oKeys.end(); ++iKey) {
-            // get all values for this key
-            TNamesDepend oValues;
-            GetAllValues(iSection->pItem, iKey->pItem, oValues);
-
-            typename TNamesDepend::const_iterator iValue = oValues.begin();
-            for ( ; iValue != oValues.end(); ++iValue) {
-                // write out the comment if there is one
-                if (iValue->pComment) {
-                    a_oOutput.Write(SI_NEWLINE_A);
-                    if (!OutputMultiLineText(a_oOutput, convert, iValue->pComment)) {
-                        return SI_FAIL;
-                    }
-                }
-
-                // write the key
-                if (!convert.ConvertToStore(iKey->pItem)) {
-                    return SI_FAIL;
-                }
-                a_oOutput.Write(convert.Data());
-
-                // write the value
-                if (!convert.ConvertToStore(iValue->pItem)) {
-                    return SI_FAIL;
-                }
-                a_oOutput.Write(m_bSpaces ? " = " : "=");
-                if (m_bAllowMultiLine && IsMultiLineData(iValue->pItem)) {
-                    // multi-line data needs to be processed specially to ensure
-                    // that we use the correct newline format for the current system
-                    a_oOutput.Write("<<pItem)) {
-                        return SI_FAIL;
-                    }
-                    a_oOutput.Write("END_OF_TEXT");
-                }
-                else {
-                    a_oOutput.Write(convert.Data());
-                }
-                a_oOutput.Write(SI_NEWLINE_A);
-            }
-        }
-
-        bNeedNewLine = true;
-    }
-
-    return SI_OK;
-}
-
-template
-bool
-CSimpleIniTempl::OutputMultiLineText(
-    OutputWriter &  a_oOutput,
-    Converter &     a_oConverter,
-    const SI_CHAR * a_pText
-    ) const
-{
-    const SI_CHAR * pEndOfLine;
-    SI_CHAR cEndOfLineChar = *a_pText;
-    while (cEndOfLineChar) {
-        // find the end of this line
-        pEndOfLine = a_pText;
-        for (; *pEndOfLine && *pEndOfLine != '\n'; ++pEndOfLine) /*loop*/ ;
-        cEndOfLineChar = *pEndOfLine;
-
-        // temporarily null terminate, convert and output the line
-        *const_cast(pEndOfLine) = 0;
-        if (!a_oConverter.ConvertToStore(a_pText)) {
-            return false;
-        }
-        *const_cast(pEndOfLine) = cEndOfLineChar;
-        a_pText += (pEndOfLine - a_pText) + 1;
-        a_oOutput.Write(a_oConverter.Data());
-        a_oOutput.Write(SI_NEWLINE_A);
-    }
-    return true;
-}
-
-template
-bool
-CSimpleIniTempl::Delete(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    bool            a_bRemoveEmpty
-    )
-{
-    return DeleteValue(a_pSection, a_pKey, NULL, a_bRemoveEmpty);
-}
-
-template
-bool
-CSimpleIniTempl::DeleteValue(
-    const SI_CHAR * a_pSection,
-    const SI_CHAR * a_pKey,
-    const SI_CHAR * a_pValue,
-    bool            a_bRemoveEmpty
-    )
-{
-    if (!a_pSection) {
-        return false;
-    }
-
-    typename TSection::iterator iSection = m_data.find(a_pSection);
-    if (iSection == m_data.end()) {
-        return false;
-    }
-
-    // remove a single key if we have a keyname
-    if (a_pKey) {
-        typename TKeyVal::iterator iKeyVal = iSection->second.find(a_pKey);
-        if (iKeyVal == iSection->second.end()) {
-            return false;
-        }
-
-        const static SI_STRLESS isLess = SI_STRLESS();
-
-        // remove any copied strings and then the key
-        typename TKeyVal::iterator iDelete;
-        bool bDeleted = false;
-        do {
-            iDelete = iKeyVal++;
-
-            if(a_pValue == NULL ||
-            (isLess(a_pValue, iDelete->second) == false &&
-            isLess(iDelete->second, a_pValue) == false)) {
-                DeleteString(iDelete->first.pItem);
-                DeleteString(iDelete->second);
-                iSection->second.erase(iDelete);
-                bDeleted = true;
-            }
-        }
-        while (iKeyVal != iSection->second.end()
-            && !IsLess(a_pKey, iKeyVal->first.pItem));
-
-        if(!bDeleted) {
-            return false;
-        }
-
-        // done now if the section is not empty or we are not pruning away
-        // the empty sections. Otherwise let it fall through into the section
-        // deletion code
-        if (!a_bRemoveEmpty || !iSection->second.empty()) {
-            return true;
-        }
-    }
-    else {
-        // delete all copied strings from this section. The actual
-        // entries will be removed when the section is removed.
-        typename TKeyVal::iterator iKeyVal = iSection->second.begin();
-        for ( ; iKeyVal != iSection->second.end(); ++iKeyVal) {
-            DeleteString(iKeyVal->first.pItem);
-            DeleteString(iKeyVal->second);
-        }
-    }
-
-    // delete the section itself
-    DeleteString(iSection->first.pItem);
-    m_data.erase(iSection);
-
-    return true;
-}
-
-template
-void
-CSimpleIniTempl::DeleteString(
-    const SI_CHAR * a_pString
-    )
-{
-    // strings may exist either inside the data block, or they will be
-    // individually allocated and stored in m_strings. We only physically
-    // delete those stored in m_strings.
-    if (a_pString < m_pData || a_pString >= m_pData + m_uDataLen) {
-        typename TNamesDepend::iterator i = m_strings.begin();
-        for (;i != m_strings.end(); ++i) {
-            if (a_pString == i->pItem) {
-                delete[] const_cast(i->pItem);
-                m_strings.erase(i);
-                break;
-            }
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------
-//                              CONVERSION FUNCTIONS
-// ---------------------------------------------------------------------------
-
-// Defines the conversion classes for different libraries. Before including
-// SimpleIni.h, set the converter that you wish you use by defining one of the
-// following symbols.
-//
-//  SI_NO_CONVERSION        Do not make the "W" wide character version of the 
-//                          library available. Only CSimpleIniA etc is defined.
-//  SI_CONVERT_GENERIC      Use the Unicode reference conversion library in
-//                          the accompanying files ConvertUTF.h/c
-//  SI_CONVERT_ICU          Use the IBM ICU conversion library. Requires
-//                          ICU headers on include path and icuuc.lib
-//  SI_CONVERT_WIN32        Use the Win32 API functions for conversion.
-
-#if !defined(SI_NO_CONVERSION) && !defined(SI_CONVERT_GENERIC) && !defined(SI_CONVERT_WIN32) && !defined(SI_CONVERT_ICU)
-# ifdef _WIN32
-#  define SI_CONVERT_WIN32
-# else
-#  define SI_CONVERT_GENERIC
-# endif
-#endif
-
-/**
- * Generic case-sensitive less than comparison. This class returns numerically
- * ordered ASCII case-sensitive text for all possible sizes and types of
- * SI_CHAR.
- */
-template
-struct SI_GenericCase {
-    bool operator()(const SI_CHAR * pLeft, const SI_CHAR * pRight) const {
-        long cmp;
-        for ( ;*pLeft && *pRight; ++pLeft, ++pRight) {
-            cmp = (long) *pLeft - (long) *pRight;
-            if (cmp != 0) {
-                return cmp < 0;
-            }
-        }
-        return *pRight != 0;
-    }
-};
-
-/**
- * Generic ASCII case-insensitive less than comparison. This class returns
- * numerically ordered ASCII case-insensitive text for all possible sizes
- * and types of SI_CHAR. It is not safe for MBCS text comparison where
- * ASCII A-Z characters are used in the encoding of multi-byte characters.
- */
-template
-struct SI_GenericNoCase {
-    inline SI_CHAR locase(SI_CHAR ch) const {
-        return (ch < 'A' || ch > 'Z') ? ch : (ch - 'A' + 'a');
-    }
-    bool operator()(const SI_CHAR * pLeft, const SI_CHAR * pRight) const {
-        long cmp;
-        for ( ;*pLeft && *pRight; ++pLeft, ++pRight) {
-            cmp = (long) locase(*pLeft) - (long) locase(*pRight);
-            if (cmp != 0) {
-                return cmp < 0;
-            }
-        }
-        return *pRight != 0;
-    }
-};
-
-/**
- * Null conversion class for MBCS/UTF-8 to char (or equivalent).
- */
-template
-class SI_ConvertA {
-    bool m_bStoreIsUtf8;
-protected:
-    SI_ConvertA() { }
-public:
-    SI_ConvertA(bool a_bStoreIsUtf8) : m_bStoreIsUtf8(a_bStoreIsUtf8) { }
-
-    /* copy and assignment */
-    SI_ConvertA(const SI_ConvertA & rhs) { operator=(rhs); }
-    SI_ConvertA & operator=(const SI_ConvertA & rhs) {
-        m_bStoreIsUtf8 = rhs.m_bStoreIsUtf8;
-        return *this;
-    }
-
-    /** Calculate the number of SI_CHAR required for converting the input
-     * from the storage format. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @return              Number of SI_CHAR required by the string when
-     *                      converted. If there are embedded NULL bytes in the
-     *                      input data, only the string up and not including
-     *                      the NULL byte will be converted.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen)
-    {
-        (void)a_pInputData;
-        SI_ASSERT(a_uInputDataLen != (size_t) -1);
-
-        // ASCII/MBCS/UTF-8 needs no conversion
-        return a_uInputDataLen;
-    }
-
-    /** Convert the input string from the storage format to SI_CHAR.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @param a_pOutputData Pointer to the output buffer to received the
-     *                      converted data.
-     * @param a_uOutputDataSize Size of the output buffer in SI_CHAR.
-     * @return              true if all of the input data was successfully
-     *                      converted.
-     */
-    bool ConvertFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen,
-        SI_CHAR *       a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        // ASCII/MBCS/UTF-8 needs no conversion
-        if (a_uInputDataLen > a_uOutputDataSize) {
-            return false;
-        }
-        memcpy(a_pOutputData, a_pInputData, a_uInputDataLen);
-        return true;
-    }
-
-    /** Calculate the number of char required by the storage format of this
-     * data. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated string to calculate the number of
-     *                      bytes required to be converted to storage format.
-     * @return              Number of bytes required by the string when
-     *                      converted to storage format. This size always
-     *                      includes space for the terminating NULL character.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeToStore(
-        const SI_CHAR * a_pInputData)
-    {
-        // ASCII/MBCS/UTF-8 needs no conversion
-        return strlen((const char *)a_pInputData) + 1;
-    }
-
-    /** Convert the input string to the storage format of this data.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated source string to convert. All of
-     *                      the data will be converted including the
-     *                      terminating NULL character.
-     * @param a_pOutputData Pointer to the buffer to receive the converted
-     *                      string.
-     * @param a_uOutputDataSize Size of the output buffer in char.
-     * @return              true if all of the input data, including the
-     *                      terminating NULL character was successfully
-     *                      converted.
-     */
-    bool ConvertToStore(
-        const SI_CHAR * a_pInputData,
-        char *          a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        // calc input string length (SI_CHAR type and size independent)
-        size_t uInputLen = strlen((const char *)a_pInputData) + 1;
-        if (uInputLen > a_uOutputDataSize) {
-            return false;
-        }
-
-        // ascii/UTF-8 needs no conversion
-        memcpy(a_pOutputData, a_pInputData, uInputLen);
-        return true;
-    }
-};
-
-
-// ---------------------------------------------------------------------------
-//                              SI_CONVERT_GENERIC
-// ---------------------------------------------------------------------------
-#ifdef SI_CONVERT_GENERIC
-
-#define SI_Case     SI_GenericCase
-#define SI_NoCase   SI_GenericNoCase
-
-#include 
-#include "ConvertUTF.h"
-
-/**
- * Converts UTF-8 to a wchar_t (or equivalent) using the Unicode reference
- * library functions. This can be used on all platforms.
- */
-template
-class SI_ConvertW {
-    bool m_bStoreIsUtf8;
-protected:
-    SI_ConvertW() { }
-public:
-    SI_ConvertW(bool a_bStoreIsUtf8) : m_bStoreIsUtf8(a_bStoreIsUtf8) { }
-
-    /* copy and assignment */
-    SI_ConvertW(const SI_ConvertW & rhs) { operator=(rhs); }
-    SI_ConvertW & operator=(const SI_ConvertW & rhs) {
-        m_bStoreIsUtf8 = rhs.m_bStoreIsUtf8;
-        return *this;
-    }
-
-    /** Calculate the number of SI_CHAR required for converting the input
-     * from the storage format. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @return              Number of SI_CHAR required by the string when
-     *                      converted. If there are embedded NULL bytes in the
-     *                      input data, only the string up and not including
-     *                      the NULL byte will be converted.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen)
-    {
-        SI_ASSERT(a_uInputDataLen != (size_t) -1);
-
-        if (m_bStoreIsUtf8) {
-            // worst case scenario for UTF-8 to wchar_t is 1 char -> 1 wchar_t
-            // so we just return the same number of characters required as for
-            // the source text.
-            return a_uInputDataLen;
-        }
-
-#if defined(SI_NO_MBSTOWCS_NULL) || (!defined(_MSC_VER) && !defined(_linux))
-        // fall back processing for platforms that don't support a NULL dest to mbstowcs
-        // worst case scenario is 1:1, this will be a sufficient buffer size
-        (void)a_pInputData;
-        return a_uInputDataLen;
-#else
-        // get the actual required buffer size
-        return mbstowcs(NULL, a_pInputData, a_uInputDataLen);
-#endif
-    }
-
-    /** Convert the input string from the storage format to SI_CHAR.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                       must be the actual length of the data, including
-     *                       NULL byte if NULL terminated string is required.
-     * @param a_pOutputData Pointer to the output buffer to received the
-     *                       converted data.
-     * @param a_uOutputDataSize Size of the output buffer in SI_CHAR.
-     * @return              true if all of the input data was successfully
-     *                       converted.
-     */
-    bool ConvertFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen,
-        SI_CHAR *       a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        if (m_bStoreIsUtf8) {
-            // This uses the Unicode reference implementation to do the
-            // conversion from UTF-8 to wchar_t. The required files are
-            // ConvertUTF.h and ConvertUTF.c which should be included in
-            // the distribution but are publically available from unicode.org
-            // at http://www.unicode.org/Public/PROGRAMS/CVTUTF/
-            ConversionResult retval;
-            const UTF8 * pUtf8 = (const UTF8 *) a_pInputData;
-            if (sizeof(wchar_t) == sizeof(UTF32)) {
-                UTF32 * pUtf32 = (UTF32 *) a_pOutputData;
-                retval = ConvertUTF8toUTF32(
-                    &pUtf8, pUtf8 + a_uInputDataLen,
-                    &pUtf32, pUtf32 + a_uOutputDataSize,
-                    lenientConversion);
-            }
-            else if (sizeof(wchar_t) == sizeof(UTF16)) {
-                UTF16 * pUtf16 = (UTF16 *) a_pOutputData;
-                retval = ConvertUTF8toUTF16(
-                    &pUtf8, pUtf8 + a_uInputDataLen,
-                    &pUtf16, pUtf16 + a_uOutputDataSize,
-                    lenientConversion);
-            }
-            return retval == conversionOK;
-        }
-
-        // convert to wchar_t
-        size_t retval = mbstowcs(a_pOutputData,
-            a_pInputData, a_uOutputDataSize);
-        return retval != (size_t)(-1);
-    }
-
-    /** Calculate the number of char required by the storage format of this
-     * data. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated string to calculate the number of
-     *                       bytes required to be converted to storage format.
-     * @return              Number of bytes required by the string when
-     *                       converted to storage format. This size always
-     *                       includes space for the terminating NULL character.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeToStore(
-        const SI_CHAR * a_pInputData)
-    {
-        if (m_bStoreIsUtf8) {
-            // worst case scenario for wchar_t to UTF-8 is 1 wchar_t -> 6 char
-            size_t uLen = 0;
-            while (a_pInputData[uLen]) {
-                ++uLen;
-            }
-            return (6 * uLen) + 1;
-        }
-        else {
-            size_t uLen = wcstombs(NULL, a_pInputData, 0);
-            if (uLen == (size_t)(-1)) {
-                return uLen;
-            }
-            return uLen + 1; // include NULL terminator
-        }
-    }
-
-    /** Convert the input string to the storage format of this data.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated source string to convert. All of
-     *                       the data will be converted including the
-     *                       terminating NULL character.
-     * @param a_pOutputData Pointer to the buffer to receive the converted
-     *                       string.
-     * @param a_uOutputDataSize Size of the output buffer in char.
-     * @return              true if all of the input data, including the
-     *                       terminating NULL character was successfully
-     *                       converted.
-     */
-    bool ConvertToStore(
-        const SI_CHAR * a_pInputData,
-        char *          a_pOutputData,
-        size_t          a_uOutputDataSize
-        )
-    {
-        if (m_bStoreIsUtf8) {
-            // calc input string length (SI_CHAR type and size independent)
-            size_t uInputLen = 0;
-            while (a_pInputData[uInputLen]) {
-                ++uInputLen;
-            }
-            ++uInputLen; // include the NULL char
-
-            // This uses the Unicode reference implementation to do the
-            // conversion from wchar_t to UTF-8. The required files are
-            // ConvertUTF.h and ConvertUTF.c which should be included in
-            // the distribution but are publically available from unicode.org
-            // at http://www.unicode.org/Public/PROGRAMS/CVTUTF/
-            ConversionResult retval;
-            UTF8 * pUtf8 = (UTF8 *) a_pOutputData;
-            if (sizeof(wchar_t) == sizeof(UTF32)) {
-                const UTF32 * pUtf32 = (const UTF32 *) a_pInputData;
-                retval = ConvertUTF32toUTF8(
-                    &pUtf32, pUtf32 + uInputLen,
-                    &pUtf8, pUtf8 + a_uOutputDataSize,
-                    lenientConversion);
-            }
-            else if (sizeof(wchar_t) == sizeof(UTF16)) {
-                const UTF16 * pUtf16 = (const UTF16 *) a_pInputData;
-                retval = ConvertUTF16toUTF8(
-                    &pUtf16, pUtf16 + uInputLen,
-                    &pUtf8, pUtf8 + a_uOutputDataSize,
-                    lenientConversion);
-            }
-            return retval == conversionOK;
-        }
-        else {
-            size_t retval = wcstombs(a_pOutputData,
-                a_pInputData, a_uOutputDataSize);
-            return retval != (size_t) -1;
-        }
-    }
-};
-
-#endif // SI_CONVERT_GENERIC
-
-
-// ---------------------------------------------------------------------------
-//                              SI_CONVERT_ICU
-// ---------------------------------------------------------------------------
-#ifdef SI_CONVERT_ICU
-
-#define SI_Case     SI_GenericCase
-#define SI_NoCase   SI_GenericNoCase
-
-#include 
-
-/**
- * Converts MBCS/UTF-8 to UChar using ICU. This can be used on all platforms.
- */
-template
-class SI_ConvertW {
-    const char * m_pEncoding;
-    UConverter * m_pConverter;
-protected:
-    SI_ConvertW() : m_pEncoding(NULL), m_pConverter(NULL) { }
-public:
-    SI_ConvertW(bool a_bStoreIsUtf8) : m_pConverter(NULL) {
-        m_pEncoding = a_bStoreIsUtf8 ? "UTF-8" : NULL;
-    }
-
-    /* copy and assignment */
-    SI_ConvertW(const SI_ConvertW & rhs) { operator=(rhs); }
-    SI_ConvertW & operator=(const SI_ConvertW & rhs) {
-        m_pEncoding = rhs.m_pEncoding;
-        m_pConverter = NULL;
-        return *this;
-    }
-    ~SI_ConvertW() { if (m_pConverter) ucnv_close(m_pConverter); }
-
-    /** Calculate the number of UChar required for converting the input
-     * from the storage format. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to UChar.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @return              Number of UChar required by the string when
-     *                      converted. If there are embedded NULL bytes in the
-     *                      input data, only the string up and not including
-     *                      the NULL byte will be converted.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen)
-    {
-        SI_ASSERT(a_uInputDataLen != (size_t) -1);
-
-        UErrorCode nError;
-
-        if (!m_pConverter) {
-            nError = U_ZERO_ERROR;
-            m_pConverter = ucnv_open(m_pEncoding, &nError);
-            if (U_FAILURE(nError)) {
-                return (size_t) -1;
-            }
-        }
-
-        nError = U_ZERO_ERROR;
-        int32_t nLen = ucnv_toUChars(m_pConverter, NULL, 0,
-            a_pInputData, (int32_t) a_uInputDataLen, &nError);
-        if (U_FAILURE(nError) && nError != U_BUFFER_OVERFLOW_ERROR) {
-            return (size_t) -1;
-        }
-
-        return (size_t) nLen;
-    }
-
-    /** Convert the input string from the storage format to UChar.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to UChar.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @param a_pOutputData Pointer to the output buffer to received the
-     *                      converted data.
-     * @param a_uOutputDataSize Size of the output buffer in UChar.
-     * @return              true if all of the input data was successfully
-     *                      converted.
-     */
-    bool ConvertFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen,
-        UChar *         a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        UErrorCode nError;
-
-        if (!m_pConverter) {
-            nError = U_ZERO_ERROR;
-            m_pConverter = ucnv_open(m_pEncoding, &nError);
-            if (U_FAILURE(nError)) {
-                return false;
-            }
-        }
-
-        nError = U_ZERO_ERROR;
-        ucnv_toUChars(m_pConverter,
-            a_pOutputData, (int32_t) a_uOutputDataSize,
-            a_pInputData, (int32_t) a_uInputDataLen, &nError);
-        if (U_FAILURE(nError)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /** Calculate the number of char required by the storage format of this
-     * data. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated string to calculate the number of
-     *                      bytes required to be converted to storage format.
-     * @return              Number of bytes required by the string when
-     *                      converted to storage format. This size always
-     *                      includes space for the terminating NULL character.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeToStore(
-        const UChar * a_pInputData)
-    {
-        UErrorCode nError;
-
-        if (!m_pConverter) {
-            nError = U_ZERO_ERROR;
-            m_pConverter = ucnv_open(m_pEncoding, &nError);
-            if (U_FAILURE(nError)) {
-                return (size_t) -1;
-            }
-        }
-
-        nError = U_ZERO_ERROR;
-        int32_t nLen = ucnv_fromUChars(m_pConverter, NULL, 0,
-            a_pInputData, -1, &nError);
-        if (U_FAILURE(nError) && nError != U_BUFFER_OVERFLOW_ERROR) {
-            return (size_t) -1;
-        }
-
-        return (size_t) nLen + 1;
-    }
-
-    /** Convert the input string to the storage format of this data.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated source string to convert. All of
-     *                      the data will be converted including the
-     *                      terminating NULL character.
-     * @param a_pOutputData Pointer to the buffer to receive the converted
-     *                      string.
-     * @param a_pOutputDataSize Size of the output buffer in char.
-     * @return              true if all of the input data, including the
-     *                      terminating NULL character was successfully
-     *                      converted.
-     */
-    bool ConvertToStore(
-        const UChar *   a_pInputData,
-        char *          a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        UErrorCode nError;
-
-        if (!m_pConverter) {
-            nError = U_ZERO_ERROR;
-            m_pConverter = ucnv_open(m_pEncoding, &nError);
-            if (U_FAILURE(nError)) {
-                return false;
-            }
-        }
-
-        nError = U_ZERO_ERROR;
-        ucnv_fromUChars(m_pConverter,
-            a_pOutputData, (int32_t) a_uOutputDataSize,
-            a_pInputData, -1, &nError);
-        if (U_FAILURE(nError)) {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-#endif // SI_CONVERT_ICU
-
-
-// ---------------------------------------------------------------------------
-//                              SI_CONVERT_WIN32
-// ---------------------------------------------------------------------------
-#ifdef SI_CONVERT_WIN32
-
-#define SI_Case     SI_GenericCase
-
-// Windows CE doesn't have errno or MBCS libraries
-#ifdef _WIN32_WCE
-# ifndef SI_NO_MBCS
-#  define SI_NO_MBCS
-# endif
-#endif
-
-#include 
-#ifdef SI_NO_MBCS
-# define SI_NoCase   SI_GenericNoCase
-#else // !SI_NO_MBCS
-/**
- * Case-insensitive comparison class using Win32 MBCS functions. This class
- * returns a case-insensitive semi-collation order for MBCS text. It may not
- * be safe for UTF-8 text returned in char format as we don't know what
- * characters will be folded by the function! Therefore, if you are using
- * SI_CHAR == char and SetUnicode(true), then you need to use the generic
- * SI_NoCase class instead.
- */
-#include 
-template
-struct SI_NoCase {
-    bool operator()(const SI_CHAR * pLeft, const SI_CHAR * pRight) const {
-        if (sizeof(SI_CHAR) == sizeof(char)) {
-            return _mbsicmp((const unsigned char *)pLeft,
-                (const unsigned char *)pRight) < 0;
-        }
-        if (sizeof(SI_CHAR) == sizeof(wchar_t)) {
-            return _wcsicmp((const wchar_t *)pLeft,
-                (const wchar_t *)pRight) < 0;
-        }
-        return SI_GenericNoCase()(pLeft, pRight);
-    }
-};
-#endif // SI_NO_MBCS
-
-/**
- * Converts MBCS and UTF-8 to a wchar_t (or equivalent) on Windows. This uses
- * only the Win32 functions and doesn't require the external Unicode UTF-8
- * conversion library. It will not work on Windows 95 without using Microsoft
- * Layer for Unicode in your application.
- */
-template
-class SI_ConvertW {
-    UINT m_uCodePage;
-protected:
-    SI_ConvertW() { }
-public:
-    SI_ConvertW(bool a_bStoreIsUtf8) {
-        m_uCodePage = a_bStoreIsUtf8 ? CP_UTF8 : CP_ACP;
-    }
-
-    /* copy and assignment */
-    SI_ConvertW(const SI_ConvertW & rhs) { operator=(rhs); }
-    SI_ConvertW & operator=(const SI_ConvertW & rhs) {
-        m_uCodePage = rhs.m_uCodePage;
-        return *this;
-    }
-
-    /** Calculate the number of SI_CHAR required for converting the input
-     * from the storage format. The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @return              Number of SI_CHAR required by the string when
-     *                      converted. If there are embedded NULL bytes in the
-     *                      input data, only the string up and not including
-     *                      the NULL byte will be converted.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen)
-    {
-        SI_ASSERT(a_uInputDataLen != (size_t) -1);
-
-        int retval = MultiByteToWideChar(
-            m_uCodePage, 0,
-            a_pInputData, (int) a_uInputDataLen,
-            0, 0);
-        return (size_t)(retval > 0 ? retval : -1);
-    }
-
-    /** Convert the input string from the storage format to SI_CHAR.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  Data in storage format to be converted to SI_CHAR.
-     * @param a_uInputDataLen Length of storage format data in bytes. This
-     *                      must be the actual length of the data, including
-     *                      NULL byte if NULL terminated string is required.
-     * @param a_pOutputData Pointer to the output buffer to received the
-     *                      converted data.
-     * @param a_uOutputDataSize Size of the output buffer in SI_CHAR.
-     * @return              true if all of the input data was successfully
-     *                      converted.
-     */
-    bool ConvertFromStore(
-        const char *    a_pInputData,
-        size_t          a_uInputDataLen,
-        SI_CHAR *       a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        int nSize = MultiByteToWideChar(
-            m_uCodePage, 0,
-            a_pInputData, (int) a_uInputDataLen,
-            (wchar_t *) a_pOutputData, (int) a_uOutputDataSize);
-        return (nSize > 0);
-    }
-
-    /** Calculate the number of char required by the storage format of this
-     * data. The storage format is always UTF-8.
-     *
-     * @param a_pInputData  NULL terminated string to calculate the number of
-     *                      bytes required to be converted to storage format.
-     * @return              Number of bytes required by the string when
-     *                      converted to storage format. This size always
-     *                      includes space for the terminating NULL character.
-     * @return              -1 cast to size_t on a conversion error.
-     */
-    size_t SizeToStore(
-        const SI_CHAR * a_pInputData)
-    {
-        int retval = WideCharToMultiByte(
-            m_uCodePage, 0,
-            (const wchar_t *) a_pInputData, -1,
-            0, 0, 0, 0);
-        return (size_t) (retval > 0 ? retval : -1);
-    }
-
-    /** Convert the input string to the storage format of this data.
-     * The storage format is always UTF-8 or MBCS.
-     *
-     * @param a_pInputData  NULL terminated source string to convert. All of
-     *                      the data will be converted including the
-     *                      terminating NULL character.
-     * @param a_pOutputData Pointer to the buffer to receive the converted
-     *                      string.
-     * @param a_pOutputDataSize Size of the output buffer in char.
-     * @return              true if all of the input data, including the
-     *                      terminating NULL character was successfully
-     *                      converted.
-     */
-    bool ConvertToStore(
-        const SI_CHAR * a_pInputData,
-        char *          a_pOutputData,
-        size_t          a_uOutputDataSize)
-    {
-        int retval = WideCharToMultiByte(
-            m_uCodePage, 0,
-            (const wchar_t *) a_pInputData, -1,
-            a_pOutputData, (int) a_uOutputDataSize, 0, 0);
-        return retval > 0;
-    }
-};
-
-#endif // SI_CONVERT_WIN32
-
-
-// ---------------------------------------------------------------------------
-//                                  TYPE DEFINITIONS
-// ---------------------------------------------------------------------------
-
-typedef CSimpleIniTempl,SI_ConvertA >                 CSimpleIniA;
-typedef CSimpleIniTempl,SI_ConvertA >                   CSimpleIniCaseA;
-
-#if defined(SI_NO_CONVERSION)
-// if there is no wide char conversion then we don't need to define the 
-// widechar "W" versions of CSimpleIni
-# define CSimpleIni      CSimpleIniA
-# define CSimpleIniCase  CSimpleIniCaseA
-# define SI_NEWLINE      SI_NEWLINE_A
-#else
-# if defined(SI_CONVERT_ICU)
-typedef CSimpleIniTempl,SI_ConvertW >               CSimpleIniW;
-typedef CSimpleIniTempl,SI_ConvertW >                 CSimpleIniCaseW;
-# else
-typedef CSimpleIniTempl,SI_ConvertW >           CSimpleIniW;
-typedef CSimpleIniTempl,SI_ConvertW >             CSimpleIniCaseW;
-# endif
-
-# ifdef _UNICODE
-#  define CSimpleIni      CSimpleIniW
-#  define CSimpleIniCase  CSimpleIniCaseW
-#  define SI_NEWLINE      SI_NEWLINE_W
-# else // !_UNICODE 
-#  define CSimpleIni      CSimpleIniA
-#  define CSimpleIniCase  CSimpleIniCaseA
-#  define SI_NEWLINE      SI_NEWLINE_A
-# endif // _UNICODE
-#endif
-
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
-
-#endif // INCLUDED_SimpleIni_h
-
diff --git a/ScriptEngine/third-party/Lua/include/lapi.h b/ScriptEngine/third-party/backend/include/Lua/lapi.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lapi.h
rename to ScriptEngine/third-party/backend/include/Lua/lapi.h
diff --git a/ScriptEngine/third-party/Lua/include/lauxlib.h b/ScriptEngine/third-party/backend/include/Lua/lauxlib.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lauxlib.h
rename to ScriptEngine/third-party/backend/include/Lua/lauxlib.h
diff --git a/ScriptEngine/third-party/Lua/include/lcode.h b/ScriptEngine/third-party/backend/include/Lua/lcode.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lcode.h
rename to ScriptEngine/third-party/backend/include/Lua/lcode.h
diff --git a/ScriptEngine/third-party/Lua/include/lctype.h b/ScriptEngine/third-party/backend/include/Lua/lctype.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lctype.h
rename to ScriptEngine/third-party/backend/include/Lua/lctype.h
diff --git a/ScriptEngine/third-party/Lua/include/ldebug.h b/ScriptEngine/third-party/backend/include/Lua/ldebug.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/ldebug.h
rename to ScriptEngine/third-party/backend/include/Lua/ldebug.h
diff --git a/ScriptEngine/third-party/Lua/include/ldo.h b/ScriptEngine/third-party/backend/include/Lua/ldo.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/ldo.h
rename to ScriptEngine/third-party/backend/include/Lua/ldo.h
diff --git a/ScriptEngine/third-party/Lua/include/lfunc.h b/ScriptEngine/third-party/backend/include/Lua/lfunc.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lfunc.h
rename to ScriptEngine/third-party/backend/include/Lua/lfunc.h
diff --git a/ScriptEngine/third-party/Lua/include/lgc.h b/ScriptEngine/third-party/backend/include/Lua/lgc.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lgc.h
rename to ScriptEngine/third-party/backend/include/Lua/lgc.h
diff --git a/ScriptEngine/third-party/Lua/include/ljumptab.h b/ScriptEngine/third-party/backend/include/Lua/ljumptab.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/ljumptab.h
rename to ScriptEngine/third-party/backend/include/Lua/ljumptab.h
diff --git a/ScriptEngine/third-party/Lua/include/llex.h b/ScriptEngine/third-party/backend/include/Lua/llex.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/llex.h
rename to ScriptEngine/third-party/backend/include/Lua/llex.h
diff --git a/ScriptEngine/third-party/Lua/include/llimits.h b/ScriptEngine/third-party/backend/include/Lua/llimits.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/llimits.h
rename to ScriptEngine/third-party/backend/include/Lua/llimits.h
diff --git a/ScriptEngine/third-party/Lua/include/lmem.h b/ScriptEngine/third-party/backend/include/Lua/lmem.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lmem.h
rename to ScriptEngine/third-party/backend/include/Lua/lmem.h
diff --git a/ScriptEngine/third-party/Lua/include/lobject.h b/ScriptEngine/third-party/backend/include/Lua/lobject.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lobject.h
rename to ScriptEngine/third-party/backend/include/Lua/lobject.h
diff --git a/ScriptEngine/third-party/Lua/include/lopcodes.h b/ScriptEngine/third-party/backend/include/Lua/lopcodes.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lopcodes.h
rename to ScriptEngine/third-party/backend/include/Lua/lopcodes.h
diff --git a/ScriptEngine/third-party/Lua/include/lopnames.h b/ScriptEngine/third-party/backend/include/Lua/lopnames.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lopnames.h
rename to ScriptEngine/third-party/backend/include/Lua/lopnames.h
diff --git a/ScriptEngine/third-party/Lua/include/lparser.h b/ScriptEngine/third-party/backend/include/Lua/lparser.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lparser.h
rename to ScriptEngine/third-party/backend/include/Lua/lparser.h
diff --git a/ScriptEngine/third-party/Lua/include/lprefix.h b/ScriptEngine/third-party/backend/include/Lua/lprefix.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lprefix.h
rename to ScriptEngine/third-party/backend/include/Lua/lprefix.h
diff --git a/ScriptEngine/third-party/Lua/include/lstate.h b/ScriptEngine/third-party/backend/include/Lua/lstate.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lstate.h
rename to ScriptEngine/third-party/backend/include/Lua/lstate.h
diff --git a/ScriptEngine/third-party/Lua/include/lstring.h b/ScriptEngine/third-party/backend/include/Lua/lstring.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lstring.h
rename to ScriptEngine/third-party/backend/include/Lua/lstring.h
diff --git a/ScriptEngine/third-party/Lua/include/ltable.h b/ScriptEngine/third-party/backend/include/Lua/ltable.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/ltable.h
rename to ScriptEngine/third-party/backend/include/Lua/ltable.h
diff --git a/ScriptEngine/third-party/Lua/include/ltm.h b/ScriptEngine/third-party/backend/include/Lua/ltm.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/ltm.h
rename to ScriptEngine/third-party/backend/include/Lua/ltm.h
diff --git a/ScriptEngine/third-party/Lua/include/lua.h b/ScriptEngine/third-party/backend/include/Lua/lua.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lua.h
rename to ScriptEngine/third-party/backend/include/Lua/lua.h
diff --git a/ScriptEngine/third-party/Lua/include/lua.hpp b/ScriptEngine/third-party/backend/include/Lua/lua.hpp
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lua.hpp
rename to ScriptEngine/third-party/backend/include/Lua/lua.hpp
diff --git a/ScriptEngine/third-party/Lua/include/luaconf.h b/ScriptEngine/third-party/backend/include/Lua/luaconf.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/luaconf.h
rename to ScriptEngine/third-party/backend/include/Lua/luaconf.h
diff --git a/ScriptEngine/third-party/Lua/include/lualib.h b/ScriptEngine/third-party/backend/include/Lua/lualib.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lualib.h
rename to ScriptEngine/third-party/backend/include/Lua/lualib.h
diff --git a/ScriptEngine/third-party/Lua/include/lundump.h b/ScriptEngine/third-party/backend/include/Lua/lundump.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lundump.h
rename to ScriptEngine/third-party/backend/include/Lua/lundump.h
diff --git a/ScriptEngine/third-party/Lua/include/lvm.h b/ScriptEngine/third-party/backend/include/Lua/lvm.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lvm.h
rename to ScriptEngine/third-party/backend/include/Lua/lvm.h
diff --git a/ScriptEngine/third-party/Lua/include/lzio.h b/ScriptEngine/third-party/backend/include/Lua/lzio.h
similarity index 100%
rename from ScriptEngine/third-party/Lua/include/lzio.h
rename to ScriptEngine/third-party/backend/include/Lua/lzio.h
diff --git a/ScriptEngine/third-party/NodeJs/include/aliased_buffer.h b/ScriptEngine/third-party/backend/include/NodeJs/aliased_buffer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/aliased_buffer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/aliased_buffer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/aliased_struct-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/aliased_struct-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/aliased_struct-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/aliased_struct-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/aliased_struct.h b/ScriptEngine/third-party/backend/include/NodeJs/aliased_struct.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/aliased_struct.h
rename to ScriptEngine/third-party/backend/include/NodeJs/aliased_struct.h
diff --git a/ScriptEngine/third-party/NodeJs/include/allocated_buffer-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/allocated_buffer-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/allocated_buffer-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/allocated_buffer-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/allocated_buffer.h b/ScriptEngine/third-party/backend/include/NodeJs/allocated_buffer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/allocated_buffer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/allocated_buffer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/async_wrap-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/async_wrap-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/async_wrap-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/async_wrap-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/async_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/async_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/async_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/async_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/base64-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/base64-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/base64-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/base64-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/base64.h b/ScriptEngine/third-party/backend/include/NodeJs/base64.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/base64.h
rename to ScriptEngine/third-party/backend/include/NodeJs/base64.h
diff --git a/ScriptEngine/third-party/NodeJs/include/base_object-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/base_object-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/base_object-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/base_object-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/base_object.h b/ScriptEngine/third-party/backend/include/NodeJs/base_object.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/base_object.h
rename to ScriptEngine/third-party/backend/include/NodeJs/base_object.h
diff --git a/ScriptEngine/third-party/NodeJs/include/callback_queue-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/callback_queue-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/callback_queue-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/callback_queue-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/callback_queue.h b/ScriptEngine/third-party/backend/include/NodeJs/callback_queue.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/callback_queue.h
rename to ScriptEngine/third-party/backend/include/NodeJs/callback_queue.h
diff --git a/ScriptEngine/third-party/NodeJs/include/cares_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/cares_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/cares_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/cares_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/connect_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/connect_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/connect_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/connect_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/connection_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/connection_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/connection_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/connection_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_aes.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_aes.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_aes.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_aes.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_bio.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_bio.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_bio.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_bio.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_cipher.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_cipher.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_cipher.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_cipher.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_clienthello-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_clienthello-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_clienthello-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_clienthello-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_clienthello.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_clienthello.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_clienthello.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_clienthello.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_common.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_common.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_common.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_common.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_context.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_context.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_context.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_context.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_dh.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_dh.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_dh.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_dh.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_dsa.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_dsa.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_dsa.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_dsa.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_ec.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_ec.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_ec.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_ec.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_groups.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_groups.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_groups.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_groups.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_hash.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hash.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_hash.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hash.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_hkdf.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hkdf.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_hkdf.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hkdf.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_hmac.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hmac.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_hmac.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_hmac.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_keygen.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_keygen.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_keygen.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_keygen.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_keys.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_keys.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_keys.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_keys.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_pbkdf2.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_pbkdf2.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_pbkdf2.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_pbkdf2.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_random.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_random.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_random.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_random.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_rsa.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_rsa.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_rsa.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_rsa.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_scrypt.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_scrypt.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_scrypt.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_scrypt.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_sig.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_sig.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_sig.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_sig.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_spkac.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_spkac.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_spkac.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_spkac.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_timing.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_timing.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_timing.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_timing.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_tls.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_tls.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_tls.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_tls.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_util.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_util.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_util.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_util.h
diff --git a/ScriptEngine/third-party/NodeJs/include/crypto/crypto_x509.h b/ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_x509.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/crypto/crypto_x509.h
rename to ScriptEngine/third-party/backend/include/NodeJs/crypto/crypto_x509.h
diff --git a/ScriptEngine/third-party/NodeJs/include/debug_utils-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/debug_utils-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/debug_utils-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/debug_utils-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/debug_utils.h b/ScriptEngine/third-party/backend/include/NodeJs/debug_utils.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/debug_utils.h
rename to ScriptEngine/third-party/backend/include/NodeJs/debug_utils.h
diff --git a/ScriptEngine/third-party/NodeJs/include/diagnosticfilename-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/diagnosticfilename-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/diagnosticfilename-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/diagnosticfilename-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/env-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/env-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/env-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/env-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/env.h b/ScriptEngine/third-party/backend/include/NodeJs/env.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/env.h
rename to ScriptEngine/third-party/backend/include/NodeJs/env.h
diff --git a/ScriptEngine/third-party/NodeJs/include/handle_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/handle_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/handle_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/handle_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/histogram-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/histogram-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/histogram-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/histogram-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/histogram.h b/ScriptEngine/third-party/backend/include/NodeJs/histogram.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/histogram.h
rename to ScriptEngine/third-party/backend/include/NodeJs/histogram.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/main_thread_interface.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/main_thread_interface.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/main_thread_interface.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/main_thread_interface.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/node_string.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/node_string.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/node_string.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/node_string.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/runtime_agent.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/runtime_agent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/runtime_agent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/runtime_agent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/tracing_agent.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/tracing_agent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/tracing_agent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/tracing_agent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/worker_agent.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/worker_agent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/worker_agent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/worker_agent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector/worker_inspector.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector/worker_inspector.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector/worker_inspector.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector/worker_inspector.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector_agent.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector_agent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector_agent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector_agent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector_io.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector_io.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector_io.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector_io.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector_profiler.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector_profiler.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector_profiler.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector_profiler.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector_socket.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector_socket.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector_socket.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector_socket.h
diff --git a/ScriptEngine/third-party/NodeJs/include/inspector_socket_server.h b/ScriptEngine/third-party/backend/include/NodeJs/inspector_socket_server.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/inspector_socket_server.h
rename to ScriptEngine/third-party/backend/include/NodeJs/inspector_socket_server.h
diff --git a/ScriptEngine/third-party/NodeJs/include/js_native_api.h b/ScriptEngine/third-party/backend/include/NodeJs/js_native_api.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/js_native_api.h
rename to ScriptEngine/third-party/backend/include/NodeJs/js_native_api.h
diff --git a/ScriptEngine/third-party/NodeJs/include/js_native_api_types.h b/ScriptEngine/third-party/backend/include/NodeJs/js_native_api_types.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/js_native_api_types.h
rename to ScriptEngine/third-party/backend/include/NodeJs/js_native_api_types.h
diff --git a/ScriptEngine/third-party/NodeJs/include/js_native_api_v8.h b/ScriptEngine/third-party/backend/include/NodeJs/js_native_api_v8.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/js_native_api_v8.h
rename to ScriptEngine/third-party/backend/include/NodeJs/js_native_api_v8.h
diff --git a/ScriptEngine/third-party/NodeJs/include/js_native_api_v8_internals.h b/ScriptEngine/third-party/backend/include/NodeJs/js_native_api_v8_internals.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/js_native_api_v8_internals.h
rename to ScriptEngine/third-party/backend/include/NodeJs/js_native_api_v8_internals.h
diff --git a/ScriptEngine/third-party/NodeJs/include/js_stream.h b/ScriptEngine/third-party/backend/include/NodeJs/js_stream.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/js_stream.h
rename to ScriptEngine/third-party/backend/include/NodeJs/js_stream.h
diff --git a/ScriptEngine/third-party/NodeJs/include/json_utils.h b/ScriptEngine/third-party/backend/include/NodeJs/json_utils.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/json_utils.h
rename to ScriptEngine/third-party/backend/include/NodeJs/json_utils.h
diff --git a/ScriptEngine/third-party/NodeJs/include/large_pages/node_large_page.h b/ScriptEngine/third-party/backend/include/NodeJs/large_pages/node_large_page.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/large_pages/node_large_page.h
rename to ScriptEngine/third-party/backend/include/NodeJs/large_pages/node_large_page.h
diff --git a/ScriptEngine/third-party/NodeJs/include/memory_tracker-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/memory_tracker-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/memory_tracker-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/memory_tracker-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/memory_tracker.h b/ScriptEngine/third-party/backend/include/NodeJs/memory_tracker.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/memory_tracker.h
rename to ScriptEngine/third-party/backend/include/NodeJs/memory_tracker.h
diff --git a/ScriptEngine/third-party/NodeJs/include/module_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/module_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/module_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/module_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node.h b/ScriptEngine/third-party/backend/include/NodeJs/node.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_api.h b/ScriptEngine/third-party/backend/include/NodeJs/node_api.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_api.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_api.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_api_internals.h b/ScriptEngine/third-party/backend/include/NodeJs/node_api_internals.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_api_internals.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_api_internals.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_api_types.h b/ScriptEngine/third-party/backend/include/NodeJs/node_api_types.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_api_types.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_api_types.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_binding.h b/ScriptEngine/third-party/backend/include/NodeJs/node_binding.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_binding.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_binding.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_blob.h b/ScriptEngine/third-party/backend/include/NodeJs/node_blob.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_blob.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_blob.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_bob-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_bob-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_bob-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_bob-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_bob.h b/ScriptEngine/third-party/backend/include/NodeJs/node_bob.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_bob.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_bob.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_buffer.h b/ScriptEngine/third-party/backend/include/NodeJs/node_buffer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_buffer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_buffer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_constants.h b/ScriptEngine/third-party/backend/include/NodeJs/node_constants.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_constants.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_constants.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_context_data.h b/ScriptEngine/third-party/backend/include/NodeJs/node_context_data.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_context_data.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_context_data.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_contextify.h b/ScriptEngine/third-party/backend/include/NodeJs/node_contextify.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_contextify.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_contextify.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_crypto.h b/ScriptEngine/third-party/backend/include/NodeJs/node_crypto.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_crypto.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_crypto.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_dir.h b/ScriptEngine/third-party/backend/include/NodeJs/node_dir.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_dir.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_dir.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_dtrace.h b/ScriptEngine/third-party/backend/include/NodeJs/node_dtrace.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_dtrace.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_dtrace.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_errors.h b/ScriptEngine/third-party/backend/include/NodeJs/node_errors.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_errors.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_errors.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_external_reference.h b/ScriptEngine/third-party/backend/include/NodeJs/node_external_reference.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_external_reference.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_external_reference.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_file-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_file-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_file-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_file-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_file.h b/ScriptEngine/third-party/backend/include/NodeJs/node_file.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_file.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_file.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_http2.h b/ScriptEngine/third-party/backend/include/NodeJs/node_http2.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_http2.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_http2.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_http2_state.h b/ScriptEngine/third-party/backend/include/NodeJs/node_http2_state.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_http2_state.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_http2_state.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_http_common-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_http_common-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_http_common-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_http_common-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_http_common.h b/ScriptEngine/third-party/backend/include/NodeJs/node_http_common.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_http_common.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_http_common.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_i18n.h b/ScriptEngine/third-party/backend/include/NodeJs/node_i18n.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_i18n.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_i18n.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_internals.h b/ScriptEngine/third-party/backend/include/NodeJs/node_internals.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_internals.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_internals.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_main_instance.h b/ScriptEngine/third-party/backend/include/NodeJs/node_main_instance.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_main_instance.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_main_instance.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_mem-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_mem-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_mem-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_mem-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_mem.h b/ScriptEngine/third-party/backend/include/NodeJs/node_mem.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_mem.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_mem.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_messaging.h b/ScriptEngine/third-party/backend/include/NodeJs/node_messaging.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_messaging.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_messaging.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_metadata.h b/ScriptEngine/third-party/backend/include/NodeJs/node_metadata.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_metadata.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_metadata.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_mutex.h b/ScriptEngine/third-party/backend/include/NodeJs/node_mutex.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_mutex.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_mutex.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_native_module.h b/ScriptEngine/third-party/backend/include/NodeJs/node_native_module.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_native_module.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_native_module.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_native_module_env.h b/ScriptEngine/third-party/backend/include/NodeJs/node_native_module_env.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_native_module_env.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_native_module_env.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_object_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/node_object_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_object_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_object_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_options-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_options-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_options-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_options-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_options.h b/ScriptEngine/third-party/backend/include/NodeJs/node_options.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_options.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_options.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_perf.h b/ScriptEngine/third-party/backend/include/NodeJs/node_perf.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_perf.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_perf.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_perf_common.h b/ScriptEngine/third-party/backend/include/NodeJs/node_perf_common.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_perf_common.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_perf_common.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_platform.h b/ScriptEngine/third-party/backend/include/NodeJs/node_platform.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_platform.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_platform.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_process-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_process-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_process-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_process-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_process.h b/ScriptEngine/third-party/backend/include/NodeJs/node_process.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_process.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_process.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_report.h b/ScriptEngine/third-party/backend/include/NodeJs/node_report.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_report.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_report.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_revert.h b/ScriptEngine/third-party/backend/include/NodeJs/node_revert.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_revert.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_revert.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_root_certs.h b/ScriptEngine/third-party/backend/include/NodeJs/node_root_certs.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_root_certs.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_root_certs.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_snapshotable.h b/ScriptEngine/third-party/backend/include/NodeJs/node_snapshotable.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_snapshotable.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_snapshotable.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_sockaddr-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_sockaddr-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_sockaddr-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_sockaddr-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_sockaddr.h b/ScriptEngine/third-party/backend/include/NodeJs/node_sockaddr.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_sockaddr.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_sockaddr.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_stat_watcher.h b/ScriptEngine/third-party/backend/include/NodeJs/node_stat_watcher.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_stat_watcher.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_stat_watcher.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_union_bytes.h b/ScriptEngine/third-party/backend/include/NodeJs/node_union_bytes.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_union_bytes.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_union_bytes.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_url.h b/ScriptEngine/third-party/backend/include/NodeJs/node_url.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_url.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_url.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_v8.h b/ScriptEngine/third-party/backend/include/NodeJs/node_v8.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_v8.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_v8.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_v8_platform-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_v8_platform-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_v8_platform-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_v8_platform-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_version.h b/ScriptEngine/third-party/backend/include/NodeJs/node_version.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_version.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_version.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_wasi.h b/ScriptEngine/third-party/backend/include/NodeJs/node_wasi.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_wasi.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_wasi.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_watchdog.h b/ScriptEngine/third-party/backend/include/NodeJs/node_watchdog.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_watchdog.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_watchdog.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_win32_etw_provider-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/node_win32_etw_provider-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_win32_etw_provider-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_win32_etw_provider-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_win32_etw_provider.h b/ScriptEngine/third-party/backend/include/NodeJs/node_win32_etw_provider.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_win32_etw_provider.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_win32_etw_provider.h
diff --git a/ScriptEngine/third-party/NodeJs/include/node_worker.h b/ScriptEngine/third-party/backend/include/NodeJs/node_worker.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/node_worker.h
rename to ScriptEngine/third-party/backend/include/NodeJs/node_worker.h
diff --git a/ScriptEngine/third-party/NodeJs/include/pipe_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/pipe_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/pipe_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/pipe_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/req_wrap-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/req_wrap-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/req_wrap-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/req_wrap-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/req_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/req_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/req_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/req_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/spawn_sync.h b/ScriptEngine/third-party/backend/include/NodeJs/spawn_sync.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/spawn_sync.h
rename to ScriptEngine/third-party/backend/include/NodeJs/spawn_sync.h
diff --git a/ScriptEngine/third-party/NodeJs/include/stream_base-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/stream_base-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/stream_base-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/stream_base-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/stream_base.h b/ScriptEngine/third-party/backend/include/NodeJs/stream_base.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/stream_base.h
rename to ScriptEngine/third-party/backend/include/NodeJs/stream_base.h
diff --git a/ScriptEngine/third-party/NodeJs/include/stream_pipe.h b/ScriptEngine/third-party/backend/include/NodeJs/stream_pipe.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/stream_pipe.h
rename to ScriptEngine/third-party/backend/include/NodeJs/stream_pipe.h
diff --git a/ScriptEngine/third-party/NodeJs/include/stream_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/stream_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/stream_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/stream_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/string_bytes.h b/ScriptEngine/third-party/backend/include/NodeJs/string_bytes.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/string_bytes.h
rename to ScriptEngine/third-party/backend/include/NodeJs/string_bytes.h
diff --git a/ScriptEngine/third-party/NodeJs/include/string_decoder-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/string_decoder-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/string_decoder-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/string_decoder-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/string_decoder.h b/ScriptEngine/third-party/backend/include/NodeJs/string_decoder.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/string_decoder.h
rename to ScriptEngine/third-party/backend/include/NodeJs/string_decoder.h
diff --git a/ScriptEngine/third-party/NodeJs/include/string_search.h b/ScriptEngine/third-party/backend/include/NodeJs/string_search.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/string_search.h
rename to ScriptEngine/third-party/backend/include/NodeJs/string_search.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tcp_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/tcp_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tcp_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tcp_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/threadpoolwork-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/threadpoolwork-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/threadpoolwork-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/threadpoolwork-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/timer_wrap-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/timer_wrap-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/timer_wrap-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/timer_wrap-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/timer_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/timer_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/timer_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/timer_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/agent.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/agent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/agent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/agent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/node_trace_buffer.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/node_trace_buffer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/node_trace_buffer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/node_trace_buffer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/node_trace_writer.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/node_trace_writer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/node_trace_writer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/node_trace_writer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/trace_event.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/trace_event.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/trace_event.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/trace_event.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/trace_event_common.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/trace_event_common.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/trace_event_common.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/trace_event_common.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tracing/traced_value.h b/ScriptEngine/third-party/backend/include/NodeJs/tracing/traced_value.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tracing/traced_value.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tracing/traced_value.h
diff --git a/ScriptEngine/third-party/NodeJs/include/tty_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/tty_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/tty_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/tty_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/udp_wrap.h b/ScriptEngine/third-party/backend/include/NodeJs/udp_wrap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/udp_wrap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/udp_wrap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/util-inl.h b/ScriptEngine/third-party/backend/include/NodeJs/util-inl.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/util-inl.h
rename to ScriptEngine/third-party/backend/include/NodeJs/util-inl.h
diff --git a/ScriptEngine/third-party/NodeJs/include/util.h b/ScriptEngine/third-party/backend/include/NodeJs/util.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/util.h
rename to ScriptEngine/third-party/backend/include/NodeJs/util.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/aix.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/aix.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/aix.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/aix.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/android-ifaddrs.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/android-ifaddrs.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/android-ifaddrs.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/android-ifaddrs.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/bsd.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/bsd.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/bsd.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/bsd.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/darwin.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/darwin.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/darwin.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/darwin.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/errno.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/errno.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/errno.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/errno.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/linux.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/linux.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/linux.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/linux.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/os390.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/os390.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/os390.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/os390.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/posix.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/posix.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/posix.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/posix.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/stdint-msvc2008.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/stdint-msvc2008.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/stdint-msvc2008.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/stdint-msvc2008.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/sunos.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/sunos.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/sunos.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/sunos.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/threadpool.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/threadpool.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/threadpool.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/threadpool.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/tree.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/tree.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/tree.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/tree.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/unix.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/unix.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/unix.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/unix.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/version.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/version.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/version.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/version.h
diff --git a/ScriptEngine/third-party/NodeJs/include/uv/uv/win.h b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/win.h
similarity index 99%
rename from ScriptEngine/third-party/NodeJs/include/uv/uv/win.h
rename to ScriptEngine/third-party/backend/include/NodeJs/uv/uv/win.h
index 5fecf4b..73f4188 100644
--- a/ScriptEngine/third-party/NodeJs/include/uv/uv/win.h
+++ b/ScriptEngine/third-party/backend/include/NodeJs/uv/uv/win.h
@@ -43,7 +43,7 @@ typedef struct pollfd {
 #ifndef LOCALE_INVARIANT
 # define LOCALE_INVARIANT 0x007f
 #endif
-
+#define _WINSOCKAPI_
 #include 
 // Disable the typedef in mstcpip.h of MinGW.
 #define _TCP_INITIAL_RTO_PARAMETERS _TCP_INITIAL_RTO_PARAMETERS__AVOID
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/APIDesign.md b/ScriptEngine/third-party/backend/include/NodeJs/v8/APIDesign.md
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/APIDesign.md
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/APIDesign.md
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/DEPS b/ScriptEngine/third-party/backend/include/NodeJs/v8/DEPS
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/DEPS
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/DEPS
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/DIR_METADATA b/ScriptEngine/third-party/backend/include/NodeJs/v8/DIR_METADATA
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/DIR_METADATA
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/DIR_METADATA
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/OWNERS b/ScriptEngine/third-party/backend/include/NodeJs/v8/OWNERS
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/OWNERS
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/OWNERS
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/DEPS b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/DEPS
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/DEPS
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/DEPS
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/OWNERS b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/OWNERS
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/OWNERS
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/OWNERS
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/README.md b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/README.md
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/README.md
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/README.md
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/allocation.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/allocation.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/allocation.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/allocation.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/common.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/common.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/common.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/common.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/cross-thread-persistent.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/cross-thread-persistent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/cross-thread-persistent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/cross-thread-persistent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/custom-space.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/custom-space.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/custom-space.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/custom-space.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/default-platform.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/default-platform.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/default-platform.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/default-platform.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/ephemeron-pair.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/ephemeron-pair.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/ephemeron-pair.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/ephemeron-pair.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/explicit-management.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/explicit-management.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/explicit-management.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/explicit-management.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/garbage-collected.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/garbage-collected.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/garbage-collected.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/garbage-collected.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-consistency.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-consistency.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-consistency.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-consistency.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-state.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-state.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-state.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-state.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-statistics.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-statistics.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap-statistics.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap-statistics.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/heap.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/heap.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/api-constants.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/api-constants.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/api-constants.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/api-constants.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/atomic-entry-flag.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/atomic-entry-flag.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/atomic-entry-flag.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/atomic-entry-flag.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/caged-heap-local-data.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/caged-heap-local-data.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/caged-heap-local-data.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/caged-heap-local-data.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/compiler-specific.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/compiler-specific.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/compiler-specific.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/compiler-specific.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/finalizer-trait.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/finalizer-trait.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/finalizer-trait.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/finalizer-trait.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/gc-info.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/gc-info.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/gc-info.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/gc-info.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/logging.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/logging.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/logging.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/logging.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/name-trait.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/name-trait.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/name-trait.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/name-trait.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/persistent-node.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/persistent-node.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/persistent-node.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/persistent-node.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/pointer-policies.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/pointer-policies.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/pointer-policies.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/pointer-policies.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/prefinalizer-handler.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/prefinalizer-handler.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/prefinalizer-handler.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/prefinalizer-handler.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/write-barrier.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/write-barrier.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/internal/write-barrier.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/internal/write-barrier.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/liveness-broker.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/liveness-broker.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/liveness-broker.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/liveness-broker.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/macros.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/macros.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/macros.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/macros.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/member.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/member.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/member.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/member.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/name-provider.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/name-provider.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/name-provider.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/name-provider.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/object-size-trait.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/object-size-trait.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/object-size-trait.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/object-size-trait.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/persistent.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/persistent.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/persistent.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/persistent.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/platform.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/platform.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/platform.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/platform.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/prefinalizer.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/prefinalizer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/prefinalizer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/prefinalizer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/process-heap-statistics.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/process-heap-statistics.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/process-heap-statistics.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/process-heap-statistics.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/sentinel-pointer.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/sentinel-pointer.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/sentinel-pointer.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/sentinel-pointer.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/source-location.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/source-location.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/source-location.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/source-location.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/testing.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/testing.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/testing.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/testing.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/trace-trait.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/trace-trait.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/trace-trait.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/trace-trait.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/type-traits.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/type-traits.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/type-traits.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/type-traits.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/cppgc/visitor.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/visitor.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/cppgc/visitor.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/cppgc/visitor.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/js_protocol-1.2.json b/ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol-1.2.json
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/js_protocol-1.2.json
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol-1.2.json
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/js_protocol-1.3.json b/ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol-1.3.json
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/js_protocol-1.3.json
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol-1.3.json
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/js_protocol.pdl b/ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol.pdl
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/js_protocol.pdl
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/js_protocol.pdl
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/libplatform/DEPS b/ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/DEPS
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/libplatform/DEPS
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/DEPS
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/libplatform/libplatform-export.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/libplatform-export.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/libplatform/libplatform-export.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/libplatform-export.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/libplatform/libplatform.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/libplatform.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/libplatform/libplatform.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/libplatform.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/libplatform/v8-tracing.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/v8-tracing.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/libplatform/v8-tracing.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/libplatform/v8-tracing.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-cppgc.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-cppgc.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-cppgc.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-cppgc.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-fast-api-calls.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-fast-api-calls.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-fast-api-calls.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-fast-api-calls.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-inspector-protocol.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-inspector-protocol.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-inspector-protocol.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-inspector-protocol.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-inspector.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-inspector.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-inspector.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-inspector.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-internal.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-internal.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-internal.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-internal.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-metrics.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-metrics.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-metrics.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-metrics.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-platform.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-platform.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-platform.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-platform.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-profiler.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-profiler.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-profiler.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-profiler.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-unwinder-state.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-unwinder-state.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-unwinder-state.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-unwinder-state.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-util.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-util.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-util.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-util.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-value-serializer-version.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-value-serializer-version.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-value-serializer-version.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-value-serializer-version.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-version-string.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-version-string.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-version-string.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-version-string.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-version.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-version.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-version.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-version.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-wasm-trap-handler-posix.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-wasm-trap-handler-posix.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-wasm-trap-handler-posix.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-wasm-trap-handler-posix.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8-wasm-trap-handler-win.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-wasm-trap-handler-win.h
similarity index 99%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8-wasm-trap-handler-win.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8-wasm-trap-handler-win.h
index 9d3cad5..6fd7813 100644
--- a/ScriptEngine/third-party/NodeJs/include/v8/v8-wasm-trap-handler-win.h
+++ b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8-wasm-trap-handler-win.h
@@ -5,6 +5,7 @@
 #ifndef V8_WASM_TRAP_HANDLER_WIN_H_
 #define V8_WASM_TRAP_HANDLER_WIN_H_
 
+
 #include 
 
 #include "v8config.h"  // NOLINT(build/include_directory)
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8/v8config.h b/ScriptEngine/third-party/backend/include/NodeJs/v8/v8config.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8/v8config.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8/v8config.h
diff --git a/ScriptEngine/third-party/NodeJs/include/v8abbr.h b/ScriptEngine/third-party/backend/include/NodeJs/v8abbr.h
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/include/v8abbr.h
rename to ScriptEngine/third-party/backend/include/NodeJs/v8abbr.h
diff --git a/ScriptEngine/third-party/backend/include/QuickJs/quickjs-libc.h b/ScriptEngine/third-party/backend/include/QuickJs/quickjs-libc.h
new file mode 100644
index 0000000..fbbe5b0
--- /dev/null
+++ b/ScriptEngine/third-party/backend/include/QuickJs/quickjs-libc.h
@@ -0,0 +1,59 @@
+/*
+ * QuickJS C library
+ * 
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef QUICKJS_LIBC_H
+#define QUICKJS_LIBC_H
+
+#include 
+#include 
+
+#include "quickjs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JSModuleDef *js_init_module_std(JSContext *ctx, const char *module_name);
+JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name);
+void js_std_add_helpers(JSContext *ctx, int argc, char **argv);
+void js_std_loop(JSContext *ctx);
+void js_std_init_handlers(JSRuntime *rt);
+void js_std_free_handlers(JSRuntime *rt);
+void js_std_dump_error(JSContext *ctx);
+uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename);
+int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val,
+                              JS_BOOL use_realpath, JS_BOOL is_main);
+JSModuleDef *js_module_loader(JSContext *ctx,
+                              const char *module_name, void *opaque);
+void js_std_eval_binary(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+                        int flags);
+void js_std_promise_rejection_tracker(JSContext *ctx, JSValueConst promise,
+                                      JSValueConst reason,
+                                      JS_BOOL is_handled, void *opaque);
+void js_std_set_worker_new_context_func(JSContext *(*func)(JSRuntime *rt));
+                                        
+#ifdef __cplusplus
+} /* extern "C" { */
+#endif
+
+#endif /* QUICKJS_LIBC_H */
diff --git a/ScriptEngine/third-party/QuickJs/include/quickjs.h b/ScriptEngine/third-party/backend/include/QuickJs/quickjs.h
similarity index 100%
rename from ScriptEngine/third-party/QuickJs/include/quickjs.h
rename to ScriptEngine/third-party/backend/include/QuickJs/quickjs.h
diff --git a/ScriptEngine/third-party/Lua/lib/lua.lib b/ScriptEngine/third-party/backend/lib/Lua/lua.lib
similarity index 100%
rename from ScriptEngine/third-party/Lua/lib/lua.lib
rename to ScriptEngine/third-party/backend/lib/Lua/lua.lib
diff --git a/ScriptEngine/third-party/NodeJs/lib/libnode.lib b/ScriptEngine/third-party/backend/lib/NodeJs/libnode.lib
similarity index 100%
rename from ScriptEngine/third-party/NodeJs/lib/libnode.lib
rename to ScriptEngine/third-party/backend/lib/NodeJs/libnode.lib
diff --git a/ScriptEngine/third-party/QuickJs/lib/quickjs.lib b/ScriptEngine/third-party/backend/lib/QuickJs/quickjs.lib
similarity index 100%
rename from ScriptEngine/third-party/QuickJs/lib/quickjs.lib
rename to ScriptEngine/third-party/backend/lib/QuickJs/quickjs.lib
diff --git a/ScriptEngine/third-party/cpp-base64/include/base64.h b/ScriptEngine/third-party/cpp-base64/include/base64.h
deleted file mode 100644
index 866505e..0000000
--- a/ScriptEngine/third-party/cpp-base64/include/base64.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  base64 encoding and decoding with C++.
-//  Version: 2.rc.08 (release candidate)
-//
-
-#ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
-#define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
-
-#include 
-
-#if __cplusplus >= 201703L
-#include 
-#endif  // __cplusplus >= 201703L
-
-std::string base64_encode     (std::string const& s, bool url = false);
-std::string base64_encode_pem (std::string const& s);
-std::string base64_encode_mime(std::string const& s);
-
-std::string base64_decode(std::string const& s, bool remove_linebreaks = false);
-std::string base64_encode(unsigned char const*, size_t len, bool url = false);
-
-#if __cplusplus >= 201703L
-//
-// Interface with std::string_view rather than const std::string&
-// Requires C++17
-// Provided by Yannic Bonenberger (https://github.com/Yannic)
-//
-std::string base64_encode     (std::string_view s, bool url = false);
-std::string base64_encode_pem (std::string_view s);
-std::string base64_encode_mime(std::string_view s);
-
-std::string base64_decode(std::string_view s, bool remove_linebreaks = false);
-#endif  // __cplusplus >= 201703L
-
-#endif /* BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A */
diff --git a/ScriptEngine/third-party/cpp-base64/lib/cpp-base64.lib b/ScriptEngine/third-party/cpp-base64/lib/cpp-base64.lib
deleted file mode 100644
index 4d2a6f6..0000000
Binary files a/ScriptEngine/third-party/cpp-base64/lib/cpp-base64.lib and /dev/null differ
diff --git a/ScriptEngine/third-party/LLMoney/LLMoney.h b/ScriptEngine/third-party/include/LLMoney/LLMoney.h
similarity index 100%
rename from ScriptEngine/third-party/LLMoney/LLMoney.h
rename to ScriptEngine/third-party/include/LLMoney/LLMoney.h
diff --git a/ScriptEngine/third-party/LightWebSocketClient/include/WebSocketClient.h b/ScriptEngine/third-party/include/LightWebSocketClient/WebSocketClient.h
similarity index 100%
rename from ScriptEngine/third-party/LightWebSocketClient/include/WebSocketClient.h
rename to ScriptEngine/third-party/include/LightWebSocketClient/WebSocketClient.h
diff --git a/ScriptEngine/third-party/Nlohmann/fifo_map.hpp b/ScriptEngine/third-party/include/Nlohmann/fifo_map.hpp
similarity index 100%
rename from ScriptEngine/third-party/Nlohmann/fifo_map.hpp
rename to ScriptEngine/third-party/include/Nlohmann/fifo_map.hpp
diff --git a/ScriptEngine/third-party/Nlohmann/json.hpp b/ScriptEngine/third-party/include/Nlohmann/json.hpp
similarity index 100%
rename from ScriptEngine/third-party/Nlohmann/json.hpp
rename to ScriptEngine/third-party/include/Nlohmann/json.hpp
diff --git a/LiteLoader/Header/third-party/SimpleIni/SimpleIni.h b/ScriptEngine/third-party/include/SimpleIni/SimpleIni.h
similarity index 99%
rename from LiteLoader/Header/third-party/SimpleIni/SimpleIni.h
rename to ScriptEngine/third-party/include/SimpleIni/SimpleIni.h
index d6336db..2749089 100644
--- a/LiteLoader/Header/third-party/SimpleIni/SimpleIni.h
+++ b/ScriptEngine/third-party/include/SimpleIni/SimpleIni.h
@@ -3274,6 +3274,7 @@ public:
 # endif
 #endif
 
+
 #include 
 #ifdef SI_NO_MBCS
 # define SI_NoCase   SI_GenericNoCase
diff --git a/ScriptEngine/third-party/ThreadPool/ThreadPool.hpp b/ScriptEngine/third-party/include/ThreadPool/ThreadPool.hpp
similarity index 100%
rename from ScriptEngine/third-party/ThreadPool/ThreadPool.hpp
rename to ScriptEngine/third-party/include/ThreadPool/ThreadPool.hpp
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall.h b/ScriptEngine/third-party/include/dyncall/dyncall.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall.h
rename to ScriptEngine/third-party/include/dyncall/dyncall.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_alloc_wx.h b/ScriptEngine/third-party/include/dyncall/dyncall_alloc_wx.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_alloc_wx.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_alloc_wx.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_args.h b/ScriptEngine/third-party/include/dyncall/dyncall_args.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_args.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_args.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_callback.h b/ScriptEngine/third-party/include/dyncall/dyncall_callback.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_callback.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_callback.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_callf.h b/ScriptEngine/third-party/include/dyncall/dyncall_callf.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_callf.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_callf.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_config.h b/ScriptEngine/third-party/include/dyncall/dyncall_config.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_config.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_config.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_macros.h b/ScriptEngine/third-party/include/dyncall/dyncall_macros.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_macros.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_macros.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_signature.h b/ScriptEngine/third-party/include/dyncall/dyncall_signature.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_signature.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_signature.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_types.h b/ScriptEngine/third-party/include/dyncall/dyncall_types.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_types.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_types.h
diff --git a/ScriptEngine/third-party/dyncall/include/dyncall_value.h b/ScriptEngine/third-party/include/dyncall/dyncall_value.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dyncall_value.h
rename to ScriptEngine/third-party/include/dyncall/dyncall_value.h
diff --git a/ScriptEngine/third-party/dyncall/include/dynload.h b/ScriptEngine/third-party/include/dyncall/dynload.h
similarity index 100%
rename from ScriptEngine/third-party/dyncall/include/dynload.h
rename to ScriptEngine/third-party/include/dyncall/dynload.h
diff --git a/ScriptEngine/third-party/gsl/gsl b/ScriptEngine/third-party/include/gsl/gsl
similarity index 100%
rename from ScriptEngine/third-party/gsl/gsl
rename to ScriptEngine/third-party/include/gsl/gsl
diff --git a/ScriptEngine/third-party/gsl/gsl_algorithm b/ScriptEngine/third-party/include/gsl/gsl_algorithm
similarity index 100%
rename from ScriptEngine/third-party/gsl/gsl_algorithm
rename to ScriptEngine/third-party/include/gsl/gsl_algorithm
diff --git a/ScriptEngine/third-party/gsl/gsl_assert b/ScriptEngine/third-party/include/gsl/gsl_assert
similarity index 100%
rename from ScriptEngine/third-party/gsl/gsl_assert
rename to ScriptEngine/third-party/include/gsl/gsl_assert
diff --git a/ScriptEngine/third-party/gsl/gsl_byte b/ScriptEngine/third-party/include/gsl/gsl_byte
similarity index 100%
rename from ScriptEngine/third-party/gsl/gsl_byte
rename to ScriptEngine/third-party/include/gsl/gsl_byte
diff --git a/ScriptEngine/third-party/gsl/gsl_util b/ScriptEngine/third-party/include/gsl/gsl_util
similarity index 100%
rename from ScriptEngine/third-party/gsl/gsl_util
rename to ScriptEngine/third-party/include/gsl/gsl_util
diff --git a/ScriptEngine/third-party/gsl/multi_span b/ScriptEngine/third-party/include/gsl/multi_span
similarity index 100%
rename from ScriptEngine/third-party/gsl/multi_span
rename to ScriptEngine/third-party/include/gsl/multi_span
diff --git a/ScriptEngine/third-party/gsl/pointers b/ScriptEngine/third-party/include/gsl/pointers
similarity index 100%
rename from ScriptEngine/third-party/gsl/pointers
rename to ScriptEngine/third-party/include/gsl/pointers
diff --git a/ScriptEngine/third-party/gsl/span b/ScriptEngine/third-party/include/gsl/span
similarity index 100%
rename from ScriptEngine/third-party/gsl/span
rename to ScriptEngine/third-party/include/gsl/span
diff --git a/ScriptEngine/third-party/gsl/span_ext b/ScriptEngine/third-party/include/gsl/span_ext
similarity index 100%
rename from ScriptEngine/third-party/gsl/span_ext
rename to ScriptEngine/third-party/include/gsl/span_ext
diff --git a/ScriptEngine/third-party/gsl/string_span b/ScriptEngine/third-party/include/gsl/string_span
similarity index 100%
rename from ScriptEngine/third-party/gsl/string_span
rename to ScriptEngine/third-party/include/gsl/string_span
diff --git a/ScriptEngine/third-party/nbt-cpp/include/nbt.hpp b/ScriptEngine/third-party/include/nbt-cpp/nbt.hpp
similarity index 100%
rename from ScriptEngine/third-party/nbt-cpp/include/nbt.hpp
rename to ScriptEngine/third-party/include/nbt-cpp/nbt.hpp
diff --git a/ScriptEngine/third-party/nbt-cpp/include/nbt_internal.hpp b/ScriptEngine/third-party/include/nbt-cpp/nbt_internal.hpp
similarity index 100%
rename from ScriptEngine/third-party/nbt-cpp/include/nbt_internal.hpp
rename to ScriptEngine/third-party/include/nbt-cpp/nbt_internal.hpp
diff --git a/ScriptEngine/third-party/LightWebSocketClient/lib/LightWSClient.lib b/ScriptEngine/third-party/lib/LightWebSocketClient/LightWSClient.lib
similarity index 100%
rename from ScriptEngine/third-party/LightWebSocketClient/lib/LightWSClient.lib
rename to ScriptEngine/third-party/lib/LightWebSocketClient/LightWSClient.lib
diff --git a/ScriptEngine/third-party/dyncall/lib/libdyncall_s.lib b/ScriptEngine/third-party/lib/dyncall/libdyncall_s.lib
similarity index 100%
rename from ScriptEngine/third-party/dyncall/lib/libdyncall_s.lib
rename to ScriptEngine/third-party/lib/dyncall/libdyncall_s.lib
diff --git a/ScriptEngine/third-party/dyncall/lib/libdyncallback_s.lib b/ScriptEngine/third-party/lib/dyncall/libdyncallback_s.lib
similarity index 100%
rename from ScriptEngine/third-party/dyncall/lib/libdyncallback_s.lib
rename to ScriptEngine/third-party/lib/dyncall/libdyncallback_s.lib
diff --git a/ScriptEngine/third-party/dyncall/lib/libdynload_s.lib b/ScriptEngine/third-party/lib/dyncall/libdynload_s.lib
similarity index 100%
rename from ScriptEngine/third-party/dyncall/lib/libdynload_s.lib
rename to ScriptEngine/third-party/lib/dyncall/libdynload_s.lib
diff --git a/ScriptEngine/third-party/nbt-cpp/lib/nbt-cpp.lib b/ScriptEngine/third-party/lib/nbt-cpp/nbt-cpp.lib
similarity index 100%
rename from ScriptEngine/third-party/nbt-cpp/lib/nbt-cpp.lib
rename to ScriptEngine/third-party/lib/nbt-cpp/nbt-cpp.lib
diff --git a/ScriptEngine/third-party/seh_exception/seh_exception.hpp b/ScriptEngine/third-party/seh_exception/seh_exception.hpp
deleted file mode 100644
index 84e96f1..0000000
--- a/ScriptEngine/third-party/seh_exception/seh_exception.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-/**
- * @Description: a class for convert SEH exception to c++ exception
- * @Author: shang_cm
- * @Date: 2020-06-01 16:09:00
- * @LastEditTime: 2010-06-01 16:09:00
- * @LastEditors: shang_cm
- */
-#pragma once
-#include 
-#include 
-
-class seh_exception : std::exception
-{
-	typedef ULONG(WINAPI* fpRtlNtStatusToDosError)(DWORD Status);
-
-public:
-	seh_exception(unsigned int nExceptionCode, _EXCEPTION_POINTERS* pstExcptionInfor) :
-		m_nExceptionCode(0),
-		m_pExcptionInfor(NULL),
-		m_szMsgBuff(NULL),
-		m_hNtModule(NULL),
-		RtlNtStatusToDosError(NULL)
-	{
-		m_nExceptionCode = nExceptionCode;
-		m_pExcptionInfor = pstExcptionInfor;
-		m_hNtModule = GetModuleHandle(L"NTDLL.DLL");
-		if (NULL != m_hNtModule)
-		{
-			RtlNtStatusToDosError = (fpRtlNtStatusToDosError)GetProcAddress(m_hNtModule, "RtlNtStatusToDosError");
-		}
-	}
-
-	virtual ~seh_exception()
-	{
-		m_nExceptionCode = 0;
-		m_pExcptionInfor = NULL;
-		RtlNtStatusToDosError = NULL;
-
-		if (NULL != m_szMsgBuff)
-		{
-			LocalFree(m_szMsgBuff);
-			m_szMsgBuff = NULL;
-		}
-	};
-
-	const char* what() const noexcept
-	{
-		if (RtlNtStatusToDosError != NULL)
-		{
-			DWORD nConvertLen = FormatMessageA(
-				FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE,
-				m_hNtModule,
-				RtlNtStatusToDosError(m_nExceptionCode),
-				0,
-				(char*)&m_szMsgBuff,
-				0,
-				NULL);
-
-			if (0 != nConvertLen)
-			{
-				return m_szMsgBuff;
-			}
-		}
-
-		return "SEH_UNKNOW_ERROR";
-	}
-
-	const PEXCEPTION_POINTERS info() const
-	{
-		return m_pExcptionInfor;
-	}
-
-	const unsigned int code() const
-	{
-		return m_nExceptionCode;
-	}
-
-private:
-	HMODULE m_hNtModule;
-
-	unsigned int m_nExceptionCode;
-	char* m_szMsgBuff;
-	PEXCEPTION_POINTERS m_pExcptionInfor;
-	fpRtlNtStatusToDosError RtlNtStatusToDosError;
-
-public:
-	static void(__cdecl TranslateSEHtoCE)(unsigned int nExceptionCode, struct _EXCEPTION_POINTERS* pstExcptionInfor)
-	{
-		throw seh_exception(nExceptionCode, pstExcptionInfor);
-	}
-
-};
-
-
diff --git a/Scripts/PackReleaseWithPDB.cmd b/Scripts/PackReleaseWithPDB.cmd
deleted file mode 100644
index dc012b7..0000000
--- a/Scripts/PackReleaseWithPDB.cmd
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off
-
-cd ..
-
-del /F /Q RELEASE\LLPreLoader.dll 2>nul
-del /F /Q RELEASE\LiteLoader.dll 2>nul
-rmdir /s /q RELEASE\plugins\LiteLoader\pdb 2>nul
-del /F /Q RELEASE\plugins\LiteLoader\LiteLoader.*.dll 2>nul
-del /F /Q RELEASE\LLPeEditor.exe 2>nul
-del /F /Q RELEASE\*.zip 2>nul
-del /F /Q LiteLoader.zip 2>nul
-del /F /Q LiteLoader-SDK.zip 2>nul
-
-echo [INFO] Packing RELEASE...
-echo.
-
-copy /Y ScriptEngine\BaseLib\* RELEASE\plugins\lib
-copy /Y x64\Release\LLPreLoader.dll RELEASE\LLPreLoader.dll
-copy /Y x64\Release\LiteLoader.dll RELEASE\LiteLoader.dll
-copy /Y x64\Release\LiteLoader.*.dll RELEASE\plugins\LiteLoader\
-mkdir RELEASE\plugins\LiteLoader\pdb
-copy /Y x64\Release\*.pdb RELEASE\plugins\LiteLoader\pdb\
-copy /Y Tools\LLPeEditor.exe RELEASE\LLPeEditor.exe
-copy /Y ScriptEngine\BaseLib\* RELEASE\plugins\lib\
-
-if [%1] neq [action] goto Zipped
-echo.
-echo [INFO] Zipping Files...
-cd RELEASE
-..\Tools\7zip\7za.exe a -y -tzip -mmt -mx=9 ..\LiteLoader.zip *
-cd ..
-:Zipped
-
-echo.
-echo [INFO] Packing RELEASE... DONE!
-
-if [%1]==[action] goto End
-explorer.exe .\RELEASE
-timeout /t 3 >nul
-:End
\ No newline at end of file
diff --git a/Scripts/PrepareLibraries.cmd b/Scripts/PrepareLibraries.cmd
new file mode 100644
index 0000000..bfca291
--- /dev/null
+++ b/Scripts/PrepareLibraries.cmd
@@ -0,0 +1,14 @@
+@echo off
+
+if not exist %1\LiteLoader\lib\bedrock_server_api.lib goto process
+if not exist %1\LiteLoader\lib\bedrock_server_var.lib goto process
+goto end
+
+:process
+cd /d %1\Tools
+LibraryBuilder.exe
+if not exist %1\LiteLoader\lib\ mkdir %1\LiteLoader\lib
+move %1\Tools\bedrock_server_api.lib %1\LiteLoader\lib\
+move %1\Tools\bedrock_server_var.lib %1\LiteLoader\lib\
+
+:end
diff --git a/Scripts/UploadSDK.cmd b/Scripts/UploadSDK.cmd
index b61f6d0..ead4603 100644
--- a/Scripts/UploadSDK.cmd
+++ b/Scripts/UploadSDK.cmd
@@ -1,9 +1,9 @@
 @echo off
 
-cd ..
+cd %~dp0..
 setlocal enabledelayedexpansion
 
-set LL_SDK_REMOTE_PATH=https://github.com/LiteLDev/LiteLoaderSDK.git
+set LL_SDK_REMOTE_PATH=https://github.com/quizhizhe/LL-SDK-cpp-1.16.40.git
 
 @REM rem Process System Proxy
 @REM for /f "tokens=3* delims= " %%i in ('Reg query "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyEnable') do (
@@ -46,14 +46,16 @@ echo.
 echo [INFO] Fetching LiteLoaderSDK to GitHub finished
 echo.
 
-@REM if [%1] neq [action] (
-    cd Scripts
-    echo [INFO] Packing LiteLoaderSDK ...
-    start /wait cmd /c PackSDK.cmd
-    echo [INFO] Packing LiteLoaderSDK finished.
-    echo.
-    cd ..
-@REM )
+@REM remove all directory except .git in LiteLoaderSDK
+for /f "delims=" %%i in ('dir /b /ad LiteLoaderSDK') do (
+    if not "%%i"==".git" (
+        echo [INFO] Removing LiteLoaderSDK\%%i
+        rd /s /q LiteLoaderSDK\%%i
+    )
+)
+
+@REM copy all from build/sdk to LiteLoaderSDK
+xcopy /e /y /i /q build\SDK\* LiteLoaderSDK
 
 cd LiteLoaderSDK
 for /f "delims=" %%i in ('git status . -s') do set LL_SDK_NOW_STATUS=%%i
@@ -63,7 +65,9 @@ if "%LL_SDK_NOW_STATUS%" neq "" (
     git add .
     if "%LL_SDK_NOW_BRANCH%" == "main" (
         git commit -m "From LiteLoader %LL_NOW_TAG%"
-        git tag %LL_NOW_TAG%
+        if [%2] == [release] (
+            git tag %LL_NOW_TAG%
+        )
     ) else (
         git commit -m "From LiteLoader %LL_NOW_TAG_LONG%"
     )
@@ -74,8 +78,8 @@ if "%LL_SDK_NOW_STATUS%" neq "" (
         git push origin %LL_SDK_NOW_BRANCH%
         git push --tags origin %LL_SDK_NOW_BRANCH%
     ) else (
-        git push https://%USERNAME%:%REPO_KEY%@github.com/LiteLDev/LiteLoaderSDK.git %LL_SDK_NOW_BRANCH%
-        git push --tags https://%USERNAME%:%REPO_KEY%@github.com/LiteLDev/LiteLoaderSDK.git %LL_SDK_NOW_BRANCH%
+        git push https://%USERNAME%:%REPO_KEY%@github.com/quizhizhe/LL-SDK-cpp-1.16.40.git %LL_SDK_NOW_BRANCH%
+        git push --tags https://%USERNAME%:%REPO_KEY%@github.com/quizhizhe/LL-SDK-cpp-1.16.40.git %LL_SDK_NOW_BRANCH%
     )
     cd ..
     echo.
diff --git a/Scripts/install.sh b/Scripts/install.sh
index 2fc5461..cd517d5 100644
--- a/Scripts/install.sh
+++ b/Scripts/install.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 # Install wine
 codename=$(lsb_release -c --short)
-BDSVER="1.19.20.02"
-LLVER="2.5.1"
+BDSVER="1.19.63.01"
+LLVER="2.11.0"
 sudo apt install -y wget unzip
 sudo dpkg --add-architecture i386
-sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
-sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/${codename}/winehq-${codename}.sources
+sudo mkdir -pm755 /etc/apt/keyrings
+sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/${codename}/winehq-${codename}.sources
 sudo apt update
 sudo apt install winehq-stable -y
 
@@ -14,15 +15,15 @@ sudo apt install winehq-stable -y
 wget https://minecraft.azureedge.net/bin-win/bedrock-server-${BDSVER}.zip
 unzip bedrock-server-${BDSVER}.zip -d bedrock_server
 cd bedrock_server
-wget https://github.com/LiteLDev/liteloaderbds-docker/raw/main/vcruntime140_1.dll
+wget https://github.com/LiteLDev/docker/raw/main/vcruntime140_1.dll
 cd ..
 rm bedrock-server-${BDSVER}.zip
 
 # Install LiteLoaderBDS
-wget https://github.com/LiteLDev/LiteLoaderBDS/releases/download/${LLVER}/LiteLoader-${LLVER}.zip
-unzip LiteLoader-${LLVER}.zip -d bedrock_server
-rm LiteLoader-${LLVER}.zip
+wget https://github.com/LiteLDev/LiteLoaderBDS/releases/download/${LLVER}/LiteLoaderBDS.zip
+unzip LiteLoader.zip -d bedrock_server
+rm LiteLoaderBDS.zip
 cd bedrock_server
 wine LLPeEditor.exe
 
-echo Done!
+echo Done!
\ No newline at end of file
diff --git a/Test/DBTest/DBTest/main.cpp b/Test/DBTest/DBTest/main.cpp
index 27977b5..5b13383 100644
--- a/Test/DBTest/DBTest/main.cpp
+++ b/Test/DBTest/DBTest/main.cpp
@@ -1,7 +1,7 @@
 #define LLDB_DEBUG_MODE
 #define _AMD64_
 #include 
-#include 
+#include "include/llapi/LoggerAPI.h"
 #include 
 #include 
 #include 
diff --git a/Tools/LibraryBuilder.exe b/Tools/LibraryBuilder.exe
index 1e7b554..102b3c3 100644
Binary files a/Tools/LibraryBuilder.exe and b/Tools/LibraryBuilder.exe differ
diff --git a/ScriptEngine/third-party/ScriptX/.clang-format b/Tools/ScriptX/.clang-format
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.clang-format
rename to Tools/ScriptX/.clang-format
diff --git a/ScriptEngine/third-party/ScriptX/.clang-tidy b/Tools/ScriptX/.clang-tidy
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.clang-tidy
rename to Tools/ScriptX/.clang-tidy
diff --git a/ScriptEngine/third-party/ScriptX/.devtools/LicenseHeader.template b/Tools/ScriptX/.devtools/LicenseHeader.template
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.devtools/LicenseHeader.template
rename to Tools/ScriptX/.devtools/LicenseHeader.template
diff --git a/ScriptEngine/third-party/ScriptX/.devtools/appendLicenseHeader.sh b/Tools/ScriptX/.devtools/appendLicenseHeader.sh
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.devtools/appendLicenseHeader.sh
rename to Tools/ScriptX/.devtools/appendLicenseHeader.sh
diff --git a/ScriptEngine/third-party/ScriptX/.devtools/hooks/pre-commit b/Tools/ScriptX/.devtools/hooks/pre-commit
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.devtools/hooks/pre-commit
rename to Tools/ScriptX/.devtools/hooks/pre-commit
diff --git a/ScriptEngine/third-party/ScriptX/.devtools/install.sh b/Tools/ScriptX/.devtools/install.sh
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.devtools/install.sh
rename to Tools/ScriptX/.devtools/install.sh
diff --git a/ScriptEngine/third-party/ScriptX/.devtools/new_backend.sh b/Tools/ScriptX/.devtools/new_backend.sh
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.devtools/new_backend.sh
rename to Tools/ScriptX/.devtools/new_backend.sh
diff --git a/ScriptEngine/third-party/ScriptX/.github/stale.yml b/Tools/ScriptX/.github/stale.yml
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.github/stale.yml
rename to Tools/ScriptX/.github/stale.yml
diff --git a/ScriptEngine/third-party/ScriptX/.github/workflows/coverage.yml b/Tools/ScriptX/.github/workflows/coverage.yml
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.github/workflows/coverage.yml
rename to Tools/ScriptX/.github/workflows/coverage.yml
diff --git a/ScriptEngine/third-party/ScriptX/.github/workflows/sync_to_tencent_code.yml b/Tools/ScriptX/.github/workflows/sync_to_tencent_code.yml
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.github/workflows/sync_to_tencent_code.yml
rename to Tools/ScriptX/.github/workflows/sync_to_tencent_code.yml
diff --git a/ScriptEngine/third-party/ScriptX/.github/workflows/unit_tests.yml b/Tools/ScriptX/.github/workflows/unit_tests.yml
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.github/workflows/unit_tests.yml
rename to Tools/ScriptX/.github/workflows/unit_tests.yml
diff --git a/ScriptEngine/third-party/ScriptX/.gitignore b/Tools/ScriptX/.gitignore
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/.gitignore
rename to Tools/ScriptX/.gitignore
diff --git a/ScriptEngine/third-party/ScriptX/CHANGELOG.md b/Tools/ScriptX/CHANGELOG.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/CHANGELOG.md
rename to Tools/ScriptX/CHANGELOG.md
diff --git a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt b/Tools/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt
similarity index 56%
rename from ScriptEngine/third-party/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt
rename to Tools/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt
index 0af9d0b..9fdff38 100644
--- a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt
+++ b/Tools/ScriptX/CMake/ScriptX-Lua/CMakeLists.txt
@@ -8,5 +8,6 @@ set(SCRIPTX_BACKEND Lua)
 
 project(ScriptX-Lua)
 
-include_directories(../../../Lua/include)
-include(../../CMakeLists.txt)
\ No newline at end of file
+include(../../CMakeLists.txt)
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/Lua/)
diff --git a/Tools/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt b/Tools/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt
new file mode 100644
index 0000000..886f4c7
--- /dev/null
+++ b/Tools/ScriptX/CMake/ScriptX-NodeJs/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.8)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SCRIPTX_BACKEND V8)
+
+project(ScriptX-NodeJs)
+
+include(../../CMakeLists.txt)
+
+target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/NodeJs
+        PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/NodeJs/v8
+)
diff --git a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt b/Tools/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt
similarity index 56%
rename from ScriptEngine/third-party/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt
rename to Tools/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt
index 906b3e5..a37e67e 100644
--- a/ScriptEngine/third-party/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt
+++ b/Tools/ScriptX/CMake/ScriptX-QuickJs/CMakeLists.txt
@@ -8,5 +8,6 @@ set(SCRIPTX_BACKEND QuickJs)
 
 project(ScriptX-QuickJs)
 
-include_directories(../../../QuickJs/include)
-include(../../CMakeLists.txt)
\ No newline at end of file
+include(../../CMakeLists.txt)
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/QuickJs)
diff --git a/ScriptEngine/third-party/ScriptX/CMakeLists.txt b/Tools/ScriptX/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/CMakeLists.txt
rename to Tools/ScriptX/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/CONTRIBUTING.md b/Tools/ScriptX/CONTRIBUTING.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/CONTRIBUTING.md
rename to Tools/ScriptX/CONTRIBUTING.md
diff --git a/ScriptEngine/third-party/ScriptX/LICENSE b/Tools/ScriptX/LICENSE
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/LICENSE
rename to Tools/ScriptX/LICENSE
diff --git a/ScriptEngine/third-party/ScriptX/README-zh.md b/Tools/ScriptX/README-zh.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/README-zh.md
rename to Tools/ScriptX/README-zh.md
diff --git a/ScriptEngine/third-party/ScriptX/README.md b/Tools/ScriptX/README.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/README.md
rename to Tools/ScriptX/README.md
diff --git a/ScriptEngine/third-party/ScriptX/VERSION b/Tools/ScriptX/VERSION
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/VERSION
rename to Tools/ScriptX/VERSION
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/CMakeLists.txt b/Tools/ScriptX/backend/JavaScriptCore/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/CMakeLists.txt
rename to Tools/ScriptX/backend/JavaScriptCore/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.cc b/Tools/ScriptX/backend/JavaScriptCore/JscEngine.cc
similarity index 94%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscEngine.cc
index 9ead88a..cec728f 100644
--- a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.cc
+++ b/Tools/ScriptX/backend/JavaScriptCore/JscEngine.cc
@@ -19,6 +19,7 @@
 #include "../../src/Native.hpp"
 #include "JscEngine.hpp"
 #include "JscHelper.h"
+#include "../../src/utils/Helper.hpp"
 
 namespace script::jsc_backend {
 
@@ -177,6 +178,27 @@ script::Local JscEngine::eval(const script::Local
   return eval(script, {});
 }
 
+Local JscEngine::loadFile(const Local& scriptFile) {
+  if(scriptFile.toString().empty())
+    throw Exception("script file no found");
+  Local content = internal::readAllFileContent(scriptFile);
+  if(content.isNull())
+    throw Exception("can't load script file");
+
+  std::string sourceFilePath = scriptFile.toString();
+  std::size_t pathSymbol = sourceFilePath.rfind("/");
+  if(pathSymbol != -1)
+    sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  else
+  {
+    pathSymbol = sourceFilePath.rfind("\\");
+    if(pathSymbol != -1)
+      sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  }
+  Local sourceFileName = String::newString(sourceFilePath);
+  return eval(content.asString(), sourceFileName);
+}
+
 std::shared_ptr JscEngine::messageQueue() { return messageQueue_; }
 
 void JscEngine::gc() {
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.h b/Tools/ScriptX/backend/JavaScriptCore/JscEngine.h
similarity index 99%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.h
rename to Tools/ScriptX/backend/JavaScriptCore/JscEngine.h
index aedd71e..0b8f581 100644
--- a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.h
+++ b/Tools/ScriptX/backend/JavaScriptCore/JscEngine.h
@@ -86,6 +86,8 @@ class JscEngine : public ::script::ScriptEngine {
   Local eval(const Local& script) override;
   using ScriptEngine::eval;
 
+  Local loadFile(const Local& scriptFile) override;
+
   std::shared_ptr messageQueue() override;
 
   void gc() override;
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.hpp b/Tools/ScriptX/backend/JavaScriptCore/JscEngine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscEngine.hpp
rename to Tools/ScriptX/backend/JavaScriptCore/JscEngine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscException.cc b/Tools/ScriptX/backend/JavaScriptCore/JscException.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscException.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscException.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.cc b/Tools/ScriptX/backend/JavaScriptCore/JscHelper.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscHelper.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.h b/Tools/ScriptX/backend/JavaScriptCore/JscHelper.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.h
rename to Tools/ScriptX/backend/JavaScriptCore/JscHelper.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.hpp b/Tools/ScriptX/backend/JavaScriptCore/JscHelper.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscHelper.hpp
rename to Tools/ScriptX/backend/JavaScriptCore/JscHelper.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscLocalReference.cc b/Tools/ScriptX/backend/JavaScriptCore/JscLocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscLocalReference.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscLocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscNative.cc b/Tools/ScriptX/backend/JavaScriptCore/JscNative.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscNative.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscNative.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscNative.hpp b/Tools/ScriptX/backend/JavaScriptCore/JscNative.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscNative.hpp
rename to Tools/ScriptX/backend/JavaScriptCore/JscNative.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscReference.hpp b/Tools/ScriptX/backend/JavaScriptCore/JscReference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscReference.hpp
rename to Tools/ScriptX/backend/JavaScriptCore/JscReference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscScope.cc b/Tools/ScriptX/backend/JavaScriptCore/JscScope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscScope.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscScope.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscScope.h b/Tools/ScriptX/backend/JavaScriptCore/JscScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscScope.h
rename to Tools/ScriptX/backend/JavaScriptCore/JscScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscUtils.cc b/Tools/ScriptX/backend/JavaScriptCore/JscUtils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscUtils.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscUtils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscValue.cc b/Tools/ScriptX/backend/JavaScriptCore/JscValue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscValue.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscValue.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.cc b/Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.cc
rename to Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.h b/Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.h
rename to Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.mm b/Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.mm
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/JscWeakRef.mm
rename to Tools/ScriptX/backend/JavaScriptCore/JscWeakRef.mm
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitEngine.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitEngine.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitException.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitException.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitIncludes.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitNative.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitNative.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitReference.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitReference.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitScope.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitScope.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitUtils.h b/Tools/ScriptX/backend/JavaScriptCore/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/JavaScriptCore/trait/TraitUtils.h
rename to Tools/ScriptX/backend/JavaScriptCore/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/CMakeLists.txt b/Tools/ScriptX/backend/Lua/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/CMakeLists.txt
rename to Tools/ScriptX/backend/Lua/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaByteBufferImpl.cc b/Tools/ScriptX/backend/Lua/LuaByteBufferImpl.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaByteBufferImpl.cc
rename to Tools/ScriptX/backend/Lua/LuaByteBufferImpl.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaByteBufferImpl.h b/Tools/ScriptX/backend/Lua/LuaByteBufferImpl.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaByteBufferImpl.h
rename to Tools/ScriptX/backend/Lua/LuaByteBufferImpl.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.cc b/Tools/ScriptX/backend/Lua/LuaEngine.cc
similarity index 95%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.cc
rename to Tools/ScriptX/backend/Lua/LuaEngine.cc
index ff86d29..9ce5715 100644
--- a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.cc
+++ b/Tools/ScriptX/backend/Lua/LuaEngine.cc
@@ -28,6 +28,7 @@
 #include "LuaHelper.hpp"
 #include "LuaReference.hpp"
 #include "LuaScope.hpp"
+#include "../../src/utils/Helper.hpp"
 
 // ref https://www.lua.org/manual/5.1/manual.html
 // https://www.lua.org/wshop14/Zykov.pdf
@@ -259,6 +260,27 @@ Local LuaEngine::eval(const Local& script, const Local& so
   return lua_backend::callFunction({}, {}, 0, nullptr);
 }
 
+Local LuaEngine::loadFile(const Local& scriptFile) {
+  if(scriptFile.toString().empty())
+    throw Exception("script file no found");
+  Local content = internal::readAllFileContent(scriptFile);
+  if(content.isNull())
+    throw Exception("can't load script file");
+
+  std::string sourceFilePath = scriptFile.toString();
+  std::size_t pathSymbol = sourceFilePath.rfind("/");
+  if(pathSymbol != -1)
+    sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  else
+  {
+    pathSymbol = sourceFilePath.rfind("\\");
+    if(pathSymbol != -1)
+      sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  }
+  Local sourceFileName = String::newString(sourceFilePath);
+  return eval(content.asString(), sourceFileName);
+}
+
 Arguments LuaEngine::makeArguments(LuaEngine* engine, int stackBase, size_t paramCount,
                                    bool isInstanceFunc) {
   lua_backend::ArgumentsData argumentsData{engine, stackBase, paramCount, isInstanceFunc};
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.h b/Tools/ScriptX/backend/Lua/LuaEngine.h
similarity index 98%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.h
rename to Tools/ScriptX/backend/Lua/LuaEngine.h
index 4a1ec3c..c2cd013 100644
--- a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.h
+++ b/Tools/ScriptX/backend/Lua/LuaEngine.h
@@ -77,6 +77,8 @@ class LuaEngine : public ScriptEngine {
   Local eval(const Local& script) override;
   using ScriptEngine::eval;
 
+  Local loadFile(const Local& scriptFile) override;
+
   std::shared_ptr messageQueue() override;
 
   void gc() override;
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.hpp b/Tools/ScriptX/backend/Lua/LuaEngine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaEngine.hpp
rename to Tools/ScriptX/backend/Lua/LuaEngine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaException.cc b/Tools/ScriptX/backend/Lua/LuaException.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaException.cc
rename to Tools/ScriptX/backend/Lua/LuaException.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.cc b/Tools/ScriptX/backend/Lua/LuaHelper.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.cc
rename to Tools/ScriptX/backend/Lua/LuaHelper.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.h b/Tools/ScriptX/backend/Lua/LuaHelper.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.h
rename to Tools/ScriptX/backend/Lua/LuaHelper.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.hpp b/Tools/ScriptX/backend/Lua/LuaHelper.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaHelper.hpp
rename to Tools/ScriptX/backend/Lua/LuaHelper.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaLocalReference.cc b/Tools/ScriptX/backend/Lua/LuaLocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaLocalReference.cc
rename to Tools/ScriptX/backend/Lua/LuaLocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaNative.cc b/Tools/ScriptX/backend/Lua/LuaNative.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaNative.cc
rename to Tools/ScriptX/backend/Lua/LuaNative.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaNative.hpp b/Tools/ScriptX/backend/Lua/LuaNative.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaNative.hpp
rename to Tools/ScriptX/backend/Lua/LuaNative.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaReference.hpp b/Tools/ScriptX/backend/Lua/LuaReference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaReference.hpp
rename to Tools/ScriptX/backend/Lua/LuaReference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaScope.cc b/Tools/ScriptX/backend/Lua/LuaScope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaScope.cc
rename to Tools/ScriptX/backend/Lua/LuaScope.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaScope.hpp b/Tools/ScriptX/backend/Lua/LuaScope.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaScope.hpp
rename to Tools/ScriptX/backend/Lua/LuaScope.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaUtils.cc b/Tools/ScriptX/backend/Lua/LuaUtils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaUtils.cc
rename to Tools/ScriptX/backend/Lua/LuaUtils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/LuaValue.cc b/Tools/ScriptX/backend/Lua/LuaValue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/LuaValue.cc
rename to Tools/ScriptX/backend/Lua/LuaValue.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitEngine.h b/Tools/ScriptX/backend/Lua/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitEngine.h
rename to Tools/ScriptX/backend/Lua/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitException.h b/Tools/ScriptX/backend/Lua/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitException.h
rename to Tools/ScriptX/backend/Lua/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitIncludes.h b/Tools/ScriptX/backend/Lua/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/Lua/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitNative.h b/Tools/ScriptX/backend/Lua/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitNative.h
rename to Tools/ScriptX/backend/Lua/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitReference.h b/Tools/ScriptX/backend/Lua/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitReference.h
rename to Tools/ScriptX/backend/Lua/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitScope.h b/Tools/ScriptX/backend/Lua/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitScope.h
rename to Tools/ScriptX/backend/Lua/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitUtils.h b/Tools/ScriptX/backend/Lua/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Lua/trait/TraitUtils.h
rename to Tools/ScriptX/backend/Lua/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Python/CMakeLists.txt b/Tools/ScriptX/backend/Python/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Python/CMakeLists.txt
rename to Tools/ScriptX/backend/Python/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/CMakeLists.txt b/Tools/ScriptX/backend/QuickJs/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/CMakeLists.txt
rename to Tools/ScriptX/backend/QuickJs/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.cc b/Tools/ScriptX/backend/QuickJs/QjsEngine.cc
similarity index 89%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.cc
rename to Tools/ScriptX/backend/QuickJs/QjsEngine.cc
index e71a6e7..3b043a6 100644
--- a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.cc
+++ b/Tools/ScriptX/backend/QuickJs/QjsEngine.cc
@@ -17,6 +17,7 @@
 
 #include "QjsEngine.h"
 #include 
+#include "../../src/utils/Helper.hpp"
 
 namespace script::qjs_backend {
 
@@ -94,6 +95,9 @@ QjsEngine::QjsEngine(std::shared_ptr queue, const QjsFactor
   }
 
   initEngineResource();
+
+  /* set default loader for ES6 modules */
+  JS_SetModuleLoaderFunc(runtime_, NULL, js_module_loader, NULL);  
 }
 
 void QjsEngine::initEngineResource() {
@@ -268,6 +272,39 @@ Local QjsEngine::eval(const Local& script, const Local& so
   return Local(ret);
 }
 
+Local QjsEngine::loadFile(const Local& scriptFile) {
+  Tracer trace(this, "QjsEngine::loadFile");
+
+  if(scriptFile.toString().empty())
+    throw Exception("script file no found");
+  Local content = internal::readAllFileContent(scriptFile);
+  if(content.isNull())
+    throw Exception("can't load script file");
+
+  // get source file name
+  std::string sourceFilePath = scriptFile.toString();
+  std::size_t pathSymbol = sourceFilePath.rfind("/");
+  if(pathSymbol != -1)
+    sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  else
+  {
+    pathSymbol = sourceFilePath.rfind("\\");
+    if(pathSymbol != -1)
+      sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  }
+  Local sourceFileName = String::newString(sourceFilePath);
+
+  StringHolder contentStr(content.asString());
+  StringHolder fileNameStr(sourceFileName);
+  JSValue ret = JS_Eval(context_, contentStr.c_str(), contentStr.length(), fileNameStr.c_str(),
+      JS_EVAL_TYPE_MODULE);
+    
+  qjs_backend::checkException(ret);
+  scheduleTick();
+
+  return Local(ret);
+}
+
 std::shared_ptr QjsEngine::messageQueue() { return queue_; }
 
 void QjsEngine::gc() {
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.h b/Tools/ScriptX/backend/QuickJs/QjsEngine.h
similarity index 98%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.h
rename to Tools/ScriptX/backend/QuickJs/QjsEngine.h
index 6ea4966..b810323 100644
--- a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.h
+++ b/Tools/ScriptX/backend/QuickJs/QjsEngine.h
@@ -94,6 +94,8 @@ class QjsEngine : public ScriptEngine {
   Local eval(const Local& script) override;
   using ScriptEngine::eval;
 
+  Local loadFile(const Local& scriptFile) override;
+
   std::shared_ptr messageQueue() override;
 
   void gc() override;
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.hpp b/Tools/ScriptX/backend/QuickJs/QjsEngine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsEngine.hpp
rename to Tools/ScriptX/backend/QuickJs/QjsEngine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsException.cc b/Tools/ScriptX/backend/QuickJs/QjsException.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsException.cc
rename to Tools/ScriptX/backend/QuickJs/QjsException.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.cc b/Tools/ScriptX/backend/QuickJs/QjsHelper.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.cc
rename to Tools/ScriptX/backend/QuickJs/QjsHelper.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.h b/Tools/ScriptX/backend/QuickJs/QjsHelper.h
similarity index 98%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.h
rename to Tools/ScriptX/backend/QuickJs/QjsHelper.h
index a9a5577..4c0d4da 100644
--- a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.h
+++ b/Tools/ScriptX/backend/QuickJs/QjsHelper.h
@@ -21,6 +21,7 @@
 
 SCRIPTX_BEGIN_INCLUDE_LIBRARY
 #include 
+#include 
 SCRIPTX_END_INCLUDE_LIBRARY
 
 namespace script::qjs_backend {
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.hpp b/Tools/ScriptX/backend/QuickJs/QjsHelper.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsHelper.hpp
rename to Tools/ScriptX/backend/QuickJs/QjsHelper.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsLocalReference.cc b/Tools/ScriptX/backend/QuickJs/QjsLocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsLocalReference.cc
rename to Tools/ScriptX/backend/QuickJs/QjsLocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsNative.cc b/Tools/ScriptX/backend/QuickJs/QjsNative.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsNative.cc
rename to Tools/ScriptX/backend/QuickJs/QjsNative.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsNative.hpp b/Tools/ScriptX/backend/QuickJs/QjsNative.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsNative.hpp
rename to Tools/ScriptX/backend/QuickJs/QjsNative.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsReference.hpp b/Tools/ScriptX/backend/QuickJs/QjsReference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsReference.hpp
rename to Tools/ScriptX/backend/QuickJs/QjsReference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsScope.cc b/Tools/ScriptX/backend/QuickJs/QjsScope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsScope.cc
rename to Tools/ScriptX/backend/QuickJs/QjsScope.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsUtils.cc b/Tools/ScriptX/backend/QuickJs/QjsUtils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsUtils.cc
rename to Tools/ScriptX/backend/QuickJs/QjsUtils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsValue.cc b/Tools/ScriptX/backend/QuickJs/QjsValue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/QjsValue.cc
rename to Tools/ScriptX/backend/QuickJs/QjsValue.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/patch/0001-Add-new-APIs-for-ScriptX-for-QuickJs-2021-03-27.patch b/Tools/ScriptX/backend/QuickJs/patch/0001-Add-new-APIs-for-ScriptX-for-QuickJs-2021-03-27.patch
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/patch/0001-Add-new-APIs-for-ScriptX-for-QuickJs-2021-03-27.patch
rename to Tools/ScriptX/backend/QuickJs/patch/0001-Add-new-APIs-for-ScriptX-for-QuickJs-2021-03-27.patch
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitEngine.h b/Tools/ScriptX/backend/QuickJs/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitEngine.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitException.h b/Tools/ScriptX/backend/QuickJs/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitException.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitIncludes.h b/Tools/ScriptX/backend/QuickJs/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitNative.h b/Tools/ScriptX/backend/QuickJs/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitNative.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitReference.h b/Tools/ScriptX/backend/QuickJs/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitReference.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitScope.h b/Tools/ScriptX/backend/QuickJs/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitScope.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitUtils.h b/Tools/ScriptX/backend/QuickJs/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/QuickJs/trait/TraitUtils.h
rename to Tools/ScriptX/backend/QuickJs/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Ruby/CMakeLists.txt b/Tools/ScriptX/backend/Ruby/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Ruby/CMakeLists.txt
rename to Tools/ScriptX/backend/Ruby/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/SpiderMonkey/CMakeLists.txt b/Tools/ScriptX/backend/SpiderMonkey/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/SpiderMonkey/CMakeLists.txt
rename to Tools/ScriptX/backend/SpiderMonkey/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/CMakeLists.txt b/Tools/ScriptX/backend/Template/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/CMakeLists.txt
rename to Tools/ScriptX/backend/Template/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/README.md b/Tools/ScriptX/backend/Template/README.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/README.md
rename to Tools/ScriptX/backend/Template/README.md
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateEngine.cc b/Tools/ScriptX/backend/Template/TemplateEngine.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateEngine.cc
rename to Tools/ScriptX/backend/Template/TemplateEngine.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateEngine.h b/Tools/ScriptX/backend/Template/TemplateEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateEngine.h
rename to Tools/ScriptX/backend/Template/TemplateEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateException.cc b/Tools/ScriptX/backend/Template/TemplateException.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateException.cc
rename to Tools/ScriptX/backend/Template/TemplateException.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateLocalReference.cc b/Tools/ScriptX/backend/Template/TemplateLocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateLocalReference.cc
rename to Tools/ScriptX/backend/Template/TemplateLocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateNative.cc b/Tools/ScriptX/backend/Template/TemplateNative.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateNative.cc
rename to Tools/ScriptX/backend/Template/TemplateNative.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateNative.hpp b/Tools/ScriptX/backend/Template/TemplateNative.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateNative.hpp
rename to Tools/ScriptX/backend/Template/TemplateNative.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateReference.hpp b/Tools/ScriptX/backend/Template/TemplateReference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateReference.hpp
rename to Tools/ScriptX/backend/Template/TemplateReference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateUtils.cc b/Tools/ScriptX/backend/Template/TemplateUtils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateUtils.cc
rename to Tools/ScriptX/backend/Template/TemplateUtils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/TemplateValue.cc b/Tools/ScriptX/backend/Template/TemplateValue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/TemplateValue.cc
rename to Tools/ScriptX/backend/Template/TemplateValue.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitEngine.h b/Tools/ScriptX/backend/Template/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitEngine.h
rename to Tools/ScriptX/backend/Template/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitException.h b/Tools/ScriptX/backend/Template/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitException.h
rename to Tools/ScriptX/backend/Template/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitIncludes.h b/Tools/ScriptX/backend/Template/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/Template/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitNative.h b/Tools/ScriptX/backend/Template/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitNative.h
rename to Tools/ScriptX/backend/Template/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitReference.h b/Tools/ScriptX/backend/Template/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitReference.h
rename to Tools/ScriptX/backend/Template/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitScope.h b/Tools/ScriptX/backend/Template/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitScope.h
rename to Tools/ScriptX/backend/Template/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitUtils.h b/Tools/ScriptX/backend/Template/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/Template/trait/TraitUtils.h
rename to Tools/ScriptX/backend/Template/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/CMakeLists.txt b/Tools/ScriptX/backend/V8/CMakeLists.txt
similarity index 96%
rename from ScriptEngine/third-party/ScriptX/backend/V8/CMakeLists.txt
rename to Tools/ScriptX/backend/V8/CMakeLists.txt
index 9575532..45165ab 100644
--- a/ScriptEngine/third-party/ScriptX/backend/V8/CMakeLists.txt
+++ b/Tools/ScriptX/backend/V8/CMakeLists.txt
@@ -14,7 +14,7 @@ target_sources(${PROJECT_NAME} PRIVATE
 
 if (${SCRIPTX_FEATURE_INSPECTOR})
 
-    target_sources(ScriptX PRIVATE
+    target_sources(${PROJECT_NAME} PRIVATE
             ${CMAKE_CURRENT_LIST_DIR}/V8Inspector.cc
             )
 
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.cc b/Tools/ScriptX/backend/V8/V8Engine.cc
similarity index 93%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.cc
rename to Tools/ScriptX/backend/V8/V8Engine.cc
index 2368652..a208ac0 100644
--- a/ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.cc
+++ b/Tools/ScriptX/backend/V8/V8Engine.cc
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include "../../src/utils/Helper.hpp"
 
 namespace script::v8_backend {
 
@@ -174,6 +175,27 @@ Local V8Engine::eval(const Local& script, const Local& so
 
 Local V8Engine::eval(const Local& script) { return eval(script, {}); }
 
+Local V8Engine::loadFile(const Local& scriptFile) {
+  if(scriptFile.toString().empty())
+    throw Exception("script file no found");
+  Local content = internal::readAllFileContent(scriptFile);
+  if(content.isNull())
+    throw Exception("can't load script file");
+
+  std::string sourceFilePath = scriptFile.toString();
+  std::size_t pathSymbol = sourceFilePath.rfind("/");
+  if(pathSymbol != -1)
+    sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  else
+  {
+    pathSymbol = sourceFilePath.rfind("\\");
+    if(pathSymbol != -1)
+      sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  }
+  Local sourceFileName = String::newString(sourceFilePath);
+  return eval(content.asString(), sourceFileName);
+}
+
 void V8Engine::registerNativeClassStatic(v8::Local funcT,
                                          const internal::StaticDefine* staticDefine) {
   for (auto& prop : staticDefine->properties) {
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.h b/Tools/ScriptX/backend/V8/V8Engine.h
similarity index 99%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.h
rename to Tools/ScriptX/backend/V8/V8Engine.h
index 8942ecf..ad9b137 100644
--- a/ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.h
+++ b/Tools/ScriptX/backend/V8/V8Engine.h
@@ -115,6 +115,8 @@ class V8Engine : public ::script::ScriptEngine {
   Local eval(const Local& script) override;
   using ScriptEngine::eval;
 
+  Local loadFile(const Local& scriptFile) override;
+
   /**
    * Create a new V8 Engine that share the same isolate, but with different context.
    * Caller own the returned pointer, and the returned instance
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.hpp b/Tools/ScriptX/backend/V8/V8Engine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Engine.hpp
rename to Tools/ScriptX/backend/V8/V8Engine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Exception.cc b/Tools/ScriptX/backend/V8/V8Exception.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Exception.cc
rename to Tools/ScriptX/backend/V8/V8Exception.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.cc b/Tools/ScriptX/backend/V8/V8Helper.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.cc
rename to Tools/ScriptX/backend/V8/V8Helper.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.h b/Tools/ScriptX/backend/V8/V8Helper.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.h
rename to Tools/ScriptX/backend/V8/V8Helper.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.hpp b/Tools/ScriptX/backend/V8/V8Helper.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Helper.hpp
rename to Tools/ScriptX/backend/V8/V8Helper.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Inspector.cc b/Tools/ScriptX/backend/V8/V8Inspector.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Inspector.cc
rename to Tools/ScriptX/backend/V8/V8Inspector.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8LocalReference.cc b/Tools/ScriptX/backend/V8/V8LocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8LocalReference.cc
rename to Tools/ScriptX/backend/V8/V8LocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Native.cc b/Tools/ScriptX/backend/V8/V8Native.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Native.cc
rename to Tools/ScriptX/backend/V8/V8Native.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Native.hpp b/Tools/ScriptX/backend/V8/V8Native.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Native.hpp
rename to Tools/ScriptX/backend/V8/V8Native.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Platform.cc b/Tools/ScriptX/backend/V8/V8Platform.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Platform.cc
rename to Tools/ScriptX/backend/V8/V8Platform.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Platform.h b/Tools/ScriptX/backend/V8/V8Platform.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Platform.h
rename to Tools/ScriptX/backend/V8/V8Platform.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Reference.hpp b/Tools/ScriptX/backend/V8/V8Reference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Reference.hpp
rename to Tools/ScriptX/backend/V8/V8Reference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.cc b/Tools/ScriptX/backend/V8/V8Scope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.cc
rename to Tools/ScriptX/backend/V8/V8Scope.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.h b/Tools/ScriptX/backend/V8/V8Scope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.h
rename to Tools/ScriptX/backend/V8/V8Scope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.hpp b/Tools/ScriptX/backend/V8/V8Scope.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Scope.hpp
rename to Tools/ScriptX/backend/V8/V8Scope.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Utils.cc b/Tools/ScriptX/backend/V8/V8Utils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Utils.cc
rename to Tools/ScriptX/backend/V8/V8Utils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/V8Value.cc b/Tools/ScriptX/backend/V8/V8Value.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/V8Value.cc
rename to Tools/ScriptX/backend/V8/V8Value.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/thirdparty/utfcpp/utf8-min.h b/Tools/ScriptX/backend/V8/thirdparty/utfcpp/utf8-min.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/thirdparty/utfcpp/utf8-min.h
rename to Tools/ScriptX/backend/V8/thirdparty/utfcpp/utf8-min.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitEngine.h b/Tools/ScriptX/backend/V8/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitEngine.h
rename to Tools/ScriptX/backend/V8/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitException.h b/Tools/ScriptX/backend/V8/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitException.h
rename to Tools/ScriptX/backend/V8/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitIncludes.h b/Tools/ScriptX/backend/V8/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/V8/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitNative.h b/Tools/ScriptX/backend/V8/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitNative.h
rename to Tools/ScriptX/backend/V8/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitReference.h b/Tools/ScriptX/backend/V8/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitReference.h
rename to Tools/ScriptX/backend/V8/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitScope.h b/Tools/ScriptX/backend/V8/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitScope.h
rename to Tools/ScriptX/backend/V8/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitUtils.h b/Tools/ScriptX/backend/V8/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/V8/trait/TraitUtils.h
rename to Tools/ScriptX/backend/V8/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WKWebView/CMakeLists.txt b/Tools/ScriptX/backend/WKWebView/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WKWebView/CMakeLists.txt
rename to Tools/ScriptX/backend/WKWebView/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/CMakeLists.txt b/Tools/ScriptX/backend/WebAssembly/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/CMakeLists.txt
rename to Tools/ScriptX/backend/WebAssembly/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.cc b/Tools/ScriptX/backend/WebAssembly/WasmEngine.cc
similarity index 86%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmEngine.cc
index c52d446..727323d 100644
--- a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.cc
+++ b/Tools/ScriptX/backend/WebAssembly/WasmEngine.cc
@@ -23,6 +23,7 @@
 #include "WasmNative.hpp"
 #include "WasmReference.hpp"
 #include "WasmScope.hpp"
+#include "../../src/utils/Helper.hpp"
 
 namespace script::wasm_backend {
 
@@ -76,6 +77,27 @@ Local WasmEngine::eval(const Local& script, const Local& s
   return Local(retIndex);
 }
 
+Local WasmEngine::loadFile(const Local& scriptFile) {
+  if(scriptFile.toString().empty())
+    throw Exception("script file no found");
+  Local content = internal::readAllFileContent(scriptFile);
+  if(content.isNull())
+    throw Exception("can't load script file");
+
+  std::string sourceFilePath = scriptFile.toString();
+  std::size_t pathSymbol = sourceFilePath.rfind("/");
+  if(pathSymbol != -1)
+    sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  else
+  {
+    pathSymbol = sourceFilePath.rfind("\\");
+    if(pathSymbol != -1)
+      sourceFilePath = sourceFilePath.substr(pathSymbol + 1);
+  }
+  Local sourceFileName = String::newString(sourceFilePath);
+  return eval(content.asString(), sourceFileName);
+}
+
 std::shared_ptr WasmEngine::messageQueue() { return messageQueue_; }
 
 void WasmEngine::gc() {}
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.h b/Tools/ScriptX/backend/WebAssembly/WasmEngine.h
similarity index 97%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.h
rename to Tools/ScriptX/backend/WebAssembly/WasmEngine.h
index b8d629f..9384dcb 100644
--- a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.h
+++ b/Tools/ScriptX/backend/WebAssembly/WasmEngine.h
@@ -74,6 +74,8 @@ class WasmEngine : public ScriptEngine {
   Local eval(const Local& script) override;
   using ScriptEngine::eval;
 
+  Local loadFile(const Local& scriptFile) override;
+
   std::shared_ptr messageQueue() override;
 
   void gc() override;
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.hpp b/Tools/ScriptX/backend/WebAssembly/WasmEngine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmEngine.hpp
rename to Tools/ScriptX/backend/WebAssembly/WasmEngine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmException.cc b/Tools/ScriptX/backend/WebAssembly/WasmException.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmException.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmException.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmHelper.cc b/Tools/ScriptX/backend/WebAssembly/WasmHelper.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmHelper.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmHelper.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmHelper.h b/Tools/ScriptX/backend/WebAssembly/WasmHelper.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmHelper.h
rename to Tools/ScriptX/backend/WebAssembly/WasmHelper.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmLocalReference.cc b/Tools/ScriptX/backend/WebAssembly/WasmLocalReference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmLocalReference.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmLocalReference.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmNative.cc b/Tools/ScriptX/backend/WebAssembly/WasmNative.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmNative.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmNative.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmNative.hpp b/Tools/ScriptX/backend/WebAssembly/WasmNative.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmNative.hpp
rename to Tools/ScriptX/backend/WebAssembly/WasmNative.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmReference.hpp b/Tools/ScriptX/backend/WebAssembly/WasmReference.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmReference.hpp
rename to Tools/ScriptX/backend/WebAssembly/WasmReference.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmScope.cc b/Tools/ScriptX/backend/WebAssembly/WasmScope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmScope.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmScope.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmScope.hpp b/Tools/ScriptX/backend/WebAssembly/WasmScope.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmScope.hpp
rename to Tools/ScriptX/backend/WebAssembly/WasmScope.hpp
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmUtils.cc b/Tools/ScriptX/backend/WebAssembly/WasmUtils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmUtils.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmUtils.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmValue.cc b/Tools/ScriptX/backend/WebAssembly/WasmValue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/WasmValue.cc
rename to Tools/ScriptX/backend/WebAssembly/WasmValue.cc
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitEngine.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitEngine.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitEngine.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitEngine.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitException.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitException.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitException.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitException.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitIncludes.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitIncludes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitIncludes.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitIncludes.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitNative.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitNative.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitNative.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitNative.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitReference.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitReference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitReference.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitReference.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitScope.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitScope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitScope.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitScope.h
diff --git a/ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitUtils.h b/Tools/ScriptX/backend/WebAssembly/trait/TraitUtils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/backend/WebAssembly/trait/TraitUtils.h
rename to Tools/ScriptX/backend/WebAssembly/trait/TraitUtils.h
diff --git a/ScriptEngine/third-party/ScriptX/docs/doxygen/CMakeLists.txt b/Tools/ScriptX/docs/doxygen/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/doxygen/CMakeLists.txt
rename to Tools/ScriptX/docs/doxygen/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/docs/doxygen/Doxyfile.in b/Tools/ScriptX/docs/doxygen/Doxyfile.in
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/doxygen/Doxyfile.in
rename to Tools/ScriptX/docs/doxygen/Doxyfile.in
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/Basics.md b/Tools/ScriptX/docs/en/Basics.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/Basics.md
rename to Tools/ScriptX/docs/en/Basics.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/Exception.md b/Tools/ScriptX/docs/en/Exception.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/Exception.md
rename to Tools/ScriptX/docs/en/Exception.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/FAQ.md b/Tools/ScriptX/docs/en/FAQ.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/FAQ.md
rename to Tools/ScriptX/docs/en/FAQ.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/ImportScriptX.md b/Tools/ScriptX/docs/en/ImportScriptX.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/ImportScriptX.md
rename to Tools/ScriptX/docs/en/ImportScriptX.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/Interop.md b/Tools/ScriptX/docs/en/Interop.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/Interop.md
rename to Tools/ScriptX/docs/en/Interop.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/JavaScript.md b/Tools/ScriptX/docs/en/JavaScript.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/JavaScript.md
rename to Tools/ScriptX/docs/en/JavaScript.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/Lua.md b/Tools/ScriptX/docs/en/Lua.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/Lua.md
rename to Tools/ScriptX/docs/en/Lua.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/NativeBinding.md b/Tools/ScriptX/docs/en/NativeBinding.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/NativeBinding.md
rename to Tools/ScriptX/docs/en/NativeBinding.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/NodeJs.md b/Tools/ScriptX/docs/en/NodeJs.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/NodeJs.md
rename to Tools/ScriptX/docs/en/NodeJs.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/Performance.md b/Tools/ScriptX/docs/en/Performance.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/Performance.md
rename to Tools/ScriptX/docs/en/Performance.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/PureCpp2020.md b/Tools/ScriptX/docs/en/PureCpp2020.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/PureCpp2020.md
rename to Tools/ScriptX/docs/en/PureCpp2020.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/QuickJs.md b/Tools/ScriptX/docs/en/QuickJs.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/QuickJs.md
rename to Tools/ScriptX/docs/en/QuickJs.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/QuickStart.md b/Tools/ScriptX/docs/en/QuickStart.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/QuickStart.md
rename to Tools/ScriptX/docs/en/QuickStart.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/TOC.md b/Tools/ScriptX/docs/en/TOC.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/TOC.md
rename to Tools/ScriptX/docs/en/TOC.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/en/WebAssembly.md b/Tools/ScriptX/docs/en/WebAssembly.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/en/WebAssembly.md
rename to Tools/ScriptX/docs/en/WebAssembly.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/banner.webp b/Tools/ScriptX/docs/media/banner.webp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/banner.webp
rename to Tools/ScriptX/docs/media/banner.webp
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/multilingual_structure.svg b/Tools/ScriptX/docs/media/multilingual_structure.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/multilingual_structure.svg
rename to Tools/ScriptX/docs/media/multilingual_structure.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/multilingual_structure_zh.svg b/Tools/ScriptX/docs/media/multilingual_structure_zh.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/multilingual_structure_zh.svg
rename to Tools/ScriptX/docs/media/multilingual_structure_zh.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/performance.webp b/Tools/ScriptX/docs/media/performance.webp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/performance.webp
rename to Tools/ScriptX/docs/media/performance.webp
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/scriptx_logo.svg b/Tools/ScriptX/docs/media/scriptx_logo.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/scriptx_logo.svg
rename to Tools/ScriptX/docs/media/scriptx_logo.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/webassembly_non_shared_bytebuffer.svg b/Tools/ScriptX/docs/media/webassembly_non_shared_bytebuffer.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/webassembly_non_shared_bytebuffer.svg
rename to Tools/ScriptX/docs/media/webassembly_non_shared_bytebuffer.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/webassembly_shared_bytebuffer.svg b/Tools/ScriptX/docs/media/webassembly_shared_bytebuffer.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/webassembly_shared_bytebuffer.svg
rename to Tools/ScriptX/docs/media/webassembly_shared_bytebuffer.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/webassembly_v8_jscore.svg b/Tools/ScriptX/docs/media/webassembly_v8_jscore.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/webassembly_v8_jscore.svg
rename to Tools/ScriptX/docs/media/webassembly_v8_jscore.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/media/webassembly_webassembly.svg b/Tools/ScriptX/docs/media/webassembly_webassembly.svg
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/media/webassembly_webassembly.svg
rename to Tools/ScriptX/docs/media/webassembly_webassembly.svg
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/Basics.md b/Tools/ScriptX/docs/zh/Basics.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/Basics.md
rename to Tools/ScriptX/docs/zh/Basics.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/Exception.md b/Tools/ScriptX/docs/zh/Exception.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/Exception.md
rename to Tools/ScriptX/docs/zh/Exception.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/FAQ.md b/Tools/ScriptX/docs/zh/FAQ.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/FAQ.md
rename to Tools/ScriptX/docs/zh/FAQ.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/ImportScriptX.md b/Tools/ScriptX/docs/zh/ImportScriptX.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/ImportScriptX.md
rename to Tools/ScriptX/docs/zh/ImportScriptX.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/Interop.md b/Tools/ScriptX/docs/zh/Interop.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/Interop.md
rename to Tools/ScriptX/docs/zh/Interop.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/JavaScript.md b/Tools/ScriptX/docs/zh/JavaScript.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/JavaScript.md
rename to Tools/ScriptX/docs/zh/JavaScript.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/Lua.md b/Tools/ScriptX/docs/zh/Lua.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/Lua.md
rename to Tools/ScriptX/docs/zh/Lua.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/NativeBinding.md b/Tools/ScriptX/docs/zh/NativeBinding.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/NativeBinding.md
rename to Tools/ScriptX/docs/zh/NativeBinding.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/NodeJs.md b/Tools/ScriptX/docs/zh/NodeJs.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/NodeJs.md
rename to Tools/ScriptX/docs/zh/NodeJs.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/Performance.md b/Tools/ScriptX/docs/zh/Performance.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/Performance.md
rename to Tools/ScriptX/docs/zh/Performance.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/PureCpp2020.md b/Tools/ScriptX/docs/zh/PureCpp2020.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/PureCpp2020.md
rename to Tools/ScriptX/docs/zh/PureCpp2020.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/QuickJs.md b/Tools/ScriptX/docs/zh/QuickJs.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/QuickJs.md
rename to Tools/ScriptX/docs/zh/QuickJs.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/QuickStart.md b/Tools/ScriptX/docs/zh/QuickStart.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/QuickStart.md
rename to Tools/ScriptX/docs/zh/QuickStart.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/TOC.md b/Tools/ScriptX/docs/zh/TOC.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/TOC.md
rename to Tools/ScriptX/docs/zh/TOC.md
diff --git a/ScriptEngine/third-party/ScriptX/docs/zh/WebAssembly.md b/Tools/ScriptX/docs/zh/WebAssembly.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/docs/zh/WebAssembly.md
rename to Tools/ScriptX/docs/zh/WebAssembly.md
diff --git a/ScriptEngine/third-party/ScriptX/src/Engine.cc b/Tools/ScriptX/src/Engine.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Engine.cc
rename to Tools/ScriptX/src/Engine.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/Engine.h b/Tools/ScriptX/src/Engine.h
similarity index 95%
rename from ScriptEngine/third-party/ScriptX/src/Engine.h
rename to Tools/ScriptX/src/Engine.h
index 6697efb..6cf7b66 100644
--- a/ScriptEngine/third-party/ScriptX/src/Engine.h
+++ b/Tools/ScriptX/src/Engine.h
@@ -120,6 +120,17 @@ class ScriptEngine {
                 String::newString(std::forward(sourceFileStringLike)));
   }
 
+  /**
+   * @param scriptFile path of script file to load
+   * @return evaluate result
+   */
+  virtual Local loadFile(const Local& scriptFile) = 0;
+
+  template 
+  Local loadFile(T&& scriptFileStringLike) {
+    return loadFile(String::newString(std::forward(scriptFileStringLike)));
+  }
+
   /**
    * register a native class definition (constructor & property & function) to script.
    * @tparam T a subclass of the NativeClass, which implements all the Script-Native method in cpp.
diff --git a/ScriptEngine/third-party/ScriptX/src/Engine.hpp b/Tools/ScriptX/src/Engine.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Engine.hpp
rename to Tools/ScriptX/src/Engine.hpp
diff --git a/ScriptEngine/third-party/ScriptX/src/Exception.h b/Tools/ScriptX/src/Exception.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Exception.h
rename to Tools/ScriptX/src/Exception.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Includes.h b/Tools/ScriptX/src/Includes.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Includes.h
rename to Tools/ScriptX/src/Includes.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Inspector.h b/Tools/ScriptX/src/Inspector.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Inspector.h
rename to Tools/ScriptX/src/Inspector.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Native.h b/Tools/ScriptX/src/Native.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Native.h
rename to Tools/ScriptX/src/Native.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Native.hpp b/Tools/ScriptX/src/Native.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Native.hpp
rename to Tools/ScriptX/src/Native.hpp
diff --git a/ScriptEngine/third-party/ScriptX/src/NativeConverter.hpp b/Tools/ScriptX/src/NativeConverter.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/NativeConverter.hpp
rename to Tools/ScriptX/src/NativeConverter.hpp
diff --git a/ScriptEngine/third-party/ScriptX/src/Reference.cc b/Tools/ScriptX/src/Reference.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Reference.cc
rename to Tools/ScriptX/src/Reference.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/Reference.h b/Tools/ScriptX/src/Reference.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Reference.h
rename to Tools/ScriptX/src/Reference.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Scope.cc b/Tools/ScriptX/src/Scope.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Scope.cc
rename to Tools/ScriptX/src/Scope.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/Scope.h b/Tools/ScriptX/src/Scope.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Scope.h
rename to Tools/ScriptX/src/Scope.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Utils.cc b/Tools/ScriptX/src/Utils.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Utils.cc
rename to Tools/ScriptX/src/Utils.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/Utils.h b/Tools/ScriptX/src/Utils.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Utils.h
rename to Tools/ScriptX/src/Utils.h
diff --git a/ScriptEngine/third-party/ScriptX/src/Value.h b/Tools/ScriptX/src/Value.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/Value.h
rename to Tools/ScriptX/src/Value.h
diff --git a/ScriptEngine/third-party/ScriptX/src/foundation.h b/Tools/ScriptX/src/foundation.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/foundation.h
rename to Tools/ScriptX/src/foundation.h
diff --git a/ScriptEngine/third-party/ScriptX/src/include/ScriptX/ScriptX.h b/Tools/ScriptX/src/include/ScriptX/ScriptX.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/include/ScriptX/ScriptX.h
rename to Tools/ScriptX/src/include/ScriptX/ScriptX.h
diff --git a/ScriptEngine/third-party/ScriptX/src/types.h b/Tools/ScriptX/src/types.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/types.h
rename to Tools/ScriptX/src/types.h
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/GlobalWeakBookkeeping.hpp b/Tools/ScriptX/src/utils/GlobalWeakBookkeeping.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/GlobalWeakBookkeeping.hpp
rename to Tools/ScriptX/src/utils/GlobalWeakBookkeeping.hpp
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/Helper.cc b/Tools/ScriptX/src/utils/Helper.cc
similarity index 80%
rename from ScriptEngine/third-party/ScriptX/src/utils/Helper.cc
rename to Tools/ScriptX/src/utils/Helper.cc
index 18eb70c..37040f0 100644
--- a/ScriptEngine/third-party/ScriptX/src/utils/Helper.cc
+++ b/Tools/ScriptX/src/utils/Helper.cc
@@ -18,6 +18,7 @@
 #include 
 
 #include 
+#include 
 
 namespace script::internal {
 
@@ -56,4 +57,17 @@ Local getNamespaceObject(ScriptEngine* engine, const std::string_view& na
   return nameSpaceObj;
 }
 
+Local readAllFileContent(const Local& scriptFile)
+{
+  std::ifstream fRead;
+  fRead.open(scriptFile.toString(), std::ios_base::in);
+  if (!fRead.is_open()) {
+      return Local();
+  }
+  std::string data((std::istreambuf_iterator(fRead)),
+                    std::istreambuf_iterator());
+  fRead.close();
+  return String::newString(std::move(data)).asValue();
+}
+
 }  // namespace script::internal
\ No newline at end of file
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/Helper.hpp b/Tools/ScriptX/src/utils/Helper.hpp
similarity index 94%
rename from ScriptEngine/third-party/ScriptX/src/utils/Helper.hpp
rename to Tools/ScriptX/src/utils/Helper.hpp
index 6790ccb..541791d 100644
--- a/ScriptEngine/third-party/ScriptX/src/utils/Helper.hpp
+++ b/Tools/ScriptX/src/utils/Helper.hpp
@@ -55,4 +55,6 @@ void withNArray(size_t N, FN&& fn) {
 
 Local getNamespaceObject(ScriptEngine* engine, const std::string_view& nameSpace,
                                 Local rootNs = {});
+
+Local readAllFileContent(const Local& scriptFile);
 }  // namespace script::internal
\ No newline at end of file
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/MemoryPool.hpp b/Tools/ScriptX/src/utils/MemoryPool.hpp
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/MemoryPool.hpp
rename to Tools/ScriptX/src/utils/MemoryPool.hpp
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/MessageQueue.cc b/Tools/ScriptX/src/utils/MessageQueue.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/MessageQueue.cc
rename to Tools/ScriptX/src/utils/MessageQueue.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/MessageQueue.h b/Tools/ScriptX/src/utils/MessageQueue.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/MessageQueue.h
rename to Tools/ScriptX/src/utils/MessageQueue.h
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/ThreadLocal.h b/Tools/ScriptX/src/utils/ThreadLocal.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/ThreadLocal.h
rename to Tools/ScriptX/src/utils/ThreadLocal.h
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/ThreadPool.cc b/Tools/ScriptX/src/utils/ThreadPool.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/ThreadPool.cc
rename to Tools/ScriptX/src/utils/ThreadPool.cc
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/ThreadPool.h b/Tools/ScriptX/src/utils/ThreadPool.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/ThreadPool.h
rename to Tools/ScriptX/src/utils/ThreadPool.h
diff --git a/ScriptEngine/third-party/ScriptX/src/utils/TypeInformation.h b/Tools/ScriptX/src/utils/TypeInformation.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/utils/TypeInformation.h
rename to Tools/ScriptX/src/utils/TypeInformation.h
diff --git a/ScriptEngine/third-party/ScriptX/src/version.h b/Tools/ScriptX/src/version.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/src/version.h
rename to Tools/ScriptX/src/version.h
diff --git a/ScriptEngine/third-party/ScriptX/test/CMakeLists.txt b/Tools/ScriptX/test/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/CMakeLists.txt
rename to Tools/ScriptX/test/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/test/cmake/TestEnv.cmake b/Tools/ScriptX/test/cmake/TestEnv.cmake
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/cmake/TestEnv.cmake
rename to Tools/ScriptX/test/cmake/TestEnv.cmake
diff --git a/ScriptEngine/third-party/ScriptX/test/cmake/gtest/CMakeLists.txt b/Tools/ScriptX/test/cmake/gtest/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/cmake/gtest/CMakeLists.txt
rename to Tools/ScriptX/test/cmake/gtest/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/test/cmake/gtest/CMakeLists.txt.in b/Tools/ScriptX/test/cmake/gtest/CMakeLists.txt.in
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/cmake/gtest/CMakeLists.txt.in
rename to Tools/ScriptX/test/cmake/gtest/CMakeLists.txt.in
diff --git a/ScriptEngine/third-party/ScriptX/test/cmake/test_libs/CMakeLists.txt b/Tools/ScriptX/test/cmake/test_libs/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/cmake/test_libs/CMakeLists.txt
rename to Tools/ScriptX/test/cmake/test_libs/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/test/cmake/test_libs/CMakeLists.txt.in b/Tools/ScriptX/test/cmake/test_libs/CMakeLists.txt.in
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/cmake/test_libs/CMakeLists.txt.in
rename to Tools/ScriptX/test/cmake/test_libs/CMakeLists.txt.in
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/.gitignore b/Tools/ScriptX/test/node_addon/.gitignore
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/.gitignore
rename to Tools/ScriptX/test/node_addon/.gitignore
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/CMakeLists.txt b/Tools/ScriptX/test/node_addon/CMakeLists.txt
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/CMakeLists.txt
rename to Tools/ScriptX/test/node_addon/CMakeLists.txt
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/README.md b/Tools/ScriptX/test/node_addon/README.md
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/README.md
rename to Tools/ScriptX/test/node_addon/README.md
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/hello.js b/Tools/ScriptX/test/node_addon/hello.js
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/hello.js
rename to Tools/ScriptX/test/node_addon/hello.js
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/package.json b/Tools/ScriptX/test/node_addon/package.json
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/package.json
rename to Tools/ScriptX/test/node_addon/package.json
diff --git a/ScriptEngine/third-party/ScriptX/test/node_addon/src/addon.cc b/Tools/ScriptX/test/node_addon/src/addon.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/node_addon/src/addon.cc
rename to Tools/ScriptX/test/node_addon/src/addon.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/BookKeepingTest.cc b/Tools/ScriptX/test/src/BookKeepingTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/BookKeepingTest.cc
rename to Tools/ScriptX/test/src/BookKeepingTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ByteBufferTest.cc b/Tools/ScriptX/test/src/ByteBufferTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ByteBufferTest.cc
rename to Tools/ScriptX/test/src/ByteBufferTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/CustomConverterTest.cc b/Tools/ScriptX/test/src/CustomConverterTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/CustomConverterTest.cc
rename to Tools/ScriptX/test/src/CustomConverterTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/Demo.cc b/Tools/ScriptX/test/src/Demo.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/Demo.cc
rename to Tools/ScriptX/test/src/Demo.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/EngineTest.cc b/Tools/ScriptX/test/src/EngineTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/EngineTest.cc
rename to Tools/ScriptX/test/src/EngineTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ExceptionTest.cc b/Tools/ScriptX/test/src/ExceptionTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ExceptionTest.cc
rename to Tools/ScriptX/test/src/ExceptionTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/InspectorTest.cc b/Tools/ScriptX/test/src/InspectorTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/InspectorTest.cc
rename to Tools/ScriptX/test/src/InspectorTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/InteroperateTest.cc b/Tools/ScriptX/test/src/InteroperateTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/InteroperateTest.cc
rename to Tools/ScriptX/test/src/InteroperateTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ManagedObjectTest.cc b/Tools/ScriptX/test/src/ManagedObjectTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ManagedObjectTest.cc
rename to Tools/ScriptX/test/src/ManagedObjectTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/MessageQueueTest.cc b/Tools/ScriptX/test/src/MessageQueueTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/MessageQueueTest.cc
rename to Tools/ScriptX/test/src/MessageQueueTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/NativeTest.cc b/Tools/ScriptX/test/src/NativeTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/NativeTest.cc
rename to Tools/ScriptX/test/src/NativeTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/PressureTest.cc b/Tools/ScriptX/test/src/PressureTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/PressureTest.cc
rename to Tools/ScriptX/test/src/PressureTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ReferenceTest.cc b/Tools/ScriptX/test/src/ReferenceTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ReferenceTest.cc
rename to Tools/ScriptX/test/src/ReferenceTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ScopeTests.cc b/Tools/ScriptX/test/src/ScopeTests.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ScopeTests.cc
rename to Tools/ScriptX/test/src/ScopeTests.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ShowCaseTest.cc b/Tools/ScriptX/test/src/ShowCaseTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ShowCaseTest.cc
rename to Tools/ScriptX/test/src/ShowCaseTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ThreadPoolTest.cc b/Tools/ScriptX/test/src/ThreadPoolTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ThreadPoolTest.cc
rename to Tools/ScriptX/test/src/ThreadPoolTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/UtilsTest.cc b/Tools/ScriptX/test/src/UtilsTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/UtilsTest.cc
rename to Tools/ScriptX/test/src/UtilsTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/ValueTest.cc b/Tools/ScriptX/test/src/ValueTest.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/ValueTest.cc
rename to Tools/ScriptX/test/src/ValueTest.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/gtest_main.cc b/Tools/ScriptX/test/src/gtest_main.cc
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/gtest_main.cc
rename to Tools/ScriptX/test/src/gtest_main.cc
diff --git a/ScriptEngine/third-party/ScriptX/test/src/test.h b/Tools/ScriptX/test/src/test.h
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/test.h
rename to Tools/ScriptX/test/src/test.h
diff --git a/ScriptEngine/third-party/ScriptX/test/src/wasm/run_test.html b/Tools/ScriptX/test/src/wasm/run_test.html
similarity index 100%
rename from ScriptEngine/third-party/ScriptX/test/src/wasm/run_test.html
rename to Tools/ScriptX/test/src/wasm/run_test.html
diff --git a/RELEASE/plugins/LiteLoader/7z/7za.dll b/assets/plugins/LiteLoader/7z/7za.dll
similarity index 100%
rename from RELEASE/plugins/LiteLoader/7z/7za.dll
rename to assets/plugins/LiteLoader/7z/7za.dll
diff --git a/RELEASE/plugins/LiteLoader/7z/7za.exe b/assets/plugins/LiteLoader/7z/7za.exe
similarity index 100%
rename from RELEASE/plugins/LiteLoader/7z/7za.exe
rename to assets/plugins/LiteLoader/7z/7za.exe
diff --git a/RELEASE/plugins/LiteLoader/CrashLogger_Daemon.exe b/assets/plugins/LiteLoader/CrashLogger_Daemon.exe
similarity index 100%
rename from RELEASE/plugins/LiteLoader/CrashLogger_Daemon.exe
rename to assets/plugins/LiteLoader/CrashLogger_Daemon.exe
diff --git a/RELEASE/plugins/LiteLoader/LangPack/en.json b/assets/plugins/LiteLoader/LangPack/en.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/en.json
rename to assets/plugins/LiteLoader/LangPack/en.json
diff --git a/assets/plugins/LiteLoader/LangPack/fr.json b/assets/plugins/LiteLoader/LangPack/fr.json
new file mode 100644
index 0000000..b0a2af2
--- /dev/null
+++ b/assets/plugins/LiteLoader/LangPack/fr.json
@@ -0,0 +1,440 @@
+{
+  "base": {
+    "getDimName": {
+      "0": "Surface",
+      "1": "Nether",
+      "2": "L'Ender",
+      "unknown": "Autre dimension"
+    }
+  },
+  "ll": {
+    "main": {
+      "checkRunningBDS": {
+        "detected": "L'existence d'un autre processus BDS a été détecté avec le même chemin !",
+        "tip": "Cela peut entraîner l'occupation du port réseau et du monde",
+        "ask": "Voulez-vous terminer le processus avec PID {} ? (y=Oui, n=Non)"
+      },
+      "fixAllowList": {
+        "removeEmptyAllowlist": "allowlist.json est vide! Suppression...",
+        "checkManually": "allowlist.json et whitelist.json existent et ne sont pas vides. Veuillez les vérifier manuellement",
+        "renamed": "Renommé whitelist.json en allowlist.json"
+      },
+      "warning": {
+        "inDevMode": "Actuellement en mode développeur !",
+        "betaVersion": "Utilisation actuelle d'une version bêta.",
+        "productionEnv": "VEUILLEZ NE PAS UTILISER DANS L'ENVIRONNEMENT DE PRODUCTION!",
+        "protocolVersionNotMatch": {
+          "1": "La version du protocole ne correspond pas, la version cible : {}, la version actuelle : {}.",
+          "2": "Cela va probablement planter le serveur, veuillez utiliser la version de LiteLoader qui correspond à la version du BDS !"
+        }
+      },
+      "bstats": {
+        "enabled": "bStats has been enabled, you can edit plugins/bStats/config.json to disable it"
+      }
+    },
+    "antiAbnormalItem": {
+      "detected": "Erreur de données de l'item Player({}) !",
+      "itemInfo": "Item: {}"
+    },
+    "cmd": {
+      "tpdim": {
+        "success": "{} s'est fait téléporter vers {} ({:2f}, {:2f}, {:2f})",
+        "error": {
+          "noActorTeleported": "Aucune Entité Téléportée",
+          "noActorSpecified": "Aucune Entité Spécifiée"
+        },
+        "invalidDimid": "DimensionId: {} invalide"
+      },
+      "listPlugin": {
+        "overview": "Liste des plugins [{}]",
+        "tip": "* Envoyez la commande \"ll list \" pour plus d'informations"
+      },
+      "pluginInfo": {
+        "title": "Plugin <{}>",
+        "error": {
+          "pluginNotFound": "Plugin <{}> introuvable !"
+        }
+      },
+      "version": {
+        "msg": "Serveur Dédié Bedrock {}\n- avec LiteLoaderBDS {}\n- Protocole réseau : {}"
+      },
+      "help": {
+        "msg": "[Introduction]\nLiteLoaderBDS est un chargeur de plugin non officiel pour le développement de Serveurs Dédiés Bedrock, BDS.\nIl fournit un nombre énorme d'API, un système d'événements puissant et de nombreuses interfaces utilitaires empaquetées.\n[Github]\n--> https://github.com/LiteLDev/LiteLoaderBDS <--\nBienvenue sur notre projet github pour obtenir plus d'informations ~"
+      },
+      "loadPlugin": {
+        "success": "Plugin <{}> chargé.",
+        "fail": "Échec lors de l'initialisation du plugin {}"
+      },
+      "unloadPlugin": {
+        "success": "Plugin <{}> déchargé.",
+        "fail": "Échec lors du déchargement du plugin <{}>"
+      },
+      "reloadPlugin": {
+        "success": "Plugin <{}> rechargé.",
+        "fail": "Échec lors du rechargement du plugin <{}>"
+      },
+      "reloadAllPlugins": {
+        "success": "Plugins {} rechargés avec succès.",
+        "fail": "Échec lors du rechargement des plugins"
+      },
+      "settings": {
+        "set": {
+          "success": "Les paramètres ont été changés de {} à {} avec succès."
+        },
+        "get": {
+          "success": "Obtention de paramètres {} avec succès. Valeur :"
+        },
+        "delete": {
+          "success": "Suppression des paramètres {} avec succès.",
+          "error": {
+            "emptyKey": "JsonPointer ne peut pas être vide !"
+          }
+        },
+        "reload": {
+          "success": "Les paramètres ont été rechargés avec succès."
+        },
+        "save": {
+          "success": "Les paramètres ont été enregistrés avec succès."
+        },
+        "list": {
+          "success": "Liste des paramètres :"
+        }
+      },
+      "error": {
+        "noPathSpecified": "Vous devez fournir un chemin valide du plugin LiteLoader !",
+        "noNameSpecified": "Vous devez fournir un nom valide pour le plugin LiteLoader !"
+      }
+    },
+    "config": {
+      "save": {
+        "fail": "Échec de la sauvegarde (création) du fichier de configuration !"
+      },
+      "creating": "Fichier de configuration LL <{}> introuvable. Création du fichier de configuration...",
+      "warning": {
+        "configOutdated": "Le fichier de configuration LL <{}> est obsolète."
+      },
+      "updating": "Mise à jour du fichier de configuration..."
+    },
+    "crashLogger": {
+      "existsingDebuggerDetected": "Débogueur existant détecté. Le fichier CrashLogger intégré ne fonctionnera pas.",
+      "wineDetected": "Wine Environment détecté. Le CrashLogger intégré ne marchera pas.",
+      "error": {
+        "cannotCreateDaemonProcess": "Impossible de créer le processus CrashLogger Daemon !"
+      },
+      "warning": {
+        "crashLoggerDisabled": {
+          "1": "Le CrashLogger interne n'est pas activé car la configuration l'a désactivé.",
+          "2": "Il n'y aura pas de journal de plantage en cas d'exception non gérée,",
+          "3": "ce qui rend presque impossible de trouver la raison du crash et la source du crash.",
+          "4": "Nous vous recommandons fortement de l'activer pour assurer la stabilité du serveur"
+        },
+        "conflicts": {
+          "1": "CrashLogger interne n'est pas activé car le plugin <{}> est en conflit avec lui",
+          "2": "Il n'y aura pas de journal de plantage en cas d'exception non gérée,",
+          "3": "ce qui rend presque impossible de trouver la raison du crash et la source du crash.",
+          "4": "Puisque CrashLogger est un composant important qui assure la stabilité du serveur",
+          "5": "Nous vous recommandons de réfléchir deux fois à l'utilisation du plugin <{}>"
+        }
+      },
+      "init": {
+        "fail": {
+          "msg": "Échec du démarrage de CrashLogger intégré !",
+          "tip": "Il n'y aura pas de journal de plantage en cas d'exception non gérée."
+        }
+      }
+    },
+    "addonsHelper": {
+      "error": {
+        "addonConfigNotFound": "Configuration de l'addon introuvable !",
+        "addonFileNotFound": "Fichier d'addon \"{}\" introuvable !",
+        "addonNotFound": "Addon <{}> introuvable !",
+        "outOfRange": "Indice de l'addon {} hors de portée",
+        "unsupportedFileType": "Fichier non pris en charge trouvé !",
+        "parsingEnabledAddonsList": "Erreur lors de l'analyse de la liste des addons activés",
+        "noAddonInstalled": "Aucun addon n'a été installé.",
+        "installationAborted": "Progression de l'installation annulée !"
+      },
+      "displayError": "Erreur : {}",
+      "removeAddonFromList": {
+        "fail": "Impossible de supprimer l'addon <{}> du fichier de configuration !",
+        "success": "Addon <{}> enlevé du fichier de configuration."
+      },
+      "addAddonToList": {
+        "invalidList": "Fichier de liste d'addons {} non valide, sauvegarde de {} et réinitialisation à la valeur par défaut",
+        "fail": "Impossible d'insérer l'addon {} dans {} !",
+        "success": "Addon <{}> ajouté dans le fichier de configuration."
+      },
+      "install": {
+        "installing": "Installation de l'addon <{}>...",
+        "error": {
+          "failToUncompress": {
+            "msg": "Échec de décompression de l'addon {} !",
+            "exitCode": "Code de sortie : {}",
+            "programOutput": "Sortie du programme :\n{}"
+          }
+        }
+      },
+      "uninstall": {
+        "success": "Addon <{}> désinstallé."
+      },
+      "autoInstall": {
+        "tip": {
+          "dirCreated": "Répertoire créé. Vous pouvez déplacer les fichiers d'addon compressés vers {} pour être installés au prochain lancement."
+        },
+        "working": "{} nouveau(x) addon(s) trouvé(s) à installer. En cours d'installation...",
+        "installed": "L'Addon {} a été installé.",
+        "installedCount": "{} addon(s) ont été installé."
+      },
+      "cmd": {
+        "output": {
+          "list": {
+            "overview": "Addons : {} addon(s) installé(s) :"
+          }
+        }
+      }
+    },
+    "loader": {
+      "loadScriptEngine": {
+        "error": {
+          "versionNotMatch": "La version du fichier <{}> du moteur de script pour {} ne correspond pas à la version de LiteLoader <{}>"
+        },
+        "success": "* ScriptEngine pour {} chargé."
+      },
+      "loadDotNetEngine": {
+        "error": {
+          "versionNotMatch": "La version du fichier <{}> de LiteLoader.NET ne correspond pas à la version de LiteLoader <{}>"
+        },
+        "success": "* .NET Engine chargé."
+      },
+      "loadMain": {
+        "loadingPlugins": "Chargement des plugins natifs...",
+        "loadedShellLink": "Plugin ShellLinked <{} => {}> chargé",
+        "loadedPlugin": "Plugin natif <{name}> chargé",
+        "done": "{} plugin(s) natif(s) chargé(s).",
+        "start": "Chargement des plugins natifs..."
+      },
+      "initNodeJsDirectories": {
+        "created": "Création du répertoire d'exécution de Node.js car il est introuvable."
+      }
+    },
+    "notice": {
+      "newForum": "Notre nouveau forum est en ligne ! -> {}",
+      "license": "LiteLoader est licencié sous {}",
+      "translateText": "Aidez-nous à traduire et améliorer le texte sur LL -> {}"
+    },
+    "pluginManager": {
+      "error": {
+        "invalidFileType": "Type de fichier de plugin {} invalide dans {}",
+        "noValidPluginFound": "Aucun plugin valide trouvé à {} !",
+        "failToRegisterPlugin": "Échec lors de l'enregistrement du plugin {} !",
+        "hasBeenRegistered": "Un plugin nommé {} a été enregistré",
+        "failToLoadPlugin": "Échec lors du chargement du plugin {} !",
+        "pluginNotFound": "Plugin <{}> introuvable"
+      },
+      "warning": {
+        "unloadDllNotFinished": "La fonction de déchargement des plugins dll n'est pas terminée.",
+        "reloadDllNotFinished": "La fonction de rechargement des plugins dll n'est pas terminée."
+      },
+      "reloadPlugin": {
+        "fail": "Échec lors du rechargement du plugin {} !"
+      }
+    },
+    "unzipNodeModules": {
+      "fail": "Échec de la décompression de node_modules.tar"
+    }
+  },
+  "llse": {
+    "init": {
+      "llMoney": {
+        "notFound": "LLMoney.dll introuvable,le système d'économie ScriptEngine ne fonctionnera pas"
+      }
+    },
+    "api": {
+      "ll": {
+        "require": {
+          "success": " - Plugin chargé avec succès par require. Chargé : ",
+          "fail": " - Échec du chargement du plugin par require",
+          "download": {
+            "success": "- Require téléchargé avec succès ! Chemin d'accès :",
+            "fail": "- Échec du téléchargement de plugin par require ! Code :"
+          }
+        }
+      }
+    },
+    "apiHelp": {
+      "parseJson": {
+        "fail": "Erreur JSON parse"
+      }
+    },
+    "loader": {
+      "loadDepends": {
+        "success": "Dépendance {} chargée.",
+        "fail": "Échec de chargement de la dépendance {}"
+      },
+      "loadMain": {
+        "start": "Chargement des plugins {type}...",
+        "done": "{count} plugin(s) {type} chargé(s).",
+        "nodejs": {
+          "installPack": {
+            "fail": "Impossible d'installer le plugin pack {}, veuillez vérifier votre fichier package.json !",
+            "start": "Pack de plugin Node.js «{path}» trouvé ! Essayez d'installer..."
+          },
+          "ignored": "Aucun fichier package.json trouvé dans le répertoire {path}, ignoré."
+        },
+        "loadedPlugin": "Plugin {type} <{name}> chargé.",
+        "installPluginPack": {
+          "done": "{count} pack(s) de plugins {type} chargé(s)."
+        }
+      },
+      "nodejs": {
+        "executeNpmInstall": {
+          "success": "NPM fini avec succès.",
+          "start": "Exécution de \"npm install\" pour le plugin {name}...",
+          "fail": "Une erreur est survenue. Code de sortie : {code}"
+        },
+        "register": {
+          "fail": "Échec de l'enregistrement du plugin {name} !"
+        }
+      }
+    }
+  },
+  "permapi": {
+    "data": {
+      "process": {
+        "fail": "Impossible de traiter le fichier de données : {}"
+      },
+      "read": {
+        "fail": "Echec de lecture du fichier de données dans {}"
+      },
+      "save": {
+        "fail": "Echec de lecture du fichier de données dans: {}"
+      }
+    },
+    "cmd": {
+      "error": {
+        "invalidCommand": "Commande invalide. Tapez '/help perm' pour obtenir de l'aide.",
+        "internal": "Erreur interne. Veuillez réessayer plus tard.",
+        "roleAlreadyExists": "Ce rôle existe déjà.",
+        "permissionAlreadyExists": "La permission existe déjà.",
+        "invalidPermissionName": "Nom de la permission invalide.",
+        "roleNotFound": "Rôle introuvable.",
+        "permissionNotFound": "Permission introuvable.",
+        "playerNotFound": "Joueur introuvable.",
+        "modifyMembersOfEveryone": "Le rôle est un rôle pour tout le monde. Vous ne pouvez pas modifier les membres de celui-ci.",
+        "jsonParsingError": "Erreur JSON parse: {}",
+        "missingArgument": "Argument manquant : {}",
+        "permissionDenied": "Vous n'avez pas la permission d'utiliser cette commande slash."
+      },
+      "output": {
+        "create": {
+          "role": {
+            "success": "Rôle créé."
+          },
+          "perm": {
+            "success": "Permission créée."
+          }
+        },
+        "delete": {
+          "role": {
+            "success": "Rôle supprimé."
+          },
+          "perm": {
+            "success": "Permission supprimée."
+          }
+        },
+        "list": {
+          "role": {
+            "none": "Aucun rôle à afficher.",
+            "header": "§b§lListe des rôles :",
+            "isMember": "§r(§eMembre§r)"
+          },
+          "perm": {
+            "none": "Aucune permission à afficher.",
+            "header": "§b§lListe des Permissions :"
+          }
+        },
+        "view": {
+          "player": {
+            "yourStatus": "§b§lVotre statut de permission actuel :",
+            "status": "§b§lLe statut de permission actuel de {} :",
+            "rolesTitle": "- §eRôles :",
+            "permissionsTitle": "- §ePermissions :"
+          },
+          "role": {
+            "header": "§b§lInfos du rôle :",
+            "info": {
+              "name": "+ §eNom§r : {roleName}",
+              "displayName": "+ §eNom d'affichage§r: {}",
+              "priority": "+ §ePriorité§r : {}",
+              "membersNone": "+ §eMembres§r : Aucun",
+              "members": "+ §eMembres§r :",
+              "permissionsNone": "+ §ePermissions§r : Aucune",
+              "permissions": "+ §ePermissions §r:"
+            },
+            "note": {
+              "admin": "※ {}§r est un rôle spécial. Toutes les permissions seront activées par défaut.",
+              "everyone": "※ {}§r est un rôle spécial. Tous les joueurs sont membres de ce rôle."
+            },
+            "enabled": "§a(Activé)§r",
+            "disabled": "§c(Désactivé)§r",
+            "enabledWithExtra": "§b(Activé avec des restrictions supplémentaires)§r"
+          },
+          "perm": {
+            "header": "§b§lInfos sur les Permissions :",
+            "info": {
+              "name": "+ §eNom§r : {permissionName}",
+              "desc": "+ §eDescription§r : {}"
+            }
+          }
+        },
+        "update": {
+          "role": {
+            "member": {
+              "add": {
+                "success": "Membre {name}§r({xuid}) ajouté au rôle {roleDisplayName}§r."
+              },
+              "remove": {
+                "success": "Membre {name}§r({xuid}) enlevé du rôle {roleDisplayName}§r."
+              }
+            },
+            "perm": {
+              "add": {
+                "success": "Permission {name}§r ajoutée au rôle {roleDisplayName}§r."
+              },
+              "remove": {
+                "success": "Permission {name}§r retirée du rôle {roleDisplayName}§r."
+              },
+              "set": {
+                "enabled": "§aactivé(e)§r",
+                "disabled": "§cdésactivé(e)§r",
+                "success": "Permission {name}§r du rôle {roleDisplayName}§r {enable}."
+              }
+            },
+            "priority": {
+              "set": {
+                "success": "Priorité du rôle {roleDisplayName}§r définie à {priority}."
+              }
+            },
+            "displayName": {
+              "set": {
+                "success": "Nom d'affichage du rôle <{roleName}§r> défini à {displayName}§r."
+              }
+            }
+          },
+          "player": {
+            "role": {
+              "add": {
+                "success": "Le joueur {name}§r({xuid}) a été ajouté au rôle {roleDisplayName}§r."
+              },
+              "remove": {
+                "success": "Le joueur {name}§r({xuid}) a été retiré du rôle {roleDisplayName}§r."
+              }
+            }
+          }
+        },
+        "noDesc": "[Aucune description]",
+        "permissionNameExamples": "Exemples de noms de permissions : 'Identifiant:NomDePermission', 'a:b:c:d_e_f.g'"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/RELEASE/plugins/LiteLoader/LangPack/id.json b/assets/plugins/LiteLoader/LangPack/id.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/id.json
rename to assets/plugins/LiteLoader/LangPack/id.json
diff --git a/RELEASE/plugins/LiteLoader/LangPack/it.json b/assets/plugins/LiteLoader/LangPack/it.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/it.json
rename to assets/plugins/LiteLoader/LangPack/it.json
diff --git a/RELEASE/plugins/LiteLoader/LangPack/ja.json b/assets/plugins/LiteLoader/LangPack/ja.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/ja.json
rename to assets/plugins/LiteLoader/LangPack/ja.json
diff --git a/assets/plugins/LiteLoader/LangPack/ko.json b/assets/plugins/LiteLoader/LangPack/ko.json
new file mode 100644
index 0000000..c93fcd8
--- /dev/null
+++ b/assets/plugins/LiteLoader/LangPack/ko.json
@@ -0,0 +1,440 @@
+{
+  "base": {
+    "getDimName": {
+      "0": "오버월드",
+      "1": "네더",
+      "2": "엔더",
+      "unknown": "다른 월드"
+    }
+  },
+  "ll": {
+    "main": {
+      "checkRunningBDS": {
+        "detected": "동일한 파일 경로에서 이미 다른 BDS 서버가 열려 있습니다.",
+        "tip": "네트워크 포트나 월드를 사용중인 상태로 만들수도 있습니다.",
+        "ask": "PID {} 로 프로세스를 종료하시겠습니까? (y=예, n=아니오, e=종료)"
+      },
+      "fixAllowList": {
+        "removeEmptyAllowlist": "allowlist.json이 비어 있습니다! 삭제를 진행합니다...",
+        "checkManually": "allowlist.json 과 whitelist.json, 두 파일 모두가 비어있지 않습니다. 파일을 직접 확인해주세요.",
+        "renamed": "whitelist.json 파일의 이름을 allowlist.json로 변경했습니다."
+      },
+      "warning": {
+        "inDevMode": "개발자 모드에 진입한 상태입니다!",
+        "betaVersion": "현재 베타 버전을 사용중입니다.",
+        "productionEnv": "프로덕션 단계에서 사용하지 말아주세요!",
+        "protocolVersionNotMatch": {
+          "1": "프로토콜 버전이 맞지 않습니다. 타겟 버전 {}, 현재 버전: {}.",
+          "2": "높은 확률로 서버 크래시가 발생할 수도 있습니다. BDS 버전과 맞는 LiteLoader을 사용해주세요!"
+        }
+      },
+      "bstats": {
+        "enabled": "bStats has been enabled, you can edit plugins/bStats/config.json to disable it"
+      }
+    },
+    "antiAbnormalItem": {
+      "detected": "플레이어({}) 아이템 데이터 오류 발생!",
+      "itemInfo": "아이템: {}"
+    },
+    "cmd": {
+      "tpdim": {
+        "success": "유저 {} (을)를 {} ({:2f}, {:2f}, {:2f}) 로 이동시킵니다.",
+        "error": {
+          "noActorTeleported": "Actor가 텔레포트 되지 않았습니다",
+          "noActorSpecified": "Actor가 지정되지 않았습니다"
+        },
+        "invalidDimid": "유효하지 않은 월드: {}"
+      },
+      "listPlugin": {
+        "overview": "플러그인 목록 [{}]",
+        "tip": "* 더 많은 정보가 필요하시면 \"ll list \" 명령어를 입력해주세요."
+      },
+      "pluginInfo": {
+        "title": "플러그인 <{}>",
+        "error": {
+          "pluginNotFound": "플러그인 <{}>를 찾을 수 없습니다!"
+        }
+      },
+      "version": {
+        "msg": "Bedrock Dedicated Server {}\n- LiteLoaderBDS 포함 {}\n- 네트워크 프로토콜: {}"
+      },
+      "help": {
+        "msg": "[Introduction]\nLiteLoaderBDS는 Bedrock Dedicated Server 모딩이 가능한 비공식 플러그인 로더입니다.\n많은 수의 API과 패킷 유틸리티 인터페이스, 그리고 강력한 이벤트 시스템을 제공합니다.\n\n[Github]\n--> https://github.com/LiteLDev/LiteLoaderBDS <--\n더 자세한 정보를 원하신다면 자유롭게 Github 프로젝트를 확인해주세요!"
+      },
+      "loadPlugin": {
+        "success": "플러그인 <{}>(이)가 로드되었습니다.",
+        "fail": "플러그인 {} 로드에 실패했습니다."
+      },
+      "unloadPlugin": {
+        "success": "플러그인 <{}> (이)가 언로드 되었습니다.",
+        "fail": "플러그인 <{}> 언로드에 실패했습니다."
+      },
+      "reloadPlugin": {
+        "success": "플러그인  <{}> 가 리로드 되었습니다.",
+        "fail": "플러그인 <{}> 리로드에 실패했습니다."
+      },
+      "reloadAllPlugins": {
+        "success": "{} 플러그인들이 성공적으로 리로드됐습니다.",
+        "fail": "어떤 플러그인도 리로드하지 못했습니다."
+      },
+      "settings": {
+        "set": {
+          "success": "설정에서 {} 를 {} 로 성공적으로 변경했습니다."
+        },
+        "get": {
+          "success": "{} 가 설정에 업데이트 되었습니다. 값:"
+        },
+        "delete": {
+          "success": "{} 설정 제거가 완료되었습니다.",
+          "error": {
+            "emptyKey": "JsonPointer 파일은 비어 있을수 없습니다."
+          }
+        },
+        "reload": {
+          "success": "설정이 성공적으로 리로드되었습니다."
+        },
+        "save": {
+          "success": "설정이 성공적으로 저장되었습니다."
+        },
+        "list": {
+          "success": "설정 목록:"
+        }
+      },
+      "error": {
+        "noPathSpecified": "LiteLoader 플러그인의 유효한 경로를 제공해주세요.",
+        "noNameSpecified": "LiteLoader 플러그인에 유효한 이름을 부여해줘야 합니다."
+      }
+    },
+    "config": {
+      "save": {
+        "fail": "Config 파일을 저장(생성)하지 못했습니다!"
+      },
+      "creating": "LL Config <{}> 파일을 찾을 수 없습니다. Config 파일을 생성합니다.",
+      "warning": {
+        "configOutdated": "LL Config <{}> 파일이 오래됐거나 현재 버전과 호환되지 않습니다."
+      },
+      "updating": "설정 파일을 업데이트 합니다.."
+    },
+    "crashLogger": {
+      "existsingDebuggerDetected": "이미 존재하는 다른 디버거가 감지되었습니다. 빌트인 CrashLogger가 작동하지 않을수도 있습니다.",
+      "wineDetected": "Wine 환경이 감지되었습니다. 빌트인 CrashLogger가 작동하지 않을수도 있습니다.",
+      "error": {
+        "cannotCreateDaemonProcess": "CrashLogger 데몬 프로세스를 생성하지 못했습니다!"
+      },
+      "warning": {
+        "crashLoggerDisabled": {
+          "1": "Config 파일에서 비활성화 됐기 때문에 빌트인 CrashLogger가 활성화되지 않습니다.",
+          "2": "처리되지 않은 예외 발생시 크래시 로그가 생성되지 않습니다.",
+          "3": "충돌이 발생한 이유나 원인을 파악하기가 거의 불가능하게 만듭니다.",
+          "4": "서버 안정성을 위해 활성화 하기를 적극 권장합니다."
+        },
+        "conflicts": {
+          "1": "플러그인 <{}> 와 충돌이 발생해 Builtin CrashLogger 가 활성화 되지 않습니다.",
+          "2": "처리되지 않은 예외 발생시 크래시 로그가 생성되지 않습니다.",
+          "3": "충돌이 발생한 이유나 원인을 파악하기가 거의 불가능하게 만듭니다.",
+          "4": "CrashLogger이 서버 안정성을 보장해주는 중요한 컴포넌트이기 때문에",
+          "5": "플러그인 <{}> 을 사용할지 다시 한번 고려해보길 권장합니다."
+        }
+      },
+      "init": {
+        "fail": {
+          "msg": "Builtin CrashLogger 시작에 실패했습니다.",
+          "tip": "처리되지 않은 예외 발생시 크래시 로그가 생성되지 않습니다."
+        }
+      }
+    },
+    "addonsHelper": {
+      "error": {
+        "addonConfigNotFound": "애드온 config를 찾을 수 없습니다.",
+        "addonFileNotFound": "애드온 파일 \"{}\" 을(를) 찾을 수 없습니다.",
+        "addonNotFound": "애드온 \"{}\" 을(를) 찾을 수 없습니다.",
+        "outOfRange": "애드온 인덱스 {} 범위 초과",
+        "unsupportedFileType": "지원하지 않는 확장자의 파일이 발견되었습니다.",
+        "parsingEnabledAddonsList": "활성화된 애드온을 읽는 도중 에러 발생",
+        "noAddonInstalled": "아무 애드온도 설치돼 있지 않습니다.",
+        "installationAborted": "설치 프로세스가 취소됐습니다."
+      },
+      "displayError": "오류: {}",
+      "removeAddonFromList": {
+        "fail": "Config 파일에서 애드온 <{}> 를 제거하지 못했습니다.",
+        "success": "config 파일에서 애드온 <{}> 를 제거했습니다."
+      },
+      "addAddonToList": {
+        "invalidList": "{} 애드온 리스트 파일이 유효하지 않습니다. {} 경로로 백업하고 리스트 파일을 기본값으로 되돌려주세요.",
+        "fail": "애드온 {} 를 {} 로 넣지 못했습니다!",
+        "success": "애드온 <{}> 를 config 파일에 추가했습니다."
+      },
+      "install": {
+        "installing": "애드온 <{}> 를 설치합니다...",
+        "error": {
+          "failToUncompress": {
+            "msg": "애드온 {} 의 압축을 풀지 못했습니다.",
+            "exitCode": "코드 종료: {}",
+            "programOutput": "프로그램 출력:\n{}"
+          }
+        }
+      },
+      "uninstall": {
+        "success": "애드온 <{}> 가 제거되었습니다."
+      },
+      "autoInstall": {
+        "tip": {
+          "dirCreated": "해당 경로가 생성되었습니다. 다음 실행 시점에 설치를 진행하려면 압축된 애드온 파일을 {} 에 넣어주세요."
+        },
+        "working": "{} 개의 새로 발견된 애드온을 설치합니다...",
+        "installed": "애드온 {} 가 설치됐습니다.",
+        "installedCount": "{} 개의 애드온이 설치됐습니다."
+      },
+      "cmd": {
+        "output": {
+          "list": {
+            "overview": "Addons: {} 개의 애드온이 설치됐습니다:"
+          }
+        }
+      }
+    },
+    "loader": {
+      "loadScriptEngine": {
+        "error": {
+          "versionNotMatch": "<{}> 버전의 {} 스크립트 엔진이 LiteLoader 버전 <{}> 와 일치하지 않습니다."
+        },
+        "success": "* {} 스크립트 엔진이 로드됐습니다."
+      },
+      "loadDotNetEngine": {
+        "error": {
+          "versionNotMatch": "<{}> 버전의 LiteLoader.NET이 LiteLoader 버전 <{}> 와 일치하지 않습니다."
+        },
+        "success": "* .NET 엔진이 로드됐습니다."
+      },
+      "loadMain": {
+        "loadingPlugins": "네이티브 플러그인을 불러옵니다...",
+        "loadedShellLink": "ShellLinked 플러그인  <{} => {}> 로드됨",
+        "loadedPlugin": "네이티브 플러그인 <{name}> 이 로드됐습니다.",
+        "done": "{} 개의 네이티브 플러그인이 로드됐습니다.",
+        "start": "네이티브 플러그인을 불러옵니다."
+      },
+      "initNodeJsDirectories": {
+        "created": "Node.js 런타임 경로를 찾을 수 없으므로 생성합니다."
+      }
+    },
+    "notice": {
+      "newForum": "저희의 새로운 포럼이 공개됐습니다! -> {}",
+      "license": "LiteLoader는 {} 라이선스로 관리됩니다.",
+      "translateText": "LiteLoader 를 번역하고 개선할 수 있도록 도와주세요! -> {}"
+    },
+    "pluginManager": {
+      "error": {
+        "invalidFileType": "{} 경로의 {} 타입 플러그인 파일이 유효하지 않음",
+        "noValidPluginFound": "{} 경로에서 유효한 플러그인을 찾을 수 없습니다!",
+        "failToRegisterPlugin": "{} 플러그인 등록에 실패했습니다!",
+        "hasBeenRegistered": "{} 라는 플러그인이 등록됐습니다.",
+        "failToLoadPlugin": "플러그인 {}를 로드하지 못했습니다!",
+        "pluginNotFound": "플러그인 <{}> 를 찾을 수 없습니다"
+      },
+      "warning": {
+        "unloadDllNotFinished": "dll 플러그인 함수 언로드가 아직 끝나지 않았습니다.",
+        "reloadDllNotFinished": "dll 플러그인 함수 리로드가 아직 끝나지 않았습니다."
+      },
+      "reloadPlugin": {
+        "fail": "플러그인 {} 를 리로드하지 못했습니다."
+      }
+    },
+    "unzipNodeModules": {
+      "fail": "node_modules.tar 파일의 압축을 해제하지 못했습니다."
+    }
+  },
+  "llse": {
+    "init": {
+      "llMoney": {
+        "notFound": "LLmoney.dll 이 발견되지 않았습니다. ScriptEngine의 Economy System이 동작하지 않습니다."
+      }
+    },
+    "api": {
+      "ll": {
+        "require": {
+          "success": " - 요구되는 플러그인 로드에 성공했습니다. 로드됨: ",
+          "fail": " - 요구되는 플러그인을 로드하지 못했습니다. ",
+          "download": {
+            "success": " - 필요한 것들을 다운로드 했습니다! 경로: ",
+            "fail": " - 필요한 플러그인을 다운로드 하지 못했습니다! 코드: "
+          }
+        }
+      }
+    },
+    "apiHelp": {
+      "parseJson": {
+        "fail": "JSON 파싱 오류"
+      }
+    },
+    "loader": {
+      "loadDepends": {
+        "success": "Dependence {} 가 로드됐습니다.",
+        "fail": "Dependence '{}' 로드에 실패했습니다."
+      },
+      "loadMain": {
+        "start": "{type} 플러그인을 로드합니다...",
+        "done": "{count} 개의 {type} 플러그인을 로드합니다...",
+        "nodejs": {
+          "installPack": {
+            "fail": "플러그인 팩 {} 로드에 실패했습니다. package.json 파일을 확인해주세요!",
+            "start": "Node.js 플러그인 팩 \"{path}\"을 발견했습니다. 설치를 시도합니다..."
+          },
+          "ignored": "경로 {path} 에서 package.json 파일을 찾지 못하여 무시합니다."
+        },
+        "loadedPlugin": "{type} 타입 플러그인 <{name}> 를 로드했습니다.",
+        "installPluginPack": {
+          "done": "{count} 개의 {type} 플러그인 팩이 로드됐습니다."
+        }
+      },
+      "nodejs": {
+        "executeNpmInstall": {
+          "success": "Npm이 성공적으로 설치됐습니다.",
+          "start": "플러그인 {name} 에 대하여 \"npm install\" 명령어를 실행합니다.",
+          "fail": "에러 발생. 코드 종료: {code}"
+        },
+        "register": {
+          "fail": "플러그인 {name} 을 등록하지 못했습니다."
+        }
+      }
+    }
+  },
+  "permapi": {
+    "data": {
+      "process": {
+        "fail": "데이터 파일 처리에 실패했습니다: {}"
+      },
+      "read": {
+        "fail": "{} 경로에 위치한 데이터 파일을 읽지 못했습니다."
+      },
+      "save": {
+        "fail": "데이터 파일 저장에 실패했습니다: {}"
+      }
+    },
+    "cmd": {
+      "error": {
+        "invalidCommand": "유효하지 않은 명령어입니다. 도움말을 보려면 '/help perm' 명령어를 입력해주세요.",
+        "internal": "내부 오류 발생. 나중에 다시 시도해주세요.",
+        "roleAlreadyExists": "역할이 이미 존재합니다.",
+        "permissionAlreadyExists": "권한이 이미 존재합니다.",
+        "invalidPermissionName": "유효하지 않은 권한 이름입니다.",
+        "roleNotFound": "역할을 찾을 수 없습니다.",
+        "permissionNotFound": "권한을 찾을 수 없습니다.",
+        "playerNotFound": "플레이어를 찾을 수 없습니다.",
+        "modifyMembersOfEveryone": "이 역할은 everyone 역할입니다. 멤버 수정이 불가능합니다.",
+        "jsonParsingError": "JSON 파싱 오류: {}",
+        "missingArgument": "인자가 빠졌음: {}",
+        "permissionDenied": "이 명령어를 사용할 권한이 없습니다."
+      },
+      "output": {
+        "create": {
+          "role": {
+            "success": "역할 생성됨."
+          },
+          "perm": {
+            "success": "권한 생성됨."
+          }
+        },
+        "delete": {
+          "role": {
+            "success": "역할 삭제됨."
+          },
+          "perm": {
+            "success": "권한 삭제됨."
+          }
+        },
+        "list": {
+          "role": {
+            "none": "표시할 역할이 없습니다.",
+            "header": "§b§l역할 목록:",
+            "isMember": "§r(§e멤버§r)"
+          },
+          "perm": {
+            "none": "표시할 권한이 없습니다.",
+            "header": "§b§l권한 목록:"
+          }
+        },
+        "view": {
+          "player": {
+            "yourStatus": "§b§l당신의 현재 권한 상태입니다:",
+            "status": "§b§l유저 {}의 현재 권한 상태:",
+            "rolesTitle": "- §e역할:",
+            "permissionsTitle": "- §e권한:"
+          },
+          "role": {
+            "header": "§b§l역할 정보:",
+            "info": {
+              "name": "+ §e이름§r: {roleName}",
+              "displayName": "+ §e표시되는 이름§r: {}",
+              "priority": "+ §e우선순위§r: {}",
+              "membersNone": "+ §e멤버§r: 없음",
+              "members": "+ §e멤버§r:",
+              "permissionsNone": "+ §e권한§r: 없음",
+              "permissions": "+ §e권한§r:"
+            },
+            "note": {
+              "admin": "※ {}§r는 특별한 역할입니다. 모든 권한이 기본값으로 활성화됩니다.",
+              "everyone": "※ {}§r는 특별한 역할입니다. 모든 플레이어가 이 역할의 멤버가 됩니다."
+            },
+            "enabled": "§a(활성화됨)§r",
+            "disabled": "§c(비활성화 됨)§r",
+            "enabledWithExtra": "§b(추가 제한 사항과 함께 활성화됨)§r"
+          },
+          "perm": {
+            "header": "§b§l역할 정보:",
+            "info": {
+              "name": "+ §e이름§r: {permissionName}",
+              "desc": "+ §e설명§r: {}"
+            }
+          }
+        },
+        "update": {
+          "role": {
+            "member": {
+              "add": {
+                "success": "멤버 {name}§r({xuid}) 가 역할 {roleDisplayName}§r에 추가되었습니다."
+              },
+              "remove": {
+                "success": "멤버 {name}§r({xuid}) 가 역할 {roleDisplayName}에 제거되었습니다§r."
+              }
+            },
+            "perm": {
+              "add": {
+                "success": "권한 {name}§r가 역할 {roleDisplayName}에 추가되었습니다§r."
+              },
+              "remove": {
+                "success": "권한 {name}§r가 {roleDisplayName}§r에서 제거되었습니다."
+              },
+              "set": {
+                "enabled": "§a활성화됨§r",
+                "disabled": "§c비활성화됨§r",
+                "success": "역할 {roleDisplayName}§r의 권한 {name}§r가 {enable} 상태로 설정되었습니다."
+              }
+            },
+            "priority": {
+              "set": {
+                "success": "역할 {roleDisplayName}§r의 우선순위가 {priority}로 설정되었습니다."
+              }
+            },
+            "displayName": {
+              "set": {
+                "success": "역할 <{roleName}§r>의 표시되는 이름이 {displayName}§r로 설정되었습니다."
+              }
+            }
+          },
+          "player": {
+            "role": {
+              "add": {
+                "success": "플레이어 {name}§r({xuid})가 역할 {roleDisplayName}§r에 추가되었습니다."
+              },
+              "remove": {
+                "success": "플레이어 {name}§r({xuid})가 역할 {roleDisplayName}§r에서 제거되었습니다."
+              }
+            }
+          }
+        },
+        "noDesc": "[설명 없음]",
+        "permissionNameExamples": "권한 이름 예시: 'Namespace:PermissionName', 'a:b:c:d_e_f.g'"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/RELEASE/plugins/LiteLoader/LangPack/ru.json b/assets/plugins/LiteLoader/LangPack/ru.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/ru.json
rename to assets/plugins/LiteLoader/LangPack/ru.json
diff --git a/RELEASE/plugins/LiteLoader/LangPack/th.json b/assets/plugins/LiteLoader/LangPack/th.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/th.json
rename to assets/plugins/LiteLoader/LangPack/th.json
diff --git a/assets/plugins/LiteLoader/LangPack/tr.json b/assets/plugins/LiteLoader/LangPack/tr.json
new file mode 100644
index 0000000..1483316
--- /dev/null
+++ b/assets/plugins/LiteLoader/LangPack/tr.json
@@ -0,0 +1,440 @@
+{
+  "base": {
+    "getDimName": {
+      "0": "Overworld",
+      "1": "Nether",
+      "2": "End",
+      "unknown": "Diğer boyut"
+    }
+  },
+  "ll": {
+    "main": {
+      "checkRunningBDS": {
+        "detected": "Aynı yola sahip başka bir BDS sürecinin varlığı tespit edildi!",
+        "tip": "Bu, ağ bağlantı noktasının ve düzeyinin meşgul edilmesine neden olabilir",
+        "ask": "İşlemi PID {} ile sonlandırmak ister misiniz?  (y =Evet, n =Hayır, e =Çıkış)"
+      },
+      "fixAllowList": {
+        "removeEmptyAllowlist": "allowlist.json boş! Kaldırılıyor...",
+        "checkManually": "Her ikisi de; allowlist.json ve whitelist.json var ve boş değil. Lütfen bunları manuel olarak kontrol edin",
+        "renamed": "whitelist.json, allowlist.json olarak yeniden adlandırıldı"
+      },
+      "warning": {
+        "inDevMode": "Şu anda geliştirici modunda!",
+        "betaVersion": "Şu anda bir beta sürümü kullanılıyor.",
+        "productionEnv": "LÜTFEN ÜRETİM ORTAMINDA KULLANMAYIN!",
+        "protocolVersionNotMatch": {
+          "1": "Protokol sürümü eşleşmiyor, hedef sürüm: {}, geçerli sürüm: {}.",
+          "2": "Bu büyük olasılıkla sunucuyu çökertecektir, lütfen BDS sürümüyle eşleşen LiteLoader'ı kullanın!"
+        }
+      },
+      "bstats": {
+        "enabled": "bStats has been enabled, you can edit plugins/bStats/config.json to disable it"
+      }
+    },
+    "antiAbnormalItem": {
+      "detected": "Oyuncu({}) eşya veri hatası!",
+      "itemInfo": "Eşya: {}"
+    },
+    "cmd": {
+      "tpdim": {
+        "success": "{}, {}'ye ışınlandı ({:2f}, {:2f}, {:2f})",
+        "error": {
+          "noActorTeleported": "Hiçbir Varlık Işınlanamadı",
+          "noActorSpecified": "Hiçbir Varlık Belirtilmedi"
+        },
+        "invalidDimid": "Geçersiz DimensionId: {}"
+      },
+      "listPlugin": {
+        "overview": "Eklenti Listesi [{}]",
+        "tip": "* Daha fazla bilgi için \"ll list \" komutunu gönderin"
+      },
+      "pluginInfo": {
+        "title": "Eklenti <{}>",
+        "error": {
+          "pluginNotFound": "Eklenti, <{}> bulunamadı!"
+        }
+      },
+      "version": {
+        "msg": "Bedrock Dedicated Server {}\n- ve LiteLoaderBDS {}\n- Ağ Protokolü: {}"
+      },
+      "help": {
+        "msg": "[Introduction]\nLiteLoaderBDS, Bedrock Dedicated Server'ın geliştirilmesini değiştirmek için resmi olmayan bir eklenti yükleyicidir.\nÇok sayıda API, güçlü bir event sistemi ve çok sayıda paketlenmiş yardımcı program arabirimi sağlar.\n[Github]\n--> https://github.com/LiteLDev/LiteLoaderBDS <--\nDaha fazla bilgi almak için github projemizi ziyaret edin ~"
+      },
+      "loadPlugin": {
+        "success": "Eklenti, <{}> yüklendi.",
+        "fail": "Eklenti yüklenemedi {}"
+      },
+      "unloadPlugin": {
+        "success": "Eklenti, <{}> kapatıldı.",
+        "fail": "Eklenti kapatılamadı <{}>"
+      },
+      "reloadPlugin": {
+        "success": "Eklenti, <{}> yeniden yüklendi.",
+        "fail": "Eklenti yeniden yüklenemedi <{}>"
+      },
+      "reloadAllPlugins": {
+        "success": "{} eklenti başarıyla yeniden yüklendi.",
+        "fail": "Herhangi bir eklenti yeniden yüklenemedi"
+      },
+      "settings": {
+        "set": {
+          "success": "Ayarlar {}'dan {} olarak başarıyla ayarlandı."
+        },
+        "get": {
+          "success": "Ayarlar, {} başarıyla alındı. Değer: "
+        },
+        "delete": {
+          "success": "Ayarlar, {} başarıyla silindi.",
+          "error": {
+            "emptyKey": "JsonPointer boş olamaz!"
+          }
+        },
+        "reload": {
+          "success": "Ayarlar başarıyla yeniden yüklendi."
+        },
+        "save": {
+          "success": "Ayarlar başarıyla kaydedildi."
+        },
+        "list": {
+          "success": "Ayarlar listesi:"
+        }
+      },
+      "error": {
+        "noPathSpecified": "LiteLoader eklentisinin geçerli bir yolunu belirtmelisiniz!",
+        "noNameSpecified": "LiteLoader eklentisinin geçerli bir adını belirtmelisiniz!"
+      }
+    },
+    "config": {
+      "save": {
+        "fail": "Konfigürasyon dosyası kaydedilemedi (oluşturulamadı)!"
+      },
+      "creating": "LL Konfigürasyon Dosyası, <{}> bulunamadı. Konfigürasyon dosyası oluşturuluyor...",
+      "warning": {
+        "configOutdated": "LL Konfigürasyon dosyası, <{}> eski."
+      },
+      "updating": "Konfigürasyon dosyası güncelleniyor..."
+    },
+    "crashLogger": {
+      "existsingDebuggerDetected": "Mevcut hata ayıklayıcı algılandı. Yerleşik CrashLogger çalışmayacak.",
+      "wineDetected": "Wine Environment tespit edildi. Yerleşik CrashLogger çalışmayacak.",
+      "error": {
+        "cannotCreateDaemonProcess": "CrashLogger Arka Plan Programı İşlemi Oluşturulamadı!"
+      },
+      "warning": {
+        "crashLoggerDisabled": {
+          "1": "Builtin CrashLogger konfigürasyonda devre dışı bırakıldığı için etkinleştirilmedi.",
+          "2": "İşlenemeyen özel durum oluştuğunda çökme raporu oluşturulamayacak,",
+          "3": "bu da çökmenin nedenini ve kaynağını bulmayı neredeyse imkansız hale getiriyor.",
+          "4": "Sunucu kararlılığını sağlamak için etkinleştirmenizi önemle öneririz"
+        },
+        "conflicts": {
+          "1": "Builtin CrashLogger, <{}> eklentisiyle çakıştığı için etkinleştirilemedi",
+          "2": "İşlenmeyen özel durum oluştuğunda çökme raporu oluşturulayamayacak,",
+          "3": "bu da çökmenin nedenini ve kaynağını bulmayı neredeyse imkansız hale getiriyor.",
+          "4": "CrashLogger, sunucu kararlılığını sağlayan önemli bir bileşen olduğundan",
+          "5": "<{}> eklentisinin kullanımı hakkında iki kez düşünmenizi öneririz"
+        }
+      },
+      "init": {
+        "fail": {
+          "msg": "Builtin CrashLogger başlatılamadı!",
+          "tip": "İşlenmeyen özel durum oluştuğunda çökme raporu oluşturulayamayacak."
+        }
+      }
+    },
+    "addonsHelper": {
+      "error": {
+        "addonConfigNotFound": "Eklenti konfigürasyonu bulunamadı!",
+        "addonFileNotFound": "Eklenti dosyası, \"{}\" bulunamadı!",
+        "addonNotFound": "Eklenti, <{}> bulunamadı!",
+        "outOfRange": "Addon dizini {} aralık dışı",
+        "unsupportedFileType": "Desteklenmeyen dosya türü bulundu!",
+        "parsingEnabledAddonsList": "Etkin addon listesi ayrıştırılırken hata oluştu",
+        "noAddonInstalled": "Hiçbir addon yüklenemedi.",
+        "installationAborted": "Yükleme işlemi iptal edildi!"
+      },
+      "displayError": "Hata: {}",
+      "removeAddonFromList": {
+        "fail": "Addon <{}> konfigürasyon dosyasından kaldırılamadı!",
+        "success": "Addon <{}> konfigürasyon dosyasından kaldırıldı."
+      },
+      "addAddonToList": {
+        "invalidList": "Geçersiz Eklenti Listesi Dosyası {}, {} 'ye yedekle ve varsayılana sıfırla",
+        "fail": "{} eklentisi {} içine eklenemedi!",
+        "success": "Konfigürasyon dosyasına addon <{}> eklendi."
+      },
+      "install": {
+        "installing": "Addon kuruluyor <{}>...",
+        "error": {
+          "failToUncompress": {
+            "msg": "Addon {} sıkıştırması açılamadı!",
+            "exitCode": "Çıkış Kodu: {}",
+            "programOutput": "Program Çıktısı:\n{}"
+          }
+        }
+      },
+      "uninstall": {
+        "success": "Addon <{}> kaldırıldı."
+      },
+      "autoInstall": {
+        "tip": {
+          "dirCreated": "Dizin oluşturuldu. Sıkıştırılmış Addon dosyalarını bir sonraki açılışta yüklenmek üzere {} konumuna taşıyabilirsiniz."
+        },
+        "working": "{} tane yüklenecek yeni addon(lar) bulundu. Yükleniyor...",
+        "installed": "Addon {} yüklendi.",
+        "installedCount": "{} addon(lar) kuruldu."
+      },
+      "cmd": {
+        "output": {
+          "list": {
+            "overview": "Addons: {} addon(lar) yüklendi:"
+          }
+        }
+      }
+    },
+    "loader": {
+      "loadScriptEngine": {
+        "error": {
+          "versionNotMatch": "Script Engine için {} dosya sürümü <{}>, LiteLoader sürümü <{}> ile eşleşmiyor"
+        },
+        "success": "* {} için ScriptEngine yüklendi."
+      },
+      "loadDotNetEngine": {
+        "error": {
+          "versionNotMatch": "LiteLoader.NET dosyasının <{}> sürümü LiteLoader sürümüyle eşleşmiyor <{}>"
+        },
+        "success": "* .NET Motoru yüklendi."
+      },
+      "loadMain": {
+        "loadingPlugins": "Native eklentiler yükleniyor...",
+        "loadedShellLink": "ShellLinked eklenti <{} => {}> yüklendi",
+        "loadedPlugin": "Native eklenti <{name}> yüklendi",
+        "done": "{} native eklenti(ler) yüklendi.",
+        "start": "Native eklentiler yükleniyor..."
+      },
+      "initNodeJsDirectories": {
+        "created": "Node.js runtime dizini bulunamadı, oluşturuldu."
+      }
+    },
+    "notice": {
+      "newForum": "Yeni forumumuz yayında! -> {}",
+      "license": "LiteLoader {} altında lisanslanmıştır",
+      "translateText": "LL'deki metinleri çevirmemize ve geliştirmemize yardımcı olun -> {}"
+    },
+    "pluginManager": {
+      "error": {
+        "invalidFileType": "Geçersiz eklenti dosya türü: {} Şunun içinde: {}",
+        "noValidPluginFound": "{} adresinde geçerli bir eklenti bulunamadı!",
+        "failToRegisterPlugin": "Eklenti {} kaydedilemedi!",
+        "hasBeenRegistered": "{} adında bir eklenti kaydedildi",
+        "failToLoadPlugin": "Eklenti, {} yüklenemedi!",
+        "pluginNotFound": "<{}> eklentisi bulunamadı"
+      },
+      "warning": {
+        "unloadDllNotFinished": "Dll eklentilerinin kaldırma işlevi tamamlanamadı.",
+        "reloadDllNotFinished": "Dll eklentilerinin yeniden yükleme işlevi tamamlanamadı."
+      },
+      "reloadPlugin": {
+        "fail": "Eklenti, {} yeniden yüklenemedi!"
+      }
+    },
+    "unzipNodeModules": {
+      "fail": "node_modules.tar sıkıştırması açılamadı."
+    }
+  },
+  "llse": {
+    "init": {
+      "llMoney": {
+        "notFound": "LLMoney.dll bulunamadı, ScriptEngine Ekonomi Sistemi çalışamayacak"
+      }
+    },
+    "api": {
+      "ll": {
+        "require": {
+          "success": " - Eklenti gereksinimi başarıyla yüklendi. Yüklendi: ",
+          "fail": " - Eklenti gereksinim yüklemesi başarısız oldu",
+          "download": {
+            "success": " - Gereksinim başarıyla indirildi! Yol: ",
+            "fail": " - Eklenti gereksinimini indirme başarısız oldu! Kod: "
+          }
+        }
+      }
+    },
+    "apiHelp": {
+      "parseJson": {
+        "fail": "JSON ayrıştırma hatası"
+      }
+    },
+    "loader": {
+      "loadDepends": {
+        "success": "Bağımlılık {} yüklendi.",
+        "fail": "Bağımlılık yüklenemedi: {}"
+      },
+      "loadMain": {
+        "start": "{type} eklentileri yükleniyor...",
+        "done": "{count} tane {type} eklenti(ler) yüklendi.",
+        "nodejs": {
+          "installPack": {
+            "fail": "Eklenti paketi {} yüklenemedi, lütfen package.json dosyanızı kontrol edin!",
+            "start": "Node.js eklenti paketi \"{path}\" bulundu! Yüklemeyi deneyin..."
+          },
+          "ignored": "{path} dizininde package.json dosyası bulunamadı, yok sayıldı."
+        },
+        "loadedPlugin": "{type} eklenti <{name}> yüklendi.",
+        "installPluginPack": {
+          "done": "{count} tane {type} eklenti paket(ler) indirildi."
+        }
+      },
+      "nodejs": {
+        "executeNpmInstall": {
+          "success": "Npm başarıyla tamamlandı.",
+          "start": "Eklenti {name} için \"npm install\" çalıştırılıyor...",
+          "fail": "Hata oluştu. Çıkış kodu: {code}"
+        },
+        "register": {
+          "fail": "Eklenti {name} kaydedilmesine yardımcı olunamıyor!"
+        }
+      }
+    }
+  },
+  "permapi": {
+    "data": {
+      "process": {
+        "fail": "Veri dosyası işlenemedi: {}"
+      },
+      "read": {
+        "fail": "Veri dosyası okunamadı: {}"
+      },
+      "save": {
+        "fail": "Veri dosyası kaydedilemedi: {}"
+      }
+    },
+    "cmd": {
+      "error": {
+        "invalidCommand": "Geçersiz komut. Yardım almak için '/help perm' yazın.",
+        "internal": "Dahili sunucu hatası. Lütfen daha sonra tekrar deneyiniz.",
+        "roleAlreadyExists": "Rol ismi zaten var.",
+        "permissionAlreadyExists": "Yetki zaten mevcut.",
+        "invalidPermissionName": "Geçersiz yetki ismi.",
+        "roleNotFound": "Rol bulunamadı.",
+        "permissionNotFound": "Yetki bulunamadı.",
+        "playerNotFound": "Oyuncu bulunamadı.",
+        "modifyMembersOfEveryone": "Rol herkesin rolüdür. Üyelerini değiştiremezsiniz.",
+        "jsonParsingError": "JSON ayrıştırma hatası: {}",
+        "missingArgument": "Eksik argüman: {}",
+        "permissionDenied": "Bu komutu kullanmak için yetkiniz yok."
+      },
+      "output": {
+        "create": {
+          "role": {
+            "success": "Rol oluşturuldu."
+          },
+          "perm": {
+            "success": "Yetki oluşturuldu."
+          }
+        },
+        "delete": {
+          "role": {
+            "success": "Rol silindi."
+          },
+          "perm": {
+            "success": "Yetki silindi."
+          }
+        },
+        "list": {
+          "role": {
+            "none": "Görüntülenebilecek rol yok.",
+            "header": "§b§lRol Listesi:",
+            "isMember": "§r(§eÜye§r)"
+          },
+          "perm": {
+            "none": "Görüntülenebilecek yetkiler yok.",
+            "header": "§b§lYetki Listesi:"
+          }
+        },
+        "view": {
+          "player": {
+            "yourStatus": "§b§lGeçerli yetki durumunuz:",
+            "status": "§b§l{}'nın geçerli yetki durumu:",
+            "rolesTitle": "- §eRoller:",
+            "permissionsTitle": "- §eYetkiler:"
+          },
+          "role": {
+            "header": "§b§lRol Bilgisi:",
+            "info": {
+              "name": "+ §eİsim§r: {roleName}",
+              "displayName": "+ §eGörünenİsim§r: {}",
+              "priority": "+ §eÖncelik§r: {}",
+              "membersNone": "+ §eÜyeler§r: Yok",
+              "members": "+ §eÜyeler§r:",
+              "permissionsNone": "+ §eYetkiler§r: Yok",
+              "permissions": "+ §eYetkiler§r:"
+            },
+            "note": {
+              "admin": "※ {}§r özel bir roldür. Tüm izinler varsayılan olarak etkinleştirilecektir.",
+              "everyone": "※ {}§r özel bir roldür. Tüm oyuncular bu rolün üyesidir."
+            },
+            "enabled": "§a(Aktif)§r",
+            "disabled": "§c(Devredışı)§r",
+            "enabledWithExtra": "§b(Ekstra kısıtlamalarla aktif)§r"
+          },
+          "perm": {
+            "header": "§b§lYetki Bilgileri:",
+            "info": {
+              "name": "+ §eİsim§r: {permissionName}",
+              "desc": "+ §eAçıklama§r: {}"
+            }
+          }
+        },
+        "update": {
+          "role": {
+            "member": {
+              "add": {
+                "success": "Üye {name}§r({xuid}) Rol {roleDisplayName}§r'ye eklendi."
+              },
+              "remove": {
+                "success": "Üye {name}§r({xuid}) Rol {roleDisplayName}§r'den kaldırıldı."
+              }
+            },
+            "perm": {
+              "add": {
+                "success": "Rol {roleDisplayName}§r'ye {name}§r yetkisi eklendi."
+              },
+              "remove": {
+                "success": "Rol {roleDisplayName}§r'den {name}§r yetkisi kaldırıldı."
+              },
+              "set": {
+                "enabled": "§aaktifleştirildi§r",
+                "disabled": "§cdeaktifleştirildi§r",
+                "success": "Rol {roleDisplayName}§r'nin {name}§r yetkisi {enable} olarak ayarlandı."
+              }
+            },
+            "priority": {
+              "set": {
+                "success": "{roleDisplayName}§r rolünün önceliği, {priority} olarak ayarlandı."
+              }
+            },
+            "displayName": {
+              "set": {
+                "success": "<{roleName}§r> rolünün görünen adı {displayName}§r olarak ayarlandı."
+              }
+            }
+          },
+          "player": {
+            "role": {
+              "add": {
+                "success": "Oyuncu {name}§r({xuid}), {roleDisplayName}§r rolüne eklendi."
+              },
+              "remove": {
+                "success": "Oyuncu {name}§r({xuid}) {roleDisplayName}§r rolünden çıkarıldı."
+              }
+            }
+          }
+        },
+        "noDesc": "[Açıklama yok]",
+        "permissionNameExamples": "Yetki adı örnekleri: 'Namespace:PermissionName', 'a:b:c:d_e_f.g'"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/RELEASE/plugins/LiteLoader/LangPack/vi.json b/assets/plugins/LiteLoader/LangPack/vi.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/vi.json
rename to assets/plugins/LiteLoader/LangPack/vi.json
diff --git a/RELEASE/plugins/LiteLoader/LangPack/zh_CN.json b/assets/plugins/LiteLoader/LangPack/zh_CN.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/zh_CN.json
rename to assets/plugins/LiteLoader/LangPack/zh_CN.json
diff --git a/RELEASE/plugins/LiteLoader/LangPack/zh_TW.json b/assets/plugins/LiteLoader/LangPack/zh_TW.json
similarity index 100%
rename from RELEASE/plugins/LiteLoader/LangPack/zh_TW.json
rename to assets/plugins/LiteLoader/LangPack/zh_TW.json
diff --git a/assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI b/assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI
new file mode 160000
index 0000000..84923c2
--- /dev/null
+++ b/assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI
@@ -0,0 +1 @@
+Subproject commit 84923c20dafedfe14a0c578361047e5c376f2d33
diff --git a/RELEASE/plugins/lib/DO NOT UPGRADE NPM IN THIS DIRECTORY!! b/assets/plugins/lib/DO NOT UPGRADE NPM IN THIS DIRECTORY!!
similarity index 100%
rename from RELEASE/plugins/lib/DO NOT UPGRADE NPM IN THIS DIRECTORY!!
rename to assets/plugins/lib/DO NOT UPGRADE NPM IN THIS DIRECTORY!!
diff --git a/RELEASE/plugins/lib/libcrypto-1_1-x64.dll b/assets/plugins/lib/libcrypto-1_1-x64.dll
similarity index 100%
rename from RELEASE/plugins/lib/libcrypto-1_1-x64.dll
rename to assets/plugins/lib/libcrypto-1_1-x64.dll
diff --git a/RELEASE/plugins/lib/libcrypto-3-x64.dll b/assets/plugins/lib/libcrypto-3-x64.dll
similarity index 100%
rename from RELEASE/plugins/lib/libcrypto-3-x64.dll
rename to assets/plugins/lib/libcrypto-3-x64.dll
diff --git a/RELEASE/plugins/lib/libnode.dll b/assets/plugins/lib/libnode.dll
similarity index 100%
rename from RELEASE/plugins/lib/libnode.dll
rename to assets/plugins/lib/libnode.dll
diff --git a/RELEASE/plugins/lib/libssl-1_1-x64.dll b/assets/plugins/lib/libssl-1_1-x64.dll
similarity index 100%
rename from RELEASE/plugins/lib/libssl-1_1-x64.dll
rename to assets/plugins/lib/libssl-1_1-x64.dll
diff --git a/RELEASE/plugins/lib/libssl-3-x64.dll b/assets/plugins/lib/libssl-3-x64.dll
similarity index 100%
rename from RELEASE/plugins/lib/libssl-3-x64.dll
rename to assets/plugins/lib/libssl-3-x64.dll
diff --git a/RELEASE/plugins/lib/lua5.4.3.dll b/assets/plugins/lib/lua5.4.3.dll
similarity index 100%
rename from RELEASE/plugins/lib/lua5.4.3.dll
rename to assets/plugins/lib/lua5.4.3.dll
diff --git a/RELEASE/plugins/lib/node_modules.tar b/assets/plugins/lib/node_modules.tar
similarity index 100%
rename from RELEASE/plugins/lib/node_modules.tar
rename to assets/plugins/lib/node_modules.tar
diff --git a/RELEASE/plugins/lib/package.json b/assets/plugins/lib/package.json
similarity index 100%
rename from RELEASE/plugins/lib/package.json
rename to assets/plugins/lib/package.json
diff --git a/RELEASE/plugins/lib/sqlite3.dll b/assets/plugins/lib/sqlite3.dll
similarity index 100%
rename from RELEASE/plugins/lib/sqlite3.dll
rename to assets/plugins/lib/sqlite3.dll