From d861f647d71d2c5a1d0460dbe643b74340dd1bc1 Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Fri, 9 Dec 2022 21:50:55 +0100
Subject: [PATCH] Fix BlockStateProvider not waiting for models before
 finishing. (#9196) Fixes #9195:

---
 .../client/model/generators/BlockStateProvider.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java
index 621cf28706..7807a11271 100644
--- a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java
+++ b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java
@@ -99,10 +99,10 @@ public abstract class BlockStateProvider implements DataProvider {
         itemModels().clear();
         registeredBlocks.clear();
         registerStatesAndModels();
-        models().generateAll(cache);
-        itemModels().generateAll(cache);
-        CompletableFuture<?>[] futures = new CompletableFuture<?>[this.registeredBlocks.size()];
+        CompletableFuture<?>[] futures = new CompletableFuture<?>[2 + this.registeredBlocks.size()];
         int i = 0;
+        futures[i++] = models().generateAll(cache);
+        futures[i++] = itemModels().generateAll(cache);
         for (Map.Entry<Block, IGeneratedBlockState> entry : registeredBlocks.entrySet()) {
             futures[i++] = saveBlockState(cache, entry.getValue().toJson(), entry.getKey());
         }