From 68df1b7549052537dd1d2acfb8e560bb7a65c395 Mon Sep 17 00:00:00 2001 From: ShrBox Date: Sun, 25 Sep 2022 08:59:48 +0800 Subject: [PATCH 1/5] Update installation script --- README.md | 2 +- README_zh-cn.md | 2 +- scripts/install.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1e5b324c5..68013c3d0 100644 --- a/README.md +++ b/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 ``` diff --git a/README_zh-cn.md b/README_zh-cn.md index e69dbe242..e7290b70c 100644 --- a/README_zh-cn.md +++ b/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 ``` diff --git a/scripts/install.sh b/scripts/install.sh index 272e81aee..19dbe0b9a 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,8 +1,8 @@ #!/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-release.2" 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 From 51117ec72ca8af17fa6fc2b2ecc83dc931c4ce62 Mon Sep 17 00:00:00 2001 From: ShrBox Date: Sun, 25 Sep 2022 09:24:49 +0800 Subject: [PATCH 2/5] Fix installation script according to wine official documentation --- scripts/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 19dbe0b9a..007150ec6 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,8 +5,9 @@ BDSVER="1.19.30.04" LLVER="2.7.0-release.2" 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 From 41d5b45282739677e8f4c4f6563a24e68f905494 Mon Sep 17 00:00:00 2001 From: RimuruChan Date: Sun, 25 Sep 2022 10:05:49 +0800 Subject: [PATCH 3/5] Update SDK uploader --- .github/workflows/publish_release.yml | 2 +- scripts/UploadSDK.cmd | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index c5a469426..7d963cc1a 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -120,7 +120,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] diff --git a/scripts/UploadSDK.cmd b/scripts/UploadSDK.cmd index 6eaa5bf46..97ae0e888 100644 --- a/scripts/UploadSDK.cmd +++ b/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%" ) From 3d7dd07d71740c23bd5a8750fc66038e6e4a1a2e Mon Sep 17 00:00:00 2001 From: ShrBox Date: Sun, 25 Sep 2022 10:10:07 +0800 Subject: [PATCH 4/5] Update installation script because tag changed --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 007150ec6..02f7648e3 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ # Install wine codename=$(lsb_release -c --short) BDSVER="1.19.30.04" -LLVER="2.7.0-release.2" +LLVER="2.7.0" sudo apt install -y wget unzip sudo dpkg --add-architecture i386 sudo mkdir -pm755 /etc/apt/keyrings From 0e9ed792ed5de7415c69893a264ab3209d6c579b Mon Sep 17 00:00:00 2001 From: ShrBox Date: Sun, 25 Sep 2022 10:38:16 +0800 Subject: [PATCH 5/5] Fix PlayerInfoAPI.cpp --- LiteLoader/src/llapi/PlayerInfoAPI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LiteLoader/src/llapi/PlayerInfoAPI.cpp b/LiteLoader/src/llapi/PlayerInfoAPI.cpp index 0cfcc41af..cd58c72b0 100644 --- a/LiteLoader/src/llapi/PlayerInfoAPI.cpp +++ b/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}); } } }