Merge remote-tracking branch 'origin/beta' into beta

PoiCraft · Aug 14, 2022 · 5bb15ee · 5bb15ee
2 parents 8499b59 + 75d7379
commit 5bb15ee
Show file tree

Hide file tree

Showing 65 changed files with 11,096 additions and 1,392 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,32 +1,17 @@
 ## [LiteLoader Release Note]
-LiteLoaderBDS-2.5.0 update has been released, adapted to BDS-1.19.20, ProtocolVersion 544
-
-## [Major]
-- Support BDS 1.19.20 by @dreamguxiang
-- New i18n API (#503)(#651) by @Jasonzyt
-- NodeJs Support. by @Jasonzyt @WangYneos @yqs112358 @ShrBox @RimuruChan
+LiteLoaderBDS-2.5.1 update has been released, adapted to BDS-1.19.20, ProtocolVersion 544
 
 ## [New features]
-- Add BinaryStream.writeType(mce::UUID) (#606) by @S3v3Nice 
-- Add ReadOnlyBinaryStream.readType(Vec3) (#619) by @S3v3Nice
-- Add PlayerInfoAPI cache&new API (#612) by @Jasonzyt
-- Add Raise error when trying registering a existing command name (#604) by @Jasonzyt
-- Add PlayerInteractEntityEvent (#646) by @S3v3Nice
+- Add basic NativeAPI For LLSE @dreamguxiang & @yqs112358 & ＠WangYneos & @dofes & @wzyyyyyyy
+- Add `LL::getLanguage()` by @ShrBox
+- Add response to control event(Ctrl+C) by @Redbeanw44602
 
 ## [Change]
-- Script addons support, by @dofes
-- LLSE-JS engine changed from V8 to QuickJs by @dreamguxiang @yqs112358
-- Update Slider & CustomForm (#572) by @S3v3Nice
-- Upgrade OpenSSL to 3.0.5 (#654) by @ShrBox
+- Re-add mysql support
 
 ## [Bug Fixes]
-- Separate jsdebug & nodedebug command (#615) by @StarsDream00 @RimuruChan
-- Fix Lua table type check (#622) by @StarsDream00 @RimuruChan
-- Fix LLSE File class object cannot read files with Chinese file names properly (#625) by @Jasonzyt
-- Fix LLSE File class can not properly delete files with Chinese file names (#627) by @Jasonzyt
-- Fix BinaryStream class is missing writeVec3 (#631) by @Jasonzyt
-- Fix ob.getScore(target) does not get the corresponding score correctly (#626) by @Jasonzyt
-- Fix Block::getTileData error, by @Jasonzyt
-- Fix Plugin name cannot contain LiteLoader (#644) by @Jasonzyt
-- Fix the event callback when listening to the player's death does not get the player's items properly (#634) by @dreamguxiang
-- Fix FormUI Form StepSlider error (#642) by @Jasonzyt
+- Fix FormUI error by @dreamguxiang
+- Fix #666 by @dreamguxiang & @WangYneos
+- Fix I18N compatibility by @Jasonzyt
+- Fix quickjs timezone bug (#664) by @yqs112358
+- Fix #604 again by @Jasonzyt
diff --git a/LiteLoader/CMakeLists.txt b/LiteLoader/CMakeLists.txt
@@ -51,8 +51,10 @@ add_library(sqlitecpp STATIC IMPORTED)
 set_property(TARGET sqlitecpp PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/Lib/third-party/SQLiteCpp/SQLiteCpp.lib")
 add_library(sqlite3 STATIC IMPORTED)
 set_property(TARGET sqlite3 PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/Lib/third-party/SQLiteCpp/sqlite3.lib")
+add_library(mysql STATIC IMPORTED)
+set_property(TARGET mysql PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/Lib/third-party/mysql/mysqlclient.lib")
 
-target_link_libraries(LiteLoader sqlitecpp sqlite3
+target_link_libraries(LiteLoader sqlitecpp sqlite3 mysql
         "${PROJECT_SOURCE_DIR}/Lib/third-party/openssl/libcrypto.lib"
         "${PROJECT_SOURCE_DIR}/Lib/third-party/openssl/libssl.lib"
         "${PROJECT_SOURCE_DIR}/Lib/third-party/leveldb/leveldb.lib"

diff --git a/...Loader/Header/DB/Impl/MySQL/Session.h.bak → LiteLoader/Header/DB/Impl/MySQL/Session.h b/...Loader/Header/DB/Impl/MySQL/Session.h.bak → LiteLoader/Header/DB/Impl/MySQL/Session.h
diff --git a/LiteLoader/Header/DB/Impl/MySQL/Stmt.h.bak → LiteLoader/Header/DB/Impl/MySQL/Stmt.h b/LiteLoader/Header/DB/Impl/MySQL/Stmt.h.bak → LiteLoader/Header/DB/Impl/MySQL/Stmt.h
diff --git a/LiteLoader/Header/Utils/TypeConversionHelper.hpp b/LiteLoader/Header/Utils/TypeConversionHelper.hpp
@@ -1,16 +1,17 @@
 #pragma once
 #include <../Global.h>
 #include <string>
+#include <third-party/ModUtils/ModUtils.h>
 using namespace std;
 
 namespace TCHelper {
-string uto_string(uintptr_t x) {
+inline string uto_string(uintptr_t x) {
     stringstream ss;
     ss << hex << x;
     return ss.str();
 }
 
-uintptr_t string_tohex(const string& str) {
+inline uintptr_t string_tohex(const string& str) {
     stringstream ss;
     ss << hex << str;
     uintptr_t res;
@@ -19,7 +20,7 @@ uintptr_t string_tohex(const string& str) {
 }
 
 
-vector<uint8_t> splitHex8(const string& str) {
+inline vector<uint8_t> splitHex8(const string& str) {
     vector<uint8_t> res;
     stringstream ss(str);
     string item;
@@ -33,14 +34,14 @@ vector<uint8_t> splitHex8(const string& str) {
     return res;
 }
 
-string uto_string(uint8_t x) {
+inline string uto_string(uint8_t x) {
     stringstream ss;
     ss << hex << x;
     return ss.str();
 }
 
 
-vector<uint16_t> splitHex(const string& str) {
+inline vector<uint16_t> splitHex(const string& str) {
     vector<uint16_t> res;
 	stringstream ss(str);
 	string item;