- Fix enet path

- Fix noitapatcher path - Fix dependency-updater - Revert enet and noitapatcher path move
Ismoh · Feb 11, 2024 · 532d5da · 532d5da
1 parent 25c296e
commit 532d5da
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/dependency-updater.yml b/.github/workflows/dependency-updater.yml
@@ -96,7 +96,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           $noitaptacherPath = "${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\noitapatcher\noitapatcher.dll"
-          $noitaptacherDirectroyPath = "${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\noitapatcher"
+          $noitaptacherDirectroyPath = "${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\"
 
           if ([System.IO.File]::Exists($noitaptacherPath)) {
             $creationTime = (Get-Item $noitaptacherPath).CreationTime.ToString("yyyy-MM-ddThh:mm:ssZ")
@@ -129,9 +129,8 @@ jobs:
           $tagName | Out-File -FilePath ${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\noitapatcher.version
 
           Expand-Archive -Path "${{ github.workspace }}\temp\NoitaPatcher*.zip" -DestinationPath "${{ github.workspace }}\temp" -Force
-          ls -R "${{ github.workspace }}\temp"
           Copy-Item -Path "${{ github.workspace }}\temp\NoitaPatcher\*" -Destination $noitaptacherDirectroyPath -Recurse -Force
-          Copy-Item -Path "${{ github.workspace }}\temp\NoitaPatcher\noitapatcher\nsew\*" -Destination $noitaptacherDirectroyPath\nsew\ -Recurse -Force
+          Copy-Item -Path "${{ github.workspace }}\temp\NoitaPatcher\noitapatcher\nsew\*" -Destination $noitaptacherDirectroyPath\noitapatcher\nsew\ -Recurse -Force
           Copy-Item -Path "${{ github.workspace }}\temp\Modules\noitapatcher.lua" -Destination "${{ github.workspace }}\.debug\lua-definitions" -Force
           cd ${{ github.workspace }} # go back to root otherwise we cannot delete the temp folder
           Remove-Item -Path "${{ github.workspace }}\temp" -Recurse -Force

diff --git a/mods/noita-mp/files/scripts/init/init_.lua b/mods/noita-mp/files/scripts/init/init_.lua
@@ -25,7 +25,7 @@ local checkMandatoryDependencyMods = function(fileUtils, utils)
         error("Please install NoitaDearImGui mod: https://github.com/dextercd/Noita-Dear-ImGui/releases/tag/release-1.9.0", 2)
     end
     if not fileUtils:Exists(("%s\\lua_modules\\lib\\lua\\5.1\\noitapatcher.dll"):format(fileUtils:GetAbsoluteDirectoryPathOfNoitaMP())) then
-        error("Please install NoitaPatcher mod: https://github.com/dextercd/NoitaPatcher/releases/tag/release-1.10.1", 2)
+        error("Please install NoitaPatcher mod: https://github.com/dextercd/NoitaPatcher/releases/latest", 2)
     end
     -- if not FileUtils.Exists(("%s\\..\\nsew"):format(FileUtils.GetAbsoluteDirectoryPathOfNoitaMP())) then
     --     error("Please install NSEW mod: https://github.com/dextercd/Noita-Synchronise-Expansive-Worlds/releases/tag/release-0.0.5", 2)

diff --git a/...lua_modules/lib/lua/5.1/enet/enet-version → ...a-mp/lua_modules/lib/lua/5.1/enet-version b/...lua_modules/lib/lua/5.1/enet/enet-version → ...a-mp/lua_modules/lib/lua/5.1/enet-version
diff --git a/...-mp/lua_modules/lib/lua/5.1/enet/enet.dll → ...noita-mp/lua_modules/lib/lua/5.1/enet.dll b/...-mp/lua_modules/lib/lua/5.1/enet/enet.dll → ...noita-mp/lua_modules/lib/lua/5.1/enet.dll
diff --git a/...-mp/lua_modules/lib/lua/5.1/enet/enet.ilk → ...noita-mp/lua_modules/lib/lua/5.1/enet.ilk b/...-mp/lua_modules/lib/lua/5.1/enet/enet.ilk → ...noita-mp/lua_modules/lib/lua/5.1/enet.ilk
diff --git a/mods/noita-mp/lua_modules/lib/lua/5.1/enet/enet.exp b/mods/noita-mp/lua_modules/lib/lua/5.1/enet/enet.exp
diff --git a/mods/noita-mp/lua_modules/lib/lua/5.1/enet/enet.lib b/mods/noita-mp/lua_modules/lib/lua/5.1/enet/enet.lib
diff --git a/...modules/lib/lua/5.1/noitapatcher/load.lua → ...noita-mp/lua_modules/lib/lua/5.1/load.lua b/...modules/lib/lua/5.1/noitapatcher/load.lua → ...noita-mp/lua_modules/lib/lua/5.1/load.lua
diff --git a/...lib/lua/5.1/noitapatcher/noitapatcher.dll → .../lua_modules/lib/lua/5.1/noitapatcher.dll b/...lib/lua/5.1/noitapatcher/noitapatcher.dll → .../lua_modules/lib/lua/5.1/noitapatcher.dll
diff --git a/mods/noita-mp/lua_modules/lib/lua/5.1/noitapatcher.version b/mods/noita-mp/lua_modules/lib/lua/5.1/noitapatcher.version
@@ -0,0 +1 @@
+release-1.21.4
diff --git a/mods/noita-mp/lua_modules/lib/lua/5.1/noitapatcher/noitapatcher.version b/mods/noita-mp/lua_modules/lib/lua/5.1/noitapatcher/noitapatcher.version