Skip to content
This repository was archived by the owner on Oct 28, 2023. It is now read-only.

Commit c09b914

Browse files
dreamguxiangdreamguxiang
committed
2.7.0
1 parent ed120c7 commit c09b914

File tree

14 files changed

+32
-27
lines changed

14 files changed

+32
-27
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "SDK"]
22
path = SDK
33
url = https://github.com/LiteLDev/LiteLoaderSDK.git
4-
branch = beta
4+
branch = develop

‎LLHelper/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ target_link_libraries(LLHelper LiteLoader.lib
3131
bedrock_server_var.lib
3232
SymDBHelper.lib)
3333

34-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header)
35-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header/third-party)
36-
include_directories(${CMAKE_SOURCE_DIR}/Header)
34+
35+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include)
36+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include/llapi)
37+
include_directories(${CMAKE_SOURCE_DIR}/Header)

‎LLHelper/Helper.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <MC/ItemStack.hpp>
1111
#include <thread>
1212
#include <chrono>
13+
#include <windows.h>
1314

1415
vector<unsigned int> taskList;
1516
Logger logger("Helper");

‎LLHelper/Helper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#pragma warning(disable:4996)
66

7-
#define LLHELPER_VERSION LL::Version{ 2,6,0 }
7+
#define LLHELPER_VERSION ll::Version{ 2,7,0 }
88

99
/////////////////////// LL AutoUpgrade ///////////////////////
1010

‎LLHelper/dllmain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BOOL APIENTRY DllMain(HMODULE hModule,
99
) {
1010
switch (ul_reason_for_call) {
1111
case DLL_PROCESS_ATTACH:
12-
LL::registerPlugin("LLHelper", "A part of LLEssentials", LLHELPER_VERSION,
12+
ll::registerPlugin("LLHelper", "A part of LLEssentials", LLHELPER_VERSION,
1313
"https://github.com/LiteLDev/LiteLoaderPlugins", "GPLv3");
1414
case DLL_THREAD_ATTACH:
1515
case DLL_THREAD_DETACH:

‎LLMoney/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ target_link_libraries(LLMoney LiteLoader.lib
3333
"${CMAKE_SOURCE_DIR}/Lib/SQLiteCpp/sqlite3.lib"
3434
"${CMAKE_SOURCE_DIR}/Lib/SQLiteCpp/SQLiteCpp.lib")
3535

36-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header)
37-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header/third-party)
36+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include)
37+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include/llapi)
3838
include_directories(${CMAKE_SOURCE_DIR}/Header)
3939

40+

‎LLMoney/LLMoney.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class MoneyCommand : public Command
122122
{
123123
case query:
124124
case hist:
125-
if (dst_isSet && ori.getPermissionsLevel() > 0)
125+
if (dst_isSet && (int)ori.getPermissionsLevel() > 0)
126126
{
127127
dstxuid = PlayerInfo::getXuid(dst);
128128
}
@@ -163,7 +163,7 @@ class MoneyCommand : public Command
163163
outp.error(tr("money.dontuseinconsole"));
164164
return;
165165
}
166-
if (ori.getPermissionsLevel() < 1)
166+
if ((int)ori.getPermissionsLevel() < 1)
167167
{
168168
outp.error(tr("money.no.perm"));
169169
return;
@@ -207,7 +207,7 @@ class MoneyCommand : public Command
207207
}
208208
break;
209209
case set:
210-
if (ori.getPermissionsLevel() < 1)
210+
if ((int)ori.getPermissionsLevel() < 1)
211211
{
212212
outp.error(tr("money.no.perm"));
213213
return;
@@ -222,7 +222,7 @@ class MoneyCommand : public Command
222222
}
223223
break;
224224
case add:
225-
if (ori.getPermissionsLevel() < 1)
225+
if ((int)ori.getPermissionsLevel() < 1)
226226
{
227227
outp.error(tr("money.no.perm"));
228228
return;
@@ -237,7 +237,7 @@ class MoneyCommand : public Command
237237
}
238238
break;
239239
case reduce:
240-
if (ori.getPermissionsLevel() < 1)
240+
if ((int)ori.getPermissionsLevel() < 1)
241241
{
242242
outp.error(tr("money.no.perm"));
243243
return;
@@ -333,7 +333,7 @@ class MoneySCommand : public Command
333333
case hist:
334334
if (dst_isSet)
335335
{
336-
if (ori.getPermissionsLevel() > 0)
336+
if ((int)ori.getPermissionsLevel() > 0)
337337
{
338338
if (!player.results(ori).empty())
339339
{
@@ -437,7 +437,7 @@ class MoneySCommand : public Command
437437
break;
438438
case set:
439439
{
440-
if (ori.getPermissionsLevel() < 1)
440+
if ((int)ori.getPermissionsLevel() < 1)
441441
{
442442
outp.error(tr("money.no.perm"));
443443
return;
@@ -462,7 +462,7 @@ class MoneySCommand : public Command
462462
}
463463
case add:
464464
{
465-
if (ori.getPermissionsLevel() < 1)
465+
if ((int)ori.getPermissionsLevel() < 1)
466466
{
467467
outp.error(tr("money.no.perm"));
468468
return;
@@ -487,7 +487,7 @@ class MoneySCommand : public Command
487487
}
488488
case reduce:
489489
{
490-
if (ori.getPermissionsLevel() < 1)
490+
if ((int)ori.getPermissionsLevel() < 1)
491491
{
492492
outp.error(tr("money.no.perm"));
493493
return;

‎LLMoney/Money.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#pragma once
2-
#define LLMONEY_VERSION LL::Version{ 2,6,0 }
2+
#define LLMONEY_VERSION ll::Version{ 2,7,0 }

‎LLMoney/dllmain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BOOL APIENTRY DllMain(HMODULE hModule,
1111
switch (ul_reason_for_call)
1212
{
1313
case DLL_PROCESS_ATTACH:
14-
LL::registerPlugin("LLMoney", "EconomyCore for LiteLoaderBDS", LLMONEY_VERSION,
14+
ll::registerPlugin("LLMoney", "EconomyCore for LiteLoaderBDS", LLMONEY_VERSION,
1515
"https://github.com/LiteLDev/LiteLoaderPlugins", "GPLv3");
1616
case DLL_THREAD_ATTACH:
1717
case DLL_THREAD_DETACH:

‎LLtpa/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ target_link_libraries(LLTpa LiteLoader.lib
3131
bedrock_server_var.lib
3232
SymDBHelper.lib)
3333

34-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header)
35-
include_directories(${CMAKE_SOURCE_DIR}/SDK/Header/third-party)
34+
35+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include)
36+
include_directories(${CMAKE_SOURCE_DIR}/SDK/include/llapi)
3637
include_directories(${CMAKE_SOURCE_DIR}/Header)

0 commit comments

Comments
 (0)