From 72044baeff7da702a66b99afa084f3fe9ab7bbc2 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Wed, 9 Apr 2025 16:41:58 +0200 Subject: fix: Fix (some) parts of custom block rendering. --- .../custommodels/BuildExtraBlockStateModels.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/texturePacks/java/moe/nea/firmament/mixins/custommodels/BuildExtraBlockStateModels.java (limited to 'src/texturePacks/java/moe/nea/firmament/mixins/custommodels/BuildExtraBlockStateModels.java') diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/BuildExtraBlockStateModels.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/BuildExtraBlockStateModels.java new file mode 100644 index 0000000..6b3c929 --- /dev/null +++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/BuildExtraBlockStateModels.java @@ -0,0 +1,24 @@ +package moe.nea.firmament.mixins.custommodels; + +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import com.llamalad7.mixinextras.sugar.Local; +import moe.nea.firmament.features.texturepack.CustomBlockTextures; +import net.minecraft.client.render.model.Baker; +import net.minecraft.client.render.model.ModelBaker; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +@Mixin(ModelBaker.class) +public class BuildExtraBlockStateModels { + @ModifyReturnValue(method = "bake", at = @At("RETURN")) + private CompletableFuture injectMoreBlockModels(CompletableFuture original, @Local ModelBaker.BakerImpl baker, @Local(argsOnly = true) Executor executor) { + Baker b = baker; + return original.thenCombine( + CustomBlockTextures.createBakedModels(b, executor), + (a, _void) -> a + ); + } +} -- cgit