diff --git a/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinBlockScriptedRenderer.java b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinBlockScriptedRenderer.java index 1b39900..91c93be 100644 --- a/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinBlockScriptedRenderer.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinBlockScriptedRenderer.java @@ -1,8 +1,11 @@ package com.goodbird.npcgecko.mixin.impl; import com.goodbird.npcgecko.tile.TileEntityCustomModel; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; import noppes.npcs.blocks.tiles.TileScripted; import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; @@ -12,6 +15,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import software.bernie.geckolib3.renderers.geo.RenderBlockItem; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; @@ -29,6 +33,17 @@ public abstract class MixinBlockScriptedRenderer { GL11.glScaled(2, 2, 2); } + @Inject(method = "renderWorldBlock", at = @At(value = "HEAD"), cancellable = true, remap = false) + public void renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer, CallbackInfoReturnable cir) { + if (BlockScriptedRenderer.overrideModel()) return; + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileScripted)) return; + TileScripted tileScripted = (TileScripted) te; + if (!(tileScripted.renderTile instanceof TileEntityCustomModel)) return; + cir.setReturnValue(true); + cir.cancel(); + } + @Inject(method = "renderTileEntityAt", at = @At(value = "HEAD"), cancellable = true) public void customGeckoModelRendering(TileEntity te, double x, double y, double z, float partialTicks, CallbackInfo ci) { if(BlockScriptedRenderer.overrideModel()) return;