From c578cae676da1c88389f588e7bf4c761dadad513 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 26 Jan 2019 16:55:57 -0500 Subject: [PATCH] Fix resource pack info generator - use the first modid as part of the pack prefix. Signed-off-by: cpw --- .../minecraftforge/fml/packs/ResourcePackLoader.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/packs/ResourcePackLoader.java b/src/main/java/net/minecraftforge/fml/packs/ResourcePackLoader.java index 8f5d4ab9b5..9250a06de8 100644 --- a/src/main/java/net/minecraftforge/fml/packs/ResourcePackLoader.java +++ b/src/main/java/net/minecraftforge/fml/packs/ResourcePackLoader.java @@ -24,6 +24,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.moddiscovery.ModFile; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.IOException; @@ -35,8 +37,11 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; +import static net.minecraftforge.fml.Logging.CORE; + public class ResourcePackLoader { + private static final Logger LOGGER = LogManager.getLogger(); private static Map modResourcePacks; private static ResourcePackList resourcePackList; @@ -69,9 +74,10 @@ public class ResourcePackLoader { for (Entry e : modResourcePacks.entrySet()) { - String name = "modfile/" + e.getKey().getFileName(); - final T packInfo = ResourcePackInfo.func_195793_a(name, true, () -> e.getValue(), factory, ResourcePackInfo.Priority.BOTTOM); + final String name = "mod:" + e.getKey().getModInfos().get(0).getModId(); + final T packInfo = ResourcePackInfo.func_195793_a(name, true, e::getValue, factory, ResourcePackInfo.Priority.BOTTOM); e.getValue().setPackInfo(packInfo); + LOGGER.debug(CORE, "Generating PackInfo named {} for mod file {}", name, e.getKey().getFilePath()); packList.put(name, packInfo); } }