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

Return client resources even if no data pack found on server. Closes #6225 (Pull request)

Browse source 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2020-11-01 16:18:30 -05:00
parent 36f9c804d9
commit 7e79243bca
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,10 +116,17 @@ public class ModFileResourcePack extends ResourcePack
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }
catch (IOException e) catch (IOException e)
{
if (type == ResourcePackType.SERVER_DATA) //We still have to add the resource namespace if client resources exist, as we load langs (which are in assets) on server
{
return this.getResourceNamespaces(ResourcePackType.CLIENT_RESOURCES);
}
else
{ {
return Collections.emptySet(); return Collections.emptySet();
} }
} }
}
public InputStream getResourceStream(ResourcePackType type, ResourceLocation location) throws IOException { public InputStream getResourceStream(ResourcePackType type, ResourceLocation location) throws IOException {
if (location.getPath().startsWith("lang/")) { if (location.getPath().startsWith("lang/")) {