Fix duplicate resource pack names

apple502j · Jan 31, 2024 · 4b62d37 · 4b62d37
1 parent 43ddf42
commit 4b62d37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java b/...-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
@@ -94,7 +94,8 @@ public static ModNioResourcePack create(String id, ModContainer mod, String subP
 
 		if (paths.isEmpty()) return null;
 
-		ModNioResourcePack ret = new ModNioResourcePack(id, mod, paths, type, activationType, modBundled);
+		String packId = subPath == null ? id : id + "_" + subPath;
+		ModNioResourcePack ret = new ModNioResourcePack(packId, mod, paths, type, activationType, modBundled);
 
 		return ret.getNamespaces(type).isEmpty() ? null : ret;
 	}

diff --git a/...der-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackCreator.java b/...der-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackCreator.java
@@ -122,7 +122,7 @@ private void registerModPack(Consumer<ResourcePackProfile> consumer, @Nullable S
 					? Text.translatable("pack.name.fabricMod", pack.getFabricModMetadata().getName())
 					: Text.translatable("pack.name.fabricMod.subPack", pack.getFabricModMetadata().getName(), Text.translatable("resourcePack." + subPath + ".name"));
 			ResourcePackProfile profile = ResourcePackProfile.create(
-					subPath == null ? pack.getName() : pack.getName() + "_" + subPath,
+					pack.getName(),
 					displayName,
 					subPath == null,
 					new ModResourcePackFactory(pack),