ACZ fixes #1573
Merged
ACZ fixes #1573
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The JSON path is relative to the original working directory of the file. However the server switches working directory during initialization of DreamResourceManager, which invalidates the old path. This old path was still passed to ACZ, so using a relative JSON path would make ACZ unable to find rsc files. The path is now turned absolute before the working directory switch occurs.
This permits rsc resources to be combined with the Content.Client.zip Hybrid ACZ. Also update RT
wixoaGit
requested changes
Dec 28, 2023
wixoaGit
approved these changes
Dec 28, 2023
wixoaGit
added a commit
to wixoaGit/OpenDreamFork
that referenced
this pull request
Dec 28, 2023
This reverts commit 173ca01.
wixoaGit
added a commit
that referenced
this pull request
Dec 28, 2023
wixoaGit
pushed a commit
to wixoaGit/OpenDreamFork
that referenced
this pull request
Dec 30, 2023
* Fix packaging * Fix ACZ root path being wrong if using relative JSON path The JSON path is relative to the original working directory of the file. However the server switches working directory during initialization of DreamResourceManager, which invalidates the old path. This old path was still passed to ACZ, so using a relative JSON path would make ACZ unable to find rsc files. The path is now turned absolute before the working directory switch occurs. * Add Full Hybrid ACZ provider. This permits rsc resources to be combined with the Content.Client.zip Hybrid ACZ. Also update RT * Update OpenDreamPackaging/DreamPackaging.cs --------- Co-authored-by: wixoa <[email protected]> (cherry picked from commit 173ca01)
wixoaGit
added a commit
that referenced
this pull request
Dec 30, 2023
* ACZ fixes (#1573) * Fix packaging * Fix ACZ root path being wrong if using relative JSON path The JSON path is relative to the original working directory of the file. However the server switches working directory during initialization of DreamResourceManager, which invalidates the old path. This old path was still passed to ACZ, so using a relative JSON path would make ACZ unable to find rsc files. The path is now turned absolute before the working directory switch occurs. * Add Full Hybrid ACZ provider. This permits rsc resources to be combined with the Content.Client.zip Hybrid ACZ. Also update RT * Update OpenDreamPackaging/DreamPackaging.cs --------- Co-authored-by: wixoa <[email protected]> (cherry picked from commit 173ca01) * Update RT to v198.1.0 * Use file-scoped namespaces --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.