natty
/
plutoengine
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases 19 Wiki Activity

Fixed several resource filesystem bugs

This commit is contained in:
Natty 2022-04-06 23:55:49 +02:00
parent 8313c08034
commit c675729996
No known key found for this signature in database
GPG Key ID: 40AB22FA416C7019
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UPDATE_NOTES.md
View File

@ -1,3 +1,6 @@
## 22.0.0.0-alpha.7
* `[PlutoRuntime]` Fixed several resource filesystem bugs
## 22.0.0.0-alpha.6 ## 22.0.0.0-alpha.6
* `[PlutoSpritesheet]` Added a constructor to `PartialTextureSprite` that initializes the spritesheet to `null` * `[PlutoSpritesheet]` Added a constructor to `PartialTextureSprite` that initializes the spritesheet to `null`

2
buildSrc/src/main/kotlin/org/plutoengine/Versions.kt
View File

@ -22,7 +22,7 @@ object Versions {
const val isPrerelease = true const val isPrerelease = true
const val prereleaseName = "alpha" const val prereleaseName = "alpha"
const val prerealeaseUpdate = 6 const val prerealeaseUpdate = 7
val versionFull = val versionFull =
if (isPrerelease) if (isPrerelease)

9
engine-core/plutoruntime/src/main/java/org/plutoengine/resource/filesystem/ResourceFileSystemProvider.java
View File

@ -156,7 +156,14 @@ public class ResourceFileSystemProvider extends FileSystemProvider
@Override @Override
public AsynchronousFileChannel newAsynchronousFileChannel(Path path, Set<? extends OpenOption> options, ExecutorService executor, FileAttribute<?>... attrs) throws IOException public AsynchronousFileChannel newAsynchronousFileChannel(Path path, Set<? extends OpenOption> options, ExecutorService executor, FileAttribute<?>... attrs) throws IOException
{ {
return super.newAsynchronousFileChannel(path, options, executor, attrs); if (!(path instanceof ResourcePath rp))
throw new IllegalArgumentException("Expected a path of type %s!".formatted(ResourcePath.class));
var backingPath = rp.getBackingPath();
var backingFileSystem = backingPath.getFileSystem();
var backingProvider = backingFileSystem.provider();
return backingProvider.newAsynchronousFileChannel(backingPath, options, executor, attrs);
} }
@Override @Override

5
engine-core/plutoruntime/src/main/java/org/plutoengine/resource/filesystem/ResourceManager.java
View File

@ -6,6 +6,7 @@ import org.plutoengine.mod.Mod;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.ProviderNotFoundException; import java.nio.file.ProviderNotFoundException;
import java.nio.file.spi.FileSystemProvider; import java.nio.file.spi.FileSystemProvider;
@ -30,9 +31,7 @@ public class ResourceManager implements Closeable
{ {
try try
{ {
var loader = ServiceLoader.load(FileSystemProvider.class, ResourceFileSystemProvider.class.getClassLoader()); for (FileSystemProvider provider : FileSystemProvider.installedProviders())
for (FileSystemProvider provider : loader)
{ {
if (provider.getScheme().equals(URI_SCHEME)) if (provider.getScheme().equals(URI_SCHEME))
{ {