Merge remote-tracking branch 'origin/1.16' into 1.18

Author: embeddedt

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -237,6 +237,15 @@ private boolean trustedResourcePack(PackResources pack) {
                 pack instanceof FilePackResources;
     }
 
+    /**
+     * Make a copy of the top-level model list and stream that to avoid CMEs if the getMaterials call triggers a model
+     * load.
+     */
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Collection;stream()Ljava/util/stream/Stream;", ordinal = 0))
+    private Stream<?> getModelStream(Collection<?> modelCollection) {
+        return new ArrayList<>(modelCollection).stream();
+    }
+
     @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;collect(Ljava/util/stream/Collector;)Ljava/lang/Object;", ordinal = 0))
     private Object collectExtraTextures(Stream<Material> instance, Collector<?, ?, ?> arCollector) {
         Set<Material> materialsSet = new ObjectOpenHashSet<>(instance.collect(Collectors.toSet()));

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -54,6 +54,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 /* high priority so that our injectors are added before other mods' */
 @Mixin(value = ModelBakery.class, priority = 600)
@@ -162,6 +163,15 @@ private void addTopLevelFile(ModelResourceLocation location, CallbackInfo ci) {
         }
     }
 
+    /**
+     * Make a copy of the top-level model list and stream that to avoid CMEs if the getMaterials call triggers a model
+     * load.
+     */
+    @Redirect(method = "processLoading", at = @At(value = "INVOKE", target = "Ljava/util/Collection;stream()Ljava/util/stream/Stream;", ordinal = 0), remap = false)
+    private Stream<?> getModelStream(Collection<?> modelCollection) {
+        return new ArrayList<>(modelCollection).stream();
+    }
+
     @Redirect(method = "processLoading", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;gatherFluidTextures(Ljava/util/Set;)V", remap = false), remap = false)
     private void gatherModelTextures(Set<Material> materialSet) {
         ForgeHooksClient.gatherFluidTextures(materialSet);