1 files changed, 23 insertions, 24 deletions
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockRenderManagerBlockModel.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockRenderManagerBlockModel.java
index 711b2af..8d2ba38 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockRenderManagerBlockModel.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockRenderManagerBlockModel.java
@@ -5,34 +5,33 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.features.texturepack.CustomBlockTextures;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.render.block.BlockModels;
 import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.chunk.SectionBuilder;
+import net.minecraft.client.render.model.BlockStateModel;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(BlockRenderManager.class)
+@Mixin(SectionBuilder.class)
 public class ReplaceBlockRenderManagerBlockModel {
-    @WrapOperation(method = "renderBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockRenderManager;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BakedModel;"))
-    private BakedModel replaceModelInRenderBlock(
-        BlockRenderManager instance, BlockState state, Operation<BakedModel> original, @Local(argsOnly = true) BlockPos pos) {
-        var replacement = CustomBlockTextures.getReplacementModel(state, pos);
-        if (replacement != null) return replacement;
-        CustomBlockTextures.enterFallbackCall();
-        var fallback = original.call(instance, state);
-        CustomBlockTextures.exitFallbackCall();
-        return fallback;
-    }
-
-    @WrapOperation(method = "renderDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BakedModel;"))
-    private BakedModel replaceModelInRenderDamage(
-        BlockModels instance, BlockState state, Operation<BakedModel> original, @Local(argsOnly = true) BlockPos pos) {
-        var replacement = CustomBlockTextures.getReplacementModel(state, pos);
-        if (replacement != null) return replacement;
-        CustomBlockTextures.enterFallbackCall();
-        var fallback = original.call(instance, state);
-        CustomBlockTextures.exitFallbackCall();
-        return fallback;
-    }
+	@WrapOperation(method = "build", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockRenderManager;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BlockStateModel;"))
+	private BlockStateModel replaceModelInRenderBlock(BlockRenderManager instance, BlockState state, Operation<BlockStateModel> original, @Local(ordinal = 2) BlockPos pos) {
+		var replacement = CustomBlockTextures.getReplacementModel(state, pos);
+		if (replacement != null) return replacement;
+		CustomBlockTextures.enterFallbackCall();
+		var fallback = original.call(instance, state);
+		CustomBlockTextures.exitFallbackCall();
+		return fallback;
+	}
+//TODO: cover renderDamage model
+//    @WrapOperation(method = "renderDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BakedModel;"))
+//    private BakedModel replaceModelInRenderDamage(
+//        BlockModels instance, BlockState state, Operation<BakedModel> original, @Local(argsOnly = true) BlockPos pos) {
+//        var replacement = CustomBlockTextures.getReplacementModel(state, pos);
+//        if (replacement != null) return replacement;
+//        CustomBlockTextures.enterFallbackCall();
+//        var fallback = original.call(instance, state);
+//        CustomBlockTextures.exitFallbackCall();
+//        return fallback;
+//    }
 }