From 7e79243bcad325fa3cd86e11dfab1374b79913c5 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 1 Nov 2020 16:18:30 -0500 Subject: [PATCH] Return client resources even if no data pack found on server. Closes #6225 (Pull request) Signed-off-by: cpw --- .../minecraftforge/fml/packs/ModFileResourcePack.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java index 8ade7bba5..50a6b237a 100644 --- a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java @@ -117,7 +117,14 @@ public class ModFileResourcePack extends ResourcePack } catch (IOException e) { - return Collections.emptySet(); + 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(); + } } }