Fix resource loading issues

Null references had struck again!

(cherry picked from commit 56a55bc)

src/client/java/io/github/startsmercury/visual_snowy_leaves/impl/client/util/SequencedCompletableFuture.java

@@ -0,0 +1,49 @@
+package io.github.startsmercury.visual_snowy_leaves.impl.client.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.function.IntFunction;
+
+public final class SequencedCompletableFuture {
+    public static <T> CompletableFuture<List<T>> tryFilter(
+        final Collection<? extends CompletableFuture<? extends T>> actions,
+        final Consumer<? super Throwable> catcher
+    ) {
+        return tryFilter(actions, ArrayList::new, catcher);
+    }
+
+    public static <C extends Collection<T>, T> CompletableFuture<C> tryFilter(
+        final Collection<? extends CompletableFuture<? extends T>> actions,
+        final IntFunction<C> collectionProvider,
+        final Consumer<? super Throwable> catcher
+    ) {
+        final C collection;
+        final CompletableFuture<?>[] buffer;
+
+        {
+            final var n = actions.size();
+            collection = collectionProvider.apply(n);
+            buffer = new CompletableFuture[n];
+        }
+
+        var idx = 0;
+        for (final var action : actions) {
+            buffer[idx++] = action.handle((result, throwable) -> {
+                if (throwable != null) {
+                    catcher.accept(throwable);
+                } else {
+                    collection.add(result);
+                }
+
+                return (Void) null;
+            });
+        }
+
+        return CompletableFuture.allOf(buffer).thenApply(x -> collection);
+    }
+
+    private SequencedCompletableFuture() {}
+}

src/client/java/io/github/startsmercury/visual_snowy_leaves/impl/client/util/UnknownBlockStateDefinitionException.java

@@ -0,0 +1,17 @@
+package io.github.startsmercury.visual_snowy_leaves.impl.client.util;
+
+import net.minecraft.resources.ResourceLocation;
+
+public class UnknownBlockStateDefinitionException extends RuntimeException {
+    private final ResourceLocation resourceLocation;
+
+    public UnknownBlockStateDefinitionException(final ResourceLocation resourceLocation) {
+        super(resourceLocation.toString());
+
+        this.resourceLocation = resourceLocation;
+    }
+
+    public ResourceLocation getResourceLocation() {
+        return this.resourceLocation;
+    }
+}

src/client/java/io/github/startsmercury/visual_snowy_leaves/mixin/client/tint/ModelManagerMixin.java

@@ -5,7 +5,8 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.startsmercury.visual_snowy_leaves.impl.client.SpriteWhitener;
 import io.github.startsmercury.visual_snowy_leaves.impl.client.VslConstants;
-import net.minecraft.Util;
+import io.github.startsmercury.visual_snowy_leaves.impl.client.util.SequencedCompletableFuture;
+import io.github.startsmercury.visual_snowy_leaves.impl.client.util.UnknownBlockStateDefinitionException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.block.model.BlockModelDefinition;
@@ -25,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
@@ -74,12 +76,7 @@ private CompletableFuture<Void> modifySprites(
                     final var stateDefinition = function.apply(resourceLocation);
 
                     if (stateDefinition == null) {
-                        logger.debug(
-                            "[{}] Discovered unknown block state definition {}, ignoring",
-                            VslConstants.NAME,
-                            resourceLocation
-                        );
-                        return null;
+                        throw new UnknownBlockStateDefinitionException(resourceLocation);
                     }
 
                     final var resources = entry.getValue();
@@ -106,7 +103,22 @@ private CompletableFuture<Void> modifySprites(
                 }, executor));
             }
 
-            return Util.sequence(list);
+            return SequencedCompletableFuture.tryFilter(list, throwable -> {
+                if (throwable instanceof CompletionException) {
+                    throwable = throwable.getCause();
+                }
+                if (throwable instanceof final Error error) {
+                    throw error;
+                } else if (throwable instanceof final UnknownBlockStateDefinitionException cause) {
+                    logger.debug(
+                        "[{}] Discovered unknown block state definition {}, ignoring",
+                        VslConstants.NAME,
+                        cause.getResourceLocation()
+                    );
+                } else {
+                    logger.error("[{}] Uncaught exception", VslConstants.NAME, throwable);
+                }
+            });
         });
 
         final var spriteWhitenerFuture = modelDiscoveryFuture.thenCompose(modelDiscovery -> {