Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed two rendering issues caused by mod interoperability #230

Open
wants to merge 2 commits into
base: 1.20
Choose a base branch
from
+7 −1
Open

Fixed two rendering issues caused by mod interoperability #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dac96e
Fixed invisible tank item model issue
val-int1 Feb 25, 2024
ec70a35
Fix NPE with the crosshair target w/ ImmersivePortals
val-int1 Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...in/kotlin/io/github/lucaargolo/kibe/blocks/entangledchest/EntangledChestEntityRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class EntangledChestEntityRenderer(private val arg: BlockEntityRendererFactory.C
matrices.translate(-0.5, 0.0, -0.5)

val popup = if(
MinecraftClient.getInstance().crosshairTarget != null &&
MinecraftClient.getInstance().crosshairTarget!!.type == HitResult.Type.BLOCK &&
(MinecraftClient.getInstance().crosshairTarget!! as BlockHitResult).blockPos == entity.pos &&
MinecraftClient.getInstance().player!!.getStackInHand(Hand.MAIN_HAND).item is Rune
Expand Down
1 change: 1 addition & 0 deletions ...main/kotlin/io/github/lucaargolo/kibe/blocks/entangledtank/EntangledTankEntityRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class EntangledTankEntityRenderer(private val arg: BlockEntityRendererFactory.Co
bottomModel.render(matrices, chestConsumer, lightAbove, overlay)

val popup = if(
MinecraftClient.getInstance().crosshairTarget != null &&
MinecraftClient.getInstance().crosshairTarget!!.type == HitResult.Type.BLOCK &&
(MinecraftClient.getInstance().crosshairTarget!! as BlockHitResult).blockPos == entity.pos &&
MinecraftClient.getInstance().player!!.getStackInHand(Hand.MAIN_HAND).item is Rune
Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/io/github/lucaargolo/kibe/items/tank/TankBlockItemBakedModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel
import net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant
Expand Down Expand Up @@ -42,7 +43,10 @@ class TankBlockItemBakedModel: BakedModel, FabricBakedModel {
override fun emitItemQuads(stack: ItemStack, randSupplier: Supplier<Random>, context: RenderContext) {

val client = MinecraftClient.getInstance()
val tankBlockModel = client.bakedModelManager.getModel(ModelIdentifier(Identifier(MOD_ID, "tank"), "level=0"))
var tankBlockModel = client.bakedModelManager.getModel(ModelIdentifier(Identifier(MOD_ID, "tank"), "level=0"))

while(tankBlockModel is WrapperBakedModel)
tankBlockModel = WrapperBakedModel.unwrap(tankBlockModel)

(tankBlockModel as? TankCustomModel)?.emitBlockQuads(null, null, BlockPos.ORIGIN, randSupplier, context)

Expand Down