Don't break the ordering of ResourcePackProviders (#2784)

Fixes #1671.

(cherry picked from commit a91e48b70e)
This commit is contained in:
Technici4n 2022-12-23 16:00:37 +00:00 committed by modmuss50
parent 63b2489b25
commit 251d254ae1

View file

@ -16,7 +16,7 @@
package net.fabricmc.fabric.mixin.resource.loader;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import org.spongepowered.asm.mixin.Final;
@ -45,7 +45,8 @@ public abstract class ResourcePackManagerMixin<T extends ResourcePackProfile> {
@Inject(method = "<init>", at = @At("RETURN"))
public void construct(ResourcePackProfile.Factory arg, ResourcePackProvider[] resourcePackProviders, CallbackInfo info) {
providers = new HashSet<>(providers);
// Use a LinkedHashSet to preserve ordering
providers = new LinkedHashSet<>(providers);
// Search resource pack providers to find any server-related pack provider.
boolean shouldAddServerProvider = false;