diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9945db7..eea0b10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} run: | mkdir SDK/Tools/Server - curl -L -o LINK.txt https://raw.githubusercontent.com/LiteLDev/LiteLoaderBDS/main/Scripts/LINK.txt + curl -L -o LINK.txt https://raw.githubusercontent.com/LiteLDev/LiteLoaderBDS//develop/scripts/LINK.txt ServerLink=$(cat 'LINK.txt') echo "ServerLink: $ServerLink" curl -L -o SDK/Tools/Server/server.zip "$ServerLink" diff --git a/.gitmodules b/.gitmodules index baf537d..20e7dc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "SDK"] path = SDK - url = https://github.com/LiteLDev/LiteLoaderSDK.git + url = https://github.com/LiteLDev/LiteLoaderSDK + branch = develop diff --git a/PermissionAPI/Data.h b/PermissionAPI/Data.h index d24b480..122f437 100644 --- a/PermissionAPI/Data.h +++ b/PermissionAPI/Data.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include "Data/Role.hpp" class Permission { diff --git a/PermissionAPI/Data/Permission.hpp b/PermissionAPI/Data/Permission.hpp index 4dea3b0..eec8bf0 100644 --- a/PermissionAPI/Data/Permission.hpp +++ b/PermissionAPI/Data/Permission.hpp @@ -7,7 +7,7 @@ * */ #pragma once -#include +#include #include "Foundation.hpp" namespace PERM { diff --git a/PermissionAPI/Mod.cpp b/PermissionAPI/Mod.cpp index 97e6308..ff2e2f9 100644 --- a/PermissionAPI/Mod.cpp +++ b/PermissionAPI/Mod.cpp @@ -17,7 +17,7 @@ Mod::Mod() void Mod::entry() { //logger.info("PermissionAPI v{} loaded! Author: Jasonzyt", PERM_VER.toString(true)); - auto i18n = Translation::loadFromImpl(GetCurrentModule(), LL::getLoaderHandle()); + auto i18n = Translation::loadFromImpl(GetCurrentModule(), ll::getLoaderHandle()); perm.load(); // Register plugin permissions if (!perm.permInfoList.contains("PermissionAPI:cmd_control")) { diff --git a/PermissionAPI/PermissionAPI.vcxproj b/PermissionAPI/PermissionAPI.vcxproj index 10ad9df..1ceb67e 100644 --- a/PermissionAPI/PermissionAPI.vcxproj +++ b/PermissionAPI/PermissionAPI.vcxproj @@ -137,12 +137,12 @@ true true true - NDEBUG;PERMAPI_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + NDEBUG;PERMAPI_EXPORTS;_WINDOWS;_USRDLL;_AMD64_;%(PreprocessorDefinitions) true NotUsing pch.h stdcpp17 - $(SolutionDir)SDK\Header\third-party;$(SolutionDir)SDK\Header;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)SDK\include;$(SolutionDir)SDK\include\llapi;$(VC_IncludePath);$(WindowsSDK_IncludePath) /utf-8 %(AdditionalOptions) diff --git a/PermissionAPI/dllmain.cpp b/PermissionAPI/dllmain.cpp index 0707213..2bd2b64 100644 --- a/PermissionAPI/dllmain.cpp +++ b/PermissionAPI/dllmain.cpp @@ -6,7 +6,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, LPVOID lpReserved) { switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - LL::registerPlugin("PermissionAPI", + ll::registerPlugin("PermissionAPI", "Builtin & Powerful permission API for LiteLoaderBDS", PERM_VER, std::map{ diff --git a/PermissionAPI/pch.h b/PermissionAPI/pch.h index a76d758..86a2c10 100644 --- a/PermissionAPI/pch.h +++ b/PermissionAPI/pch.h @@ -6,15 +6,15 @@ #include #define PERM_VER_MAJOR 2 -#define PERM_VER_MINOR 6 +#define PERM_VER_MINOR 7 #define PERM_VER_REV 0 -#define PERM_VER_STATUS LL::Version::Beta +#define PERM_VER_STATUS ll::Version::Beta extern Logger& logger; namespace fs = std::filesystem; -static LL::Version PERM_VER{PERM_VER_MAJOR, +static ll::Version PERM_VER{PERM_VER_MAJOR, PERM_VER_MINOR, PERM_VER_REV, PERM_VER_STATUS}; diff --git a/SDK b/SDK index d370d9d..4964ce0 160000 --- a/SDK +++ b/SDK @@ -1 +1 @@ -Subproject commit d370d9daed33736d2a053d5c67ce32c566a91037 +Subproject commit 4964ce0046607d54ac02fe679b7fc6d02cee9adb