2.7.0

Author: dreamguxiang

.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"

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "SDK"]
 	path = SDK
-	url = https://github.com/LiteLDev/LiteLoaderSDK.git
+	url = https://github.com/LiteLDev/LiteLoaderSDK
+	branch = develop

PermissionAPI/Data.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <Global.h>
-#include <third-party/Nlohmann/json.hpp>
+#include <Nlohmann/json.hpp>
 #include "Data/Role.hpp"
 
 class Permission {

PermissionAPI/Data/Permission.hpp

@@ -7,7 +7,7 @@
  * 
  */
 #pragma once
-#include <third-party/Nlohmann/json.hpp>
+#include <Nlohmann/json.hpp>
 #include "Foundation.hpp"
 
 namespace PERM {

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")) {

PermissionAPI/PermissionAPI.vcxproj

@@ -137,12 +137,12 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;PERMAPI_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;PERMAPI_EXPORTS;_WINDOWS;_USRDLL;_AMD64_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)SDK\Header\third-party;$(SolutionDir)SDK\Header;$(VC_IncludePath);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)SDK\include;$(SolutionDir)SDK\include\llapi;$(VC_IncludePath);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>

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<std::string, std::string>{

PermissionAPI/pch.h

@@ -6,15 +6,15 @@
 #include <LoggerAPI.h>
 
 #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};