Merge pull request LiteLDev#1072 from LiteLDev/develop

Release 2.10.0
LiteLDev · Feb 10, 2023 · 661d946 · 661d946
2 parents b757f5c + 143649b
commit 661d946
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,6 +111,13 @@ jobs:
           USERNAME: github-actions[bot]
         shell: cmd
 
+      - name: Download LLMoney
+        working-directory: ${{ env.GITHUB_WORKSPACE }}
+        run: |
+          git clone https://github.com/Tooth-Hub/LLMoney.git LLMoney-bin
+          cp LLMoney-bin/LLMoney.dll build/output/plugins/
+        shell: bash
+
       - name: Upload LiteLoaderBDS
         uses: actions/[email protected]
         with:
@@ -119,6 +126,7 @@ jobs:
             ${{ github.workspace }}\build\output\LLPeEditor.exe
             ${{ github.workspace }}\build\output\LLPreLoader.dll
             ${{ github.workspace }}\build\output\LiteLoader.dll
+            ${{ github.workspace }}\build\output\plugins\LLMoney.dll
             ${{ github.workspace }}\build\output\plugins\lib\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
@@ -148,8 +156,9 @@ jobs:
           name: LiteLoader
           path: |
             ${{ github.workspace }}\build\output\LiteLoader.dll
-            ${{ github.workspace }}\build\output\plugins\lib\
+            ${{ github.workspace }}\build\output\plugins\lib\*.dll
             ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
+            ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
 
       - name: Upload ScriptEngine
@@ -160,7 +169,8 @@ jobs:
             ${{ 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\7z\
+            ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar
+            ${{ github.workspace }}\build\output\plugins\lib\package.json
       
       - name: Upload LLParticle
         uses: actions/[email protected]

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -137,6 +137,13 @@ jobs:
           USERNAME: github-actions[bot]
         shell: cmd
 
+      - name: Download LLMoney
+        working-directory: ${{ env.GITHUB_WORKSPACE }}
+        run: |
+          git clone https://github.com/Tooth-Hub/LLMoney.git LLMoney-bin
+          cp LLMoney-bin/LLMoney.dll build/output/plugins/
+        shell: bash
+
       - name: Upload LiteLoaderBDS
         uses: actions/[email protected]
         with:
@@ -145,6 +152,7 @@ jobs:
             ${{ github.workspace }}\build\output\LLPeEditor.exe
             ${{ github.workspace }}\build\output\LLPreLoader.dll
             ${{ github.workspace }}\build\output\LiteLoader.dll
+            ${{ github.workspace }}\build\output\plugins\LLMoney.dll
             ${{ github.workspace }}\build\output\plugins\lib\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
@@ -174,8 +182,9 @@ jobs:
           name: LiteLoader
           path: |
             ${{ github.workspace }}\build\output\LiteLoader.dll
-            ${{ github.workspace }}\build\output\plugins\lib\
+            ${{ github.workspace }}\build\output\plugins\lib\*.dll
             ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\
+            ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\
             ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe
 
       - name: Upload ScriptEngine
@@ -186,7 +195,8 @@ jobs:
             ${{ 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\7z\
+            ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar
+            ${{ github.workspace }}\build\output\plugins\lib\package.json
       
       - name: Upload LLParticle
         uses: actions/[email protected]

diff --git a/LiteLoader/src/liteloader/BStats.cpp b/LiteLoader/src/liteloader/BStats.cpp
@@ -12,6 +12,8 @@
 #include "llapi/mc/ServerPlayer.hpp"
 #include <Nlohmann/json.hpp>
 
+Logger bstatsLogger("bStats");
+
 #define BSTATS_JSON(key, val)                     \
     if (json.find(key) != json.end()) {           \
         const nlohmann::json& out = json.at(key); \
@@ -334,6 +336,7 @@ void scheduleThread() {
 void registerBStats() {
     configInit();
     if (bstatsSettings::enable) {
+        bstatsLogger.info(tr("ll.main.bstats.enabled"));
         Event::ServerStartedEvent::subscribe([](const Event::ServerStartedEvent& ev) {
             isOnlineAuth = Global<PropertiesSettings>->useOnlineAuthentication();
             scheduleThread();

diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp
@@ -342,6 +342,7 @@ bool Player::setNbt(CompoundTag* nbt) {
 #include "llapi/mc/Attribute.hpp"
 #include "llapi/mc/HashedString.hpp"
 #include "llapi/SendPacketAPI.h"
+#include <llapi/mc/CommandVersion.hpp>
 
 bool Player::refreshAttribute(class Attribute const& attribute) {
     return refreshAttributes({&attribute});
@@ -817,9 +818,11 @@ bool Player::sendBossEventPacket(BossEvent type, string name, float percent, Bos
     return true;
 }
 
+
 bool Player::sendCommandRequestPacket(const string& cmd) {
     auto packet = MinecraftPackets::createPacket(0x4d);
     dAccess<string, 48>(packet.get()) = cmd;
+    dAccess<int, 144>(packet.get()) = CommandVersion::CurrentVersion;
     ServerNetworkHandler* handler = Global<ServerNetworkHandler> + 16;
     handler->handle(*getNetworkIdentifier(), *((CommandRequestPacket*)packet.get()));
     return true;