Fix injected resources not overriding certain vanilla resources (1.20) (#3164)

* Fix injected resources not overriding certain vanilla resources

* Adjust comment

* Add test blocks for High Contrast pack, too

* Fix `GroupResourcePack`

* Deduplicate logic between `GroupResourcePack` and `FabricWrappedVanillaResourcePack`

* Fix checkstyle

* Delete gravel texture override, change dirt to diamond block

fabric-resource-loader-v0/src/client/java/net/fabricmc/fabric/impl/client/resource/loader/FabricWrappedVanillaResourcePack.java

@@ -19,7 +19,7 @@ package net.fabricmc.fabric.impl.client.resource.loader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Stream;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -27,8 +27,6 @@ import net.minecraft.resource.AbstractFileResourcePack;
 import net.minecraft.resource.InputSupplier;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.resource.metadata.ResourceMetadataReader;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.PathUtil;
 
 import net.fabricmc.fabric.api.resource.ModResourcePack;
 import net.fabricmc.fabric.impl.resource.loader.GroupResourcePack;
@@ -36,48 +34,21 @@ import net.fabricmc.fabric.impl.resource.loader.GroupResourcePack;
 /**
  * Represents a vanilla built-in resource pack with support for modded content.
  *
- * <p>Vanilla resources are provided as usual through the original resource pack,
+ * <p>Vanilla resources are provided as usual through the original resource pack (if not overridden),
  * all other resources will be searched for in the provided modded resource packs.</p>
  */
 public class FabricWrappedVanillaResourcePack extends GroupResourcePack {
 	private final AbstractFileResourcePack originalResourcePack;
 
 	public FabricWrappedVanillaResourcePack(AbstractFileResourcePack originalResourcePack, List<ModResourcePack> modResourcePacks) {
-		super(ResourceType.CLIENT_RESOURCES, modResourcePacks);
+		// Mod resource packs have higher priority, add them last (so vanilla assets can be overridden)
+		super(ResourceType.CLIENT_RESOURCES, Stream.concat(Stream.of(originalResourcePack), modResourcePacks.stream()).toList());
 		this.originalResourcePack = originalResourcePack;
 	}
 
 	@Override
 	public InputSupplier<InputStream> openRoot(String... pathSegments) {
-		PathUtil.validatePath(pathSegments);
-
-		return this.originalResourcePack.openRoot(String.join("/", pathSegments));
-	}
-
-	@Override
-	public InputSupplier<InputStream> open(ResourceType type, Identifier id) {
-		InputSupplier<InputStream> originalPackData = this.originalResourcePack.open(type, id);
-
-		if (originalPackData != null) {
-			return originalPackData;
-		}
-
-		return super.open(type, id);
-	}
-
-	@Override
-	public void findResources(ResourceType type, String namespace, String prefix, ResultConsumer consumer) {
-		super.findResources(type, namespace, prefix, consumer);
-		this.originalResourcePack.findResources(type, namespace, prefix, consumer);
-	}
-
-	@Override
-	public Set<String> getNamespaces(ResourceType type) {
-		Set<String> namespaces = this.originalResourcePack.getNamespaces(type);
-
-		namespaces.addAll(super.getNamespaces(type));
-
-		return namespaces;
+		return this.originalResourcePack.openRoot(pathSegments);
 	}
 
 	@Override
@@ -89,10 +60,4 @@ public class FabricWrappedVanillaResourcePack extends GroupResourcePack {
 	public String getName() {
 		return this.originalResourcePack.getName();
 	}
-
-	@Override
-	public void close() {
-		this.originalResourcePack.close();
-		super.close();
-	}
 }

fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/GroupResourcePack.java

@@ -33,17 +33,15 @@ import net.minecraft.resource.ResourceType;
 import net.minecraft.resource.metadata.ResourceMetadata;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.api.resource.ModResourcePack;
-
 /**
  * Represents a group resource pack, holds multiple resource packs as one.
  */
 public abstract class GroupResourcePack implements ResourcePack {
 	protected final ResourceType type;
-	protected final List<ModResourcePack> packs;
-	protected final Map<String, List<ModResourcePack>> namespacedPacks = new Object2ObjectOpenHashMap<>();
+	protected final List<? extends ResourcePack> packs;
+	protected final Map<String, List<ResourcePack>> namespacedPacks = new Object2ObjectOpenHashMap<>();
 
-	public GroupResourcePack(ResourceType type, List<ModResourcePack> packs) {
+	public GroupResourcePack(ResourceType type, List<? extends ResourcePack> packs) {
 		this.type = type;
 		this.packs = packs;
 		this.packs.forEach(pack -> pack.getNamespaces(this.type)
@@ -53,9 +51,10 @@ public abstract class GroupResourcePack implements ResourcePack {
 
 	@Override
 	public InputSupplier<InputStream> open(ResourceType type, Identifier id) {
-		List<ModResourcePack> packs = this.namespacedPacks.get(id.getNamespace());
+		List<? extends ResourcePack> packs = this.namespacedPacks.get(id.getNamespace());
 
 		if (packs != null) {
+			// Last to first, since higher priority packs are at the end
 			for (int i = packs.size() - 1; i >= 0; i--) {
 				ResourcePack pack = packs.get(i);
 				InputSupplier<InputStream> supplier = pack.open(type, id);
@@ -71,15 +70,14 @@ public abstract class GroupResourcePack implements ResourcePack {
 
 	@Override
 	public void findResources(ResourceType type, String namespace, String prefix, ResultConsumer consumer) {
-		List<ModResourcePack> packs = this.namespacedPacks.get(namespace);
+		List<? extends ResourcePack> packs = this.namespacedPacks.get(namespace);
 
 		if (packs == null) {
 			return;
 		}
 
-		for (int i = packs.size() - 1; i >= 0; i--) {
-			ResourcePack pack = packs.get(i);
-
+		// First to last, since later calls override previously returned data
+		for (ResourcePack pack : packs) {
 			pack.findResources(type, namespace, prefix, consumer);
 		}
 	}
@@ -90,7 +88,7 @@ public abstract class GroupResourcePack implements ResourcePack {
 	}
 
 	public void appendResources(ResourceType type, Identifier id, List<Resource> resources) {
-		List<ModResourcePack> packs = this.namespacedPacks.get(id.getNamespace());
+		List<? extends ResourcePack> packs = this.namespacedPacks.get(id.getNamespace());
 
 		if (packs == null) {
 			return;
@@ -98,7 +96,9 @@ public abstract class GroupResourcePack implements ResourcePack {
 
 		Identifier metadataId = NamespaceResourceManager.getMetadataPath(id);
 
-		for (ModResourcePack pack : packs) {
+		// Last to first, since higher priority packs are at the end
+		for (int i = packs.size() - 1; i >= 0; i--) {
+			ResourcePack pack = packs.get(i);
 			InputSupplier<InputStream> supplier = pack.open(type, id);
 
 			if (supplier != null) {