1 files changed, 34 insertions, 0 deletions
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java
new file mode 100644
index 0000000..5c5cf3e
--- /dev/null
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java
@@ -0,0 +1,34 @@
+package moe.nea.firmament.mixins.custommodels;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import moe.nea.firmament.features.texturepack.CustomBlockTextures;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.client.resources.model.BlockStateModelLoader;
+import net.minecraft.server.packs.resources.Resource;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.resources.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.function.Function;
+
+@Mixin(BlockStateModelLoader.class)
+public class LoadExtraBlockStates {
+	@ModifyExpressionValue(method = "loadBlockStates", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
+	private static CompletableFuture<Map<ResourceLocation, List<Resource>>> loadExtraModels(
+		CompletableFuture<Map<ResourceLocation, List<Resource>>> x,
+		@Local(argsOnly = true) Executor executor,
+		@Local Function<ResourceLocation, StateDefinition<Block, BlockState>> stateManagers
+	) {
+		return x.thenCombineAsync(CustomBlockTextures.getPreparationFuture(), (original, extra) -> {
+			CustomBlockTextures.collectExtraBlockStateMaps(extra, original, stateManagers);
+			return original;
+		}, executor);
+	}
+}