Merge branch 'main' of https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player

MusicLyrics.lua

@@ -207,9 +207,9 @@ local function displayLyrics(url, notzh, fontType, colorsConfig)
     -- 选择字体
     local fontUrl
     if fontType == "12px" then
-        fontUrl = "https://alist.liulikeji.cn/d/HFS/fusion-pixel-12px-proportional-zh_hans.lua"
+        fontUrl = "https://git.liulikeji.cn/xingluo/ComputerCraft-Utf8/raw/branch/main/fonts/fusion-pixel-12px-proportional-zh_hans.lua"
     else
-        fontUrl = "https://alist.liulikeji.cn/d/HFS/fusion-pixel-8px-proportional-zh_hans.lua"
+        fontUrl = "https://git.liulikeji.cn/xingluo/ComputerCraft-Utf8/raw/branch/main/fonts/fusion-pixel-8px-proportional-zh_hans.lua"
     end
     
     local font = loadRemoteFont(fontUrl)

README.md

@@ -17,7 +17,7 @@
 在 Minecraft 中安装好 [ComputerCraft](https://www.mcmod.cn/class/1681.html) 模组后在电脑终端：
 
 ```bash
-wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/releases/download/v1.1.0/music168.lua
+wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/main/music168.lua
 ```
 
 运行：

music168.lua

@@ -2,9 +2,9 @@
 --*获取程序所在目录
 
 local mypath = "/"..fs.getDir(shell.getRunningProgram())
-if not fs.exists(mypath.."/lib/basalt.lua") then shell.run("wget https://git.liulikeji.cn/GitHub/Basalt/releases/download/v1.6.3/basalt.lua lib/basalt.lua") end
-if not fs.exists(mypath.."/speakerlib.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/1.1.0/speakerlib.lua") end
-if not fs.exists(mypath.."/MusicLyrics.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/1.1.0/MusicLyrics.lua") end
+if not fs.exists(mypath.."/lib/basalt.lua") then shell.run("wget https://git.liulikeji.cn/GitHub/Basalt/releases/download/v1.6.6/basalt.lua lib/basalt.lua") end
+if not fs.exists(mypath.."/speakerlib.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/main/speakerlib.lua") end
+if not fs.exists(mypath.."/MusicLyrics.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/main/MusicLyrics.lua") end
 
 --*GUI库导入
 basalt = require(mypath.."/lib/basalt")
@@ -164,7 +164,7 @@ function playmusic(music_name,music_id,play_table,index)
     --end)
 end
 
-printUtf8 = load(http.get("https://alist.liulikeji.cn/d/HFS/utf8ptrint.lua").readAll())()
+printUtf8 = load(http.get("https://git.liulikeji.cn/xingluo/ComputerCraft-Utf8/raw/branch/main/utf8ptrint.lua").readAll())()
 --搜索
 server_url = "http://music168.liulikeji.cn:15843/"
 function Search(input_str,GUI_in,api)
@@ -335,7 +335,7 @@ function speakerp()
             sleep(0.1)
 
             --dfpwmURL = http.post("http://gmapi.liulikeji.cn:15842/dfpwm",textutils.serialiseJSON({ ["url"] = GetmusicUrl(_G.music168_music_id) } ))
-            shell.run(mypath.."/speakerlib play "..GetmusicUrl(_G.music168_music_id))
+            shell.run(mypath.."/speakerlib.lua play "..GetmusicUrl(_G.music168_music_id))
             -- 检查是否播放完成自动跳转下一首
             if _G.music168_playopen then
                 play_set_0()