From fb730fa1a6683502efda48882acd438543016b74 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Sun, 6 Jul 2025 20:38:15 +0200
Subject: feat: allow block states to be used for custom block models

---
 .../mixins/custommodels/LoadExtraBlockStates.java  | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java')

diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java
index d7ea2a5..c33fd04 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java
@@ -1,4 +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.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.model.BlockStatesLoader;
+import net.minecraft.resource.Resource;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.Identifier;
+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(BlockStatesLoader.class)
 public class LoadExtraBlockStates {
+	@ModifyExpressionValue(method = "load", 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<Identifier, List<Resource>>> loadExtraModels(
+		CompletableFuture<Map<Identifier, List<Resource>>> x,
+		@Local(argsOnly = true) Executor executor,
+		@Local Function<Identifier, StateManager<Block, BlockState>> stateManagers
+	) {
+		return x.thenCombineAsync(CustomBlockTextures.getPreparationFuture(), (original, extra) -> {
+			CustomBlockTextures.collectExtraBlockStateMaps(extra, original, stateManagers);
+			return original;
+		}, executor);
+	}
 }
-- 
cgit