From 1306e837e014ce6129586445dae65b6133b8bc1b Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Thu, 16 Nov 2023 21:56:09 +0100
Subject: [PATCH] fix hitbox rendering with camera offset, fix entity
 translucent skipping

---
 .../bixilon/minosoft/gui/rendering/entities/EntitiesRenderer.kt | 2 +-
 .../gui/rendering/entities/feature/block/BlockFeature.kt        | 2 +-
 .../gui/rendering/entities/feature/hitbox/HitboxFeature.kt      | 2 +-
 .../minosoft/gui/rendering/entities/feature/item/ItemFeature.kt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntitiesRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntitiesRenderer.kt
index 503415899..375c30f62 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntitiesRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntitiesRenderer.kt
@@ -47,7 +47,7 @@ class EntitiesRenderer(
 
     override fun registerLayers() {
         layers.register(EntityLayer.Opaque, null, { visibility.opaque.draw() }) { visibility.opaque.size <= 0 }
-        layers.register(EntityLayer.Translucent, null, { visibility.translucent.draw() }) { visibility.opaque.size <= 0 }
+        layers.register(EntityLayer.Translucent, null, { visibility.translucent.draw() }) { visibility.translucent.size <= 0 }
     }
 
     override fun prePrepareDraw() {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt
index 1c3b303de..acb378a1c 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt
@@ -71,7 +71,7 @@ open class BlockFeature(
     }
 
     override fun draw(mesh: BlockMesh) {
-        renderer.renderer.context.system.set(EntityLayer.Translucent.settings)
+        renderer.renderer.context.system.set(layer.settings)
         val shader = renderer.renderer.features.block.shader
         draw(mesh, shader)
     }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt
index ca2e61bcf..bbd45199d 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt
@@ -59,7 +59,7 @@ class HitboxFeature(renderer: EntityRenderer<*>) : MeshedFeature<LineMesh>(rende
         var changes = 0
 
         val renderInfo = renderer.entity.renderInfo
-        val aabb = renderInfo.cameraAABB + -offset
+        val aabb = renderInfo.cameraAABB
         val eyePosition = Vec3(renderInfo.eyePosition - offset)
         val rotation = renderInfo.rotation
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt
index 49718ca18..3e0a482a0 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt
@@ -107,7 +107,7 @@ open class ItemFeature(
     }
 
     override fun draw(mesh: BlockMesh) {
-        renderer.renderer.context.system.set(EntityLayer.Translucent.settings)
+        renderer.renderer.context.system.set(layer.settings)
         val shader = renderer.renderer.features.block.shader
         draw(mesh, shader)
     }