Fix armor stand landing and culling

Author: JpegN

common/src/main/java/dev/ryanhcode/sable/mixin/entity/entity_rendering/LevelRendererMixin.java

@@ -44,7 +44,7 @@ private void renderEntityOnSubLevel(final Entity entity,
                                         @Local(ordinal = 5) final LocalDoubleRef entityZ,
                                         @Share("renderPose") final LocalRef<Pose3dc> renderPoseShare) {
         // Render the entity on the data
-        final ClientSubLevel subLevel = (ClientSubLevel) Sable.HELPER.getContaining(entity);
+        final ClientSubLevel subLevel = Sable.HELPER.getContainingClient(entity.getX(), entity.getZ());
 
         if (subLevel == null) {
             // Tracking sub-levels

common/src/main/java/dev/ryanhcode/sable/mixin/entity/entity_sublevel_collision/ArmorStandMixin.java

@@ -8,7 +8,11 @@
 import net.minecraft.world.entity.decoration.ArmorStand;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,23 +24,32 @@ public ArmorStandMixin(final EntityType<?> entityType, final Level level) {
         super(entityType, level);
     }
 
+    @Unique
+    private int sable$lastAttachedTick;
+
     @Inject(method = "tick", at = @At("TAIL"))
     private void sable$postTick(final CallbackInfo ci) {
         if (this.level().isClientSide) return;
 
         final SubLevel containingSubLevel = Sable.HELPER.getContaining(this);
 
         if (containingSubLevel != null) {
-            if (!this.onGround()) {
+            if (this.tickCount - this.sable$lastAttachedTick > 1 && !this.onGround()) {
                 EntitySubLevelUtil.kickEntity(containingSubLevel, this);
             }
         } else if (this.onGround()) {
             final SubLevel landed = Sable.HELPER.getTrackingSubLevel(this);
             if (landed != null) {
                 final Vec3 shipyardPos = landed.logicalPose().transformPositionInverse(this.position());
-                final Vec3 shipyardVel = landed.logicalPose().transformNormalInverse(this.getDeltaMovement());
-                this.moveTo(shipyardPos.x, shipyardPos.y, shipyardPos.z);
-                this.setDeltaMovement(shipyardVel);
+                final BlockPos belowPos = BlockPos.containing(shipyardPos.x, shipyardPos.y - 0.5, shipyardPos.z);
+                final BlockState belowState = this.level().getBlockState(belowPos);
+                if (belowState.isFaceSturdy(this.level(), belowPos, Direction.UP)
+                        && Math.abs(shipyardPos.y - (belowPos.getY() + 1)) < 0.1) {
+                    final Vec3 shipyardVel = landed.logicalPose().transformNormalInverse(this.getDeltaMovement());
+                    this.moveTo(shipyardPos.x, shipyardPos.y, shipyardPos.z);
+                    this.setDeltaMovement(shipyardVel);
+                    this.sable$lastAttachedTick = this.tickCount;
+                }
             }
         }
     }

common/src/main/java/dev/ryanhcode/sable/mixin/entity/no_culling/EntityMixin.java

@@ -0,0 +1,22 @@
+package dev.ryanhcode.sable.mixin.entity.no_culling;
+
+import dev.ryanhcode.sable.api.entity.EntitySubLevelUtil;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public abstract class EntityMixin {
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void sable$disableCullingForRetained(final EntityType<?> type, final Level level, final CallbackInfo ci) {
+        final Entity self = (Entity) (Object) this;
+        if (!EntitySubLevelUtil.shouldKick(self)) {
+            self.noCulling = true;
+        }
+    }
+}

common/src/main/resources/sable.mixins.json

@@ -41,6 +41,7 @@
     "entity.entity_sublevel_collision.CameraMixin",
     "entity.entity_swimming.CameraMixin",
     "entity.parrot.ParrotMixin",
+    "entity.no_culling.EntityMixin",
     "loaded_chunk_debug.BlockUpdatePacketMixin",
     "loaded_chunk_debug.ChunkBorderRendererMixin",
     "loaded_chunk_debug.ClientChunkCacheStorageAccessor",