Merge pull request #840 from LiteLDev/develop

.github/workflows/publish_release.yml

@@ -121,7 +121,7 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           cd scripts
-          ./UploadSDK.cmd action
+          ./UploadSDK.cmd action release
         env:
           REPO_KEY: ${{secrets.PUSH_TOKEN}}
           USERNAME: github-actions[bot]

LiteLoader/src/llapi/PlayerInfoAPI.cpp

@@ -71,7 +71,7 @@ bool insert(std::string name, std::string xuid, std::string uuid) {
     if (!info.has_value()) {
         try {
             data.push_back({name, xuid, uuid});
-            db << "insert into player (NAME, XUID, UUID) values(?,?,?)", DB::use(DB::Row{name, xuid, uuid});
+            db << "insert into player_new (NAME, XUID, UUID) values(?,?,?)", DB::use(DB::Row{name, xuid, uuid});
         } catch (const std::exception& e) {
             ll::logger.error("PlayerDB Error: {}", e.what());
             return false;
@@ -83,7 +83,7 @@ bool insert(std::string name, std::string xuid, std::string uuid) {
                     if (it.name != name || it.uuid != uuid) {
                         it.name = name;
                         it.uuid = uuid;
-                        db << "update player set NAME = ?, UUID = ? where XUID = ?", DB::use(DB::Row{name, uuid, xuid});
+                        db << "update player_new set NAME = ?, UUID = ? where XUID = ?", DB::use(DB::Row{name, uuid, xuid});
                     }
                 }
             }

README.md

@@ -131,7 +131,7 @@ We do not recommend you to use Wine due to BDS 1.19.20+ on Wine has a performanc
 #### Installation script(Ubuntu)
 
 ```
-wget https://github.com/LiteLDev/LiteLoaderBDS/raw/beta/scripts/install.sh
+wget https://github.com/LiteLDev/LiteLoaderBDS/raw/develop/scripts/install.sh
 chmod +x install.sh
 ./install.sh
 ```

README_zh-cn.md

@@ -123,7 +123,7 @@ mc.listen("onServerStarted", () => {
 #### 安装脚本(Ubuntu)
 
 ```
-wget https://github.com/LiteLDev/LiteLoaderBDS/raw/beta/scripts/install.sh
+wget https://github.com/LiteLDev/LiteLoaderBDS/raw/develop/scripts/install.sh
 chmod +x install.sh
 ./install.sh
 ```

scripts/UploadSDK.cmd

@@ -65,7 +65,9 @@ if "%LL_SDK_NOW_STATUS%" neq "" (
     git add .
     if "%LL_SDK_NOW_BRANCH%" == "main" (
         git commit -m "From LiteLoader %LL_NOW_TAG%"
-        git tag %LL_NOW_TAG%
+        if [%2] == [release] (
+            git tag %LL_NOW_TAG%
+        )
     ) else (
         git commit -m "From LiteLoader %LL_NOW_TAG_LONG%"
     )

scripts/install.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 # Install wine
 codename=$(lsb_release -c --short)
-BDSVER="1.19.22.01"
-LLVER="2.6.2"
+BDSVER="1.19.30.04"
+LLVER="2.7.0"
 sudo apt install -y wget unzip
 sudo dpkg --add-architecture i386
-sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
-sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/${codename}/winehq-${codename}.sources
+sudo mkdir -pm755 /etc/apt/keyrings
+sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/${codename}/winehq-${codename}.sources
 sudo apt update
 sudo apt install winehq-stable -y