Skip to content
This repository has been archived by the owner on Jan 16, 2024. It is now read-only.

Commit

Permalink
2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamguxiang committed Sep 23, 2022
1 parent 152f143 commit fc83ff7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "SDK"]
path = SDK
url = https://github.com/LiteLDev/LiteLoaderSDK.git
url = https://github.com/LiteLDev/LiteLoaderSDK
branch = develop
2 changes: 1 addition & 1 deletion PermissionAPI/Data.h
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion PermissionAPI/Data/Permission.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/
#pragma once
#include <third-party/Nlohmann/json.hpp>
#include <Nlohmann/json.hpp>
#include "Foundation.hpp"

namespace PERM {
Expand Down
2 changes: 1 addition & 1 deletion PermissionAPI/Mod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
4 changes: 2 additions & 2 deletions PermissionAPI/PermissionAPI.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion PermissionAPI/dllmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>{
Expand Down
6 changes: 3 additions & 3 deletions PermissionAPI/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion SDK
Submodule SDK updated from d370d9 to 4964ce

0 comments on commit fc83ff7

Please sign in to comment.