diff --git a/patches/minecraft/net/minecraft/client/particle/BreakingItemParticle.java.patch b/patches/minecraft/net/minecraft/client/particle/BreakingItemParticle.java.patch new file mode 100644 index 0000000000..0357c21112 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/particle/BreakingItemParticle.java.patch @@ -0,0 +1,12 @@ +--- a/net/minecraft/client/particle/BreakingItemParticle.java ++++ b/net/minecraft/client/particle/BreakingItemParticle.java +@@ -31,7 +_,8 @@ + + protected BreakingItemParticle(ClientLevel p_105665_, double p_105666_, double p_105667_, double p_105668_, ItemStack p_105669_) { + super(p_105665_, p_105666_, p_105667_, p_105668_, 0.0D, 0.0D, 0.0D); +- this.m_108337_(Minecraft.m_91087_().m_91291_().m_174264_(p_105669_, p_105665_, (LivingEntity)null, 0).m_6160_()); ++ var model = Minecraft.m_91087_().m_91291_().m_174264_(p_105669_, p_105665_, (LivingEntity)null, 0); ++ this.m_108337_(model.m_7343_().m_173464_(model, p_105669_, p_105665_, null, 0).getParticleIcon(net.minecraftforge.client.model.data.EmptyModelData.INSTANCE)); + this.f_107226_ = 1.0F; + this.f_107663_ /= 2.0F; + this.f_105643_ = this.f_107223_.nextFloat() * 3.0F; diff --git a/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java b/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java index c1a0dc4d8d..2d872ea25c 100644 --- a/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java +++ b/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java @@ -48,8 +48,11 @@ import net.minecraftforge.client.model.generators.ModelBuilder; import net.minecraftforge.fml.ModList; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import net.minecraftforge.forgespi.language.IModFileInfo; +import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.resource.PathResourcePack; +import net.minecraftforge.resource.ResourcePackLoader; +import javax.annotation.Nonnull; import javax.annotation.Nullable; /** @@ -127,7 +130,7 @@ public class ExistingFileHelper { for (String existingMod : existingMods) { IModFileInfo modFileInfo = ModList.get().getModFileById(existingMod); if (modFileInfo != null) { - PackResources pack = new PathResourcePack(modFileInfo.getFile().getFileName(), modFileInfo.getFile().findResource("")); + PackResources pack = ResourcePackLoader.createPackForMod(modFileInfo); this.clientResources.add(pack); this.serverData.add(pack); } diff --git a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java index 9a99d95646..f5d040fcf4 100644 --- a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java +++ b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java @@ -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 modResourcePacks; @@ -60,11 +64,25 @@ public class ResourcePackLoader { public static void loadResourcePacks(PackRepository resourcePacks, Function, ? 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 getPackNames() { return ModList.get().applyForEachModFile(mf->"mod:"+mf.getModInfos().get(0).getModId()).filter(n->!n.equals("mod:minecraft")).collect(Collectors.toList()); }