Release v2.12.0 (#1151)

* add templates and update StaticVanillaBlocks (#1116)

* fix queryEntities (#1123)

* feat: adapt to 1.19.70 (#1126)

* adapt to 1.19.70

* refactor: replace some direct offset with dAccess

* fix: fix missing tick address

* fix: fix crash caused by autoGenerate

* fix: fix crash caused by autoGenerate

* fix: static vanilla blocks (#1127)

* Add nodiscard and tryUnwrap (#1128)

* add defines

* add tryUnwrap

* Update OwnerStorageEntity.hpp

* Update WeakStorageEntity.hpp

* update

* add nodiscard

* update

* fix: sendTextPacket, sendRawFormPacket and so on

* refactor: replace PacketId which is using int with MinecraftPacketIds

* refactor: remove built-in packet filter

* fix: fix crash #1130

* chore: fix actions sha_short

* refactor: add repository link

* fix: fix `OwnerStorageEntity::tryUnwrap` crash

* chore: fix actions sha_short

* fix: fix some packet api bugs

* fix: fix `ItemActor::getItemStack` crash

* refactor: update MinecraftPacketIds

* feat: #1112 (#1118)

Co-authored-by: WangYneos <[email protected]>
Co-authored-by: ShrBox <[email protected]>

* feat: Python support for LLSE (#1134)

* Add python source code and update ScriptX

* Add some adaption code for python

* Fix ScriptX cmakelist

* Finish general python plugin package loader

* Some fix about package loader

* Finish baselib loading

* Finish pydebug

* Add crowdin processor

* Update langpack

* Fix compile

* Update ScriptX

* Update ScriptX

* Finish python runtime configurations

* No need to create site-packages in python root dir

* Fix binary assets and uncompress code

* Update langpack

* Fix LiteLoaderBDS-CUI (misunderstand before)

* Fix a crash in ScriptX

* Update ScriptX to fix crash

* Fix pydebug

* Update ScriptX

* Update ScriptX

* Fix py debug

* Add product files auto-copy

* Finish pip install support

* Fix plugin load in py

* Add missing python libs

* Fix python module search path

* Small fix to loader

* Update docs

* feat: complete Ref.hpp & EntityId (#1133)

* feat: add tryGetComponent
* feat: complete MojangStyle smart pointers
* feat: complete EntityId
* fix: tryGetComponent

* feat: support signal-file plugin of Py

* build: fix ci not uploading LLSE Python

* refactor: rollback sendTextPacket & sendRawFormPacket because not working

* fix: add plugin source dir to sys.path

* fix: fix added sys.path

* fix: add __file__ to py env

* fix: rename ll.export/import to ll.exports/imports

* fix: update ScriptX to fix custom class registered scope

* feat: add some common functions (#1138)

* feat: add Hopper::isEntity & getCountNoCheck

* feat: add Color::lerp & mix

* refactor: release_notes

* feat: adapt to 1.19.72 (#1143)

* update header

* Revert "refactor: rollback sendTextPacket & sendRawFormPacket because not working"

This reverts commit fba5c4d.

* Update Player.hpp

* fix: try fix NetworkPacket

---------

Co-authored-by: ShrBox <[email protected]>
Co-authored-by: OEOTYAN <[email protected]>

* chore: fix github actions on Create pre-release

* chore: correct release notes

* fix: fix nodejs & python's loader

* fix: fix #1144

* fix: fix some small bugs in loader logic of py

* fix: update scriptx to fix a problem

* fix: fix tick event of LLSE

* feat: add SetCurrentThreadDescriptions to help debug

* fix: update ScriptX to fix main interpreter problem

* fix: fix ScriptEngine linking error

* fix: update ScriptX to fix random crash

* fix: try fix #1150

* chore: update RELEASE_NOTES

* fix Entity functions (#1148)

* fix: fix enum error (#1145)

* fix enum error
* fix a logical error

---------

Co-authored-by: OEOTYAN <[email protected]>
Co-authored-by: qingyu <[email protected]>
Co-authored-by: ShrBox <[email protected]>
Co-authored-by: ShrBox <[email protected]>
Co-authored-by: Tsubasa6848 <[email protected]>
Co-authored-by: WangYneos <[email protected]>
Co-authored-by: student_2333 <[email protected]>
Co-authored-by: starkc <[email protected]>

.github/workflows/build.yml

@@ -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)
@@ -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
 
@@ -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
@@ -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

.github/workflows/publish_release.yml

@@ -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
@@ -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
@@ -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:

.gitmodules

@@ -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

CMakeLists.txt

@@ -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)

LiteLoader/CMakeLists.txt

@@ -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()

LiteLoader/include/liteloader/Version.h

@@ -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()
 

LiteLoader/include/llapi/Global.h

@@ -66,6 +66,7 @@
 #pragma unmanaged
 #include <entt/entt.hpp>
 #pragma managed
+
 #include <gsl/gsl>
 #include <FMT/chrono.h>
 #include <FMT/color.h>

LiteLoader/include/llapi/GlobalServiceAPI.h

@@ -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;

LiteLoader/include/llapi/SendPacketAPI.h

@@ -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 {
@@ -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;
+    }
 };

LiteLoader/include/llapi/mc/AABBBucket.hpp

@@ -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;
 

LiteLoader/include/llapi/mc/AABBPred.hpp

@@ -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;
 
-};
+};

LiteLoader/include/llapi/mc/AABBShapeComponent.hpp

@@ -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;