keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix 5408 by making Paths from the default provider (not inside jars)

Browse source 
offer a FileInputStream rather than Files.newInputStream. Fun. Stupid
ancient paulscode.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-01-28 20:37:08 -05:00
parent b40e2cc59e
commit 9fbfe2b98e
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java
View file

@ -19,6 +19,7 @@
package net.minecraftforge.fml.packs; package net.minecraftforge.fml.packs;
import it.unimi.dsi.fastutil.io.FastByteArrayInputStream;
import net.minecraft.resources.AbstractResourcePack; import net.minecraft.resources.AbstractResourcePack;
import net.minecraft.resources.ResourcePackInfo; import net.minecraft.resources.ResourcePackInfo;
import net.minecraft.resources.ResourcePackType; import net.minecraft.resources.ResourcePackType;
@ -26,11 +27,13 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Files; import java.nio.channels.ByteChannel;
import java.nio.file.Path; import java.nio.channels.Channels;
import java.nio.file.Paths; import java.nio.channels.SeekableByteChannel;
import java.nio.file.*;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
@ -64,7 +67,16 @@ public class ModFileResourcePack extends AbstractResourcePack
@Override @Override
protected InputStream getInputStream(String name) throws IOException protected InputStream getInputStream(String name) throws IOException
{ {
return Files.newInputStream(modFile.getLocator().findPath(modFile, name)); // because paulscode is ancient, we can't return FileChannel based InputStreams here - it will cause a deadlock or crash
// Paulscode sends interrupt() to trigger thread processing behaviour, and FileChannels will interpret that interrupt() as
// a sign to close the FileChannel and throw an interrupt error. Tis brilliant!
// If the Path comes from the default filesystem provider, we will rather use the path to generate an old FileInputStream
final Path path = modFile.getLocator().findPath(modFile, name);
if (path.getFileSystem() == FileSystems.getDefault()) {
return new FileInputStream(path.toFile());
} else {
return Files.newInputStream(path, StandardOpenOption.READ);
}
} }
@Override @Override