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

Commit

Permalink
Release 2.12.0 (LiteLDev#1152)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yqs112358
yqs112358 authored Mar 24, 2023
2 parents 5d477ba + cf2b389 commit 4c43e26
Show file tree
Hide file tree
Showing 4,690 changed files with 148,147 additions and 96,850 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 6 additions & 13 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,11 @@ jobs:
move bedrock_server_var.lib ..\LiteLoader\lib
shell: cmd

- name: Get short SHA
id: sha_short
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Set LITELOADER_VERSION_COMMIT_SHA
working-directory: ${{ env.GITHUB_WORKSPACE }}
run: |
sed -r -i 's/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA ${{ steps.sha_short.outputs.sha_short }}\r/' LiteLoader/include/liteloader/Version.h
export sha_short=$(git rev-parse --short HEAD)
sed -r -i "s/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA $sha_short\r/" LiteLoader/include/liteloader/Version.h
shell: bash

- name: Configure CMake (MSVC)
Expand Down Expand Up @@ -94,7 +91,7 @@ jobs:
if: github.event_name == 'push'
run: |
cd build/output/plugins/LiteLoader/ResourcePacks
7z a LiteLoaderBDS-CUI.tar LiteLoaderBDS-CUI
7z a LiteLoaderBDS-CUI.zip LiteLoaderBDS-CUI
rm -r LiteLoaderBDS-CUI
shell: bash

Expand Down Expand Up @@ -130,9 +127,7 @@ jobs:
${{ github.workspace }}\build\output\plugins\lib\
${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\7z\
${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar
Expand Down Expand Up @@ -166,10 +161,8 @@ jobs:
with:
name: ScriptEngine
path: |
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll
${{ github.workspace }}\build\output\plugins\lib\node_modules.tar
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll
${{ github.workspace }}\build\output\plugins\lib\*.zip
${{ github.workspace }}\build\output\plugins\lib\package.json
- name: Upload LLParticle
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/publish_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ jobs:
${{ github.workspace }}\build\output\plugins\lib\
${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\7z\
${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar
Expand Down Expand Up @@ -192,10 +190,8 @@ jobs:
with:
name: ScriptEngine
path: |
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll
${{ github.workspace }}\build\output\plugins\lib\node_modules.tar
${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll
${{ github.workspace }}\build\output\plugins\lib\*.zip
${{ github.workspace }}\build\output\plugins\lib\package.json
- name: Upload LLParticle
Expand Down Expand Up @@ -261,6 +257,7 @@ jobs:
tag: ${{ github.event.inputs.tag }}
bodyFile: RELEASE_NOTES.md
artifacts: |
build/LiteLoaderBDS.zip
build/Modules.zip
build/PDB.zip
env:
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"]
path = assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI
url = https://github.com/OEOTYAN/LiteLoaderBDS-CUI.git
[submodule "PermissionAPI"]
path = PermissionAPI
url = https://github.com/LiteLDev/PermissionAPI.git
[submodule "ParticleAPI"]
path = ParticleAPI
url = https://github.com/LiteLDev/ParticleAPI.git
[submodule "assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"]
path = assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI
url = https://github.com/OEOTYAN/LiteLoaderBDS-CUI.git
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ add_subdirectory(LiteLoader)
add_subdirectory(ScriptEngine/CMake/ScriptEngine-Lua)
add_subdirectory(ScriptEngine/CMake/ScriptEngine-QuickJs)
add_subdirectory(ScriptEngine/CMake/ScriptEngine-NodeJs)
add_subdirectory(ScriptEngine/CMake/ScriptEngine-Python)
add_subdirectory(Tools/Demangler)
add_subdirectory(Tools/ScriptX/CMake/ScriptX-Lua)
add_subdirectory(Tools/ScriptX/CMake/ScriptX-QuickJs)
add_subdirectory(Tools/ScriptX/CMake/ScriptX-NodeJs)
add_subdirectory(Tools/ScriptX/CMake/ScriptX-Python)
add_subdirectory(Tools/SymDBHelper)
add_subdirectory(ParticleAPI)
add_subdirectory(PermissionAPI/PermissionAPI)
Expand Down
11 changes: 11 additions & 0 deletions LiteLoader/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,14 @@ add_custom_command(
COMMENT "Copying LiteLoader Lib to SDK directory"
VERBATIM
)

# copy target DLL and PDB to local bds dev directory
if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "")
add_custom_command(
TARGET LiteLoader POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:LiteLoader> ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PDB_FILE:LiteLoader> ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/
COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory"
VERBATIM
)
endif()
6 changes: 3 additions & 3 deletions LiteLoader/include/liteloader/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#define LITELOADER_VERSION_RELEASE 2

#define LITELOADER_VERSION_MAJOR 2
#define LITELOADER_VERSION_MINOR 11
#define LITELOADER_VERSION_REVISION 1
#define LITELOADER_VERSION_MINOR 12
#define LITELOADER_VERSION_REVISION 0
#define LITELOADER_VERSION_COMMIT_SHA UNKNOWN
#define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV
#define LITELOADER_VERSION_STATUS_VERSION 0

#define TARGET_BDS_PROTOCOL_VERSION 568
#define TARGET_BDS_PROTOCOL_VERSION 575

#define LITELOADER_VERSION ll::getLoaderVersion()

Expand Down
1 change: 1 addition & 0 deletions LiteLoader/include/llapi/Global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#pragma unmanaged
#include <entt/entt.hpp>
#pragma managed

#include <gsl/gsl>
#include <FMT/chrono.h>
#include <FMT/color.h>
Expand Down
2 changes: 1 addition & 1 deletion LiteLoader/include/llapi/GlobalServiceAPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class AllowListFile;
class PropertiesSettings;
class ResourcePackRepository;
class LevelStorage;

class StructureManager;
#ifdef LITELOADER_EXPORTS
template <typename T>
LIAPI inline T* Global = nullptr;
Expand Down
16 changes: 10 additions & 6 deletions LiteLoader/include/llapi/SendPacketAPI.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once
#include "llapi/mc/BinaryStream.hpp"
#include "llapi/mc/Packet.hpp"
#include "llapi/mc/ExtendedStreamReadResult.hpp"

template <int pid, bool batching = true, bool compress = true>
class NetworkPacket : public Packet {
Expand All @@ -25,14 +26,17 @@ class NetworkPacket : public Packet {
virtual void write(BinaryStream& bs) const {
bs.getRaw().append(view);
}
virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override {
throw("TODO in MyPkt::_read()");
return (enum StreamReadResult)0;
}
virtual void dummyread() {
throw("TODO in MyPkt::dummyread()");
virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &) {
throw("TODO");
}
virtual bool disallowBatching() const {
return !batching;
}
virtual bool isValid() const {
throw("TODO");
}
virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override {
throw("TODO in MyPkt::_read()");
return (enum StreamReadResult)0;
}
};
14 changes: 7 additions & 7 deletions LiteLoader/include/llapi/mc/AABBBucket.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,31 @@ struct AABBBucket {

public:
/**
* @symbol ??0AABBBucket\@\@QEAA\@XZ
* @symbol ??0AABBBucket\@\@QEAA\@XZ
*/
MCAPI AABBBucket();
/**
* @symbol ?clearDirty\@AABBBucket\@\@QEAAXXZ
* @symbol ?clearDirty\@AABBBucket\@\@QEAAXXZ
*/
MCAPI void clearDirty();
/**
* @symbol ?clearNeedsFinalize\@AABBBucket\@\@QEAAXXZ
* @symbol ?clearNeedsFinalize\@AABBBucket\@\@QEAAXXZ
*/
MCAPI void clearNeedsFinalize();
/**
* @symbol ?isDirty\@AABBBucket\@\@QEAA_NXZ
* @symbol ?isDirty\@AABBBucket\@\@QEAA_NXZ
*/
MCAPI bool isDirty();
/**
* @symbol ?markDirty\@AABBBucket\@\@QEAAXXZ
* @symbol ?markDirty\@AABBBucket\@\@QEAAXXZ
*/
MCAPI void markDirty();
/**
* @symbol ?mergeAABBs\@AABBBucket\@\@QEAAXXZ
* @symbol ?mergeAABBs\@AABBBucket\@\@QEAAXXZ
*/
MCAPI void mergeAABBs();
/**
* @symbol ?needsFinalize\@AABBBucket\@\@QEBA_NXZ
* @symbol ?needsFinalize\@AABBBucket\@\@QEBA_NXZ
*/
MCAPI bool needsFinalize() const;

Expand Down
4 changes: 2 additions & 2 deletions LiteLoader/include/llapi/mc/AABBPred.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class AABBPred {

public:
/**
* @symbol ??RAABBPred\@\@QEBA_NAEBVAABB\@\@0\@Z
* @symbol ??RAABBPred\@\@QEBA_NAEBVAABB\@\@0\@Z
*/
MCAPI bool operator()(class AABB const &, class AABB const &) const;

};
};
2 changes: 1 addition & 1 deletion LiteLoader/include/llapi/mc/AABBShapeComponent.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct AABBShapeComponent {

public:
/**
* @symbol ?toString\@AABBShapeComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
* @symbol ?toString\@AABBShapeComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ
*/
MCAPI std::string toString() const;

Expand Down
Loading

0 comments on commit 4c43e26

Please sign in to comment.