Fix mod resources not loading.

Add BreakingItemParticle.java.patch which I forgot to commit during the porting.
This commit is contained in:
gigaherz committed 2021-11-30 21:44:35 +01:00
1 parent 40a174310d
commit 5b6d54555e
3 files changed
+35 -2

No files matched your search

@@ -19,6 +19,7 @@
package net.minecraftforge.resource;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
@@ -43,6 +44,9 @@ import net.minecraftforge.fml.ModList;
import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.resource.PathResourcePack;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
public class ResourcePackLoader {
private static Map<IModFile, PathResourcePack> modResourcePacks;
@@ -60,11 +64,25 @@ public class ResourcePackLoader {
public static void loadResourcePacks(PackRepository resourcePacks, Function<Map<IModFile, ? extends PathResourcePack>, ? extends RepositorySource> packFinder) {
modResourcePacks = ModList.get().getModFiles().stream()
.filter(mf->mf.requiredLanguageLoaders().stream().noneMatch(ls->ls.languageName().equals("minecraft")))
.map(mf -> Pair.of(mf, new PathResourcePack(mf.getFile().getFileName(), mf.getFile().getFilePath())))
.map(mf -> Pair.of(mf, createPackForMod(mf)))
.collect(Collectors.toMap(p -> p.getFirst().getFile(), Pair::getSecond, (u,v) -> { throw new IllegalStateException(String.format("Duplicate key %s", u)); }, LinkedHashMap::new));
resourcePacks.addPackFinder(packFinder.apply(modResourcePacks));
}
@NotNull
public static PathResourcePack createPackForMod(IModFileInfo mf)
{
return new PathResourcePack(mf.getFile().getFileName(), mf.getFile().getFilePath()){
final IModFile modFile = mf.getFile();
@Nonnull
@Override
protected Path resolve(@Nonnull String... paths)
{
return modFile.findResource(paths);
}
};
}
public static List<String> getPackNames() {
return ModList.get().applyForEachModFile(mf->"mod:"+mf.getModInfos().get(0).getModId()).filter(n->!n.equals("mod:minecraft")).collect(Collectors.toList());
}