Optimize sub-level climbing mixin

Author: ryanhcode

common/src/main/java/dev/ryanhcode/sable/mixin/climbing_sub_levels/LivingEntityMixin.java

@@ -1,9 +1,13 @@
 package dev.ryanhcode.sable.mixin.climbing_sub_levels;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import dev.ryanhcode.sable.Sable;
-import dev.ryanhcode.sable.api.SubLevelHelper;
 import dev.ryanhcode.sable.companion.math.BoundingBox3d;
 import dev.ryanhcode.sable.companion.math.JOMLConversion;
+import dev.ryanhcode.sable.mixinterface.entity.entity_sublevel_collision.EntityMovementExtension;
 import dev.ryanhcode.sable.platform.SablePlatform;
 import dev.ryanhcode.sable.sublevel.SubLevel;
 import net.minecraft.core.BlockPos;
@@ -30,12 +34,13 @@ public LivingEntityMixin(final EntityType<?> entityType, final Level level) {
     }
 
     @Redirect(method = "onClimbable", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;blockPosition()Lnet/minecraft/core/BlockPos;"))
-    private BlockPos sable$redirectPos(final LivingEntity instance) {
+    private BlockPos sable$redirectPos(final LivingEntity instance, @Share("subLevelBlockState") final LocalRef<BlockState> subLevelBlockState) {
         final Level level = this.level();
-        final BlockPos defaultPos = instance.blockPosition();
-
         final LivingEntity self = (LivingEntity) (Object) this;
-        final BlockState defaultState = level.getBlockState(defaultPos);
+
+        final BlockPos defaultPos = ((EntityMovementExtension) this).sable$getInBlockStatePos();
+        final BlockState defaultState = this.getInBlockState();
+
         if (defaultState.is(BlockTags.CLIMBABLE) && SablePlatform.INSTANCE.isBlockstateLadder(defaultState, level, defaultPos, self)) {
             return defaultPos;
         }
@@ -48,10 +53,18 @@ public LivingEntityMixin(final EntityType<?> entityType, final Level level) {
             final BlockState state = level.getBlockState(pos);
 
             if (state.is(BlockTags.CLIMBABLE) && SablePlatform.INSTANCE.isBlockstateLadder(state, level, pos, self)) {
+                subLevelBlockState.set(state);
                 return pos.immutable();
             }
         }
 
         return defaultPos;
     }
+
+
+    @WrapOperation(method = "onClimbable", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getInBlockState()Lnet/minecraft/world/level/block/state/BlockState;"))
+    private BlockState getInBlockState(final LivingEntity instance, final Operation<BlockState> original, @Share("subLevelBlockState") final LocalRef<BlockState> subLevelBlockState) {
+        final BlockState state = subLevelBlockState.get();
+        return state != null ? state :  original.call(instance);
+    }
 }

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

@@ -4,8 +4,6 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.ryanhcode.sable.ActiveSableCompanion;
 import dev.ryanhcode.sable.Sable;
-import dev.ryanhcode.sable.api.SubLevelHelper;
-import dev.ryanhcode.sable.api.entity.EntitySubLevelUtil;
 import dev.ryanhcode.sable.companion.math.BoundingBox3d;
 import dev.ryanhcode.sable.companion.math.JOMLConversion;
 import dev.ryanhcode.sable.index.SableTags;
@@ -79,6 +77,9 @@ public abstract class EntityMixin implements EntityMovementExtension {
     @Shadow
     protected abstract boolean isHorizontalCollisionMinor(Vec3 arg);
 
+    @Unique
+    private BlockPos sable$inBlockStatePos = BlockPos.ZERO;
+
 //    @Unique
 //    private Vector3d sable$trackStartUpDirection = null;
 //
@@ -247,6 +248,14 @@ public void updateEntityAfterFallOn(final Block instance, final BlockGetter arg,
         }
     }
 
+    /**
+     * @return the position that the state returned by getInBlockState was gotten from
+     */
+    @Override
+    public BlockPos sable$getInBlockStatePos() {
+        return this.sable$inBlockStatePos;
+    }
+
     /**
      * @author RyanH
      * @reason Take into account sub-levels
@@ -257,6 +266,7 @@ public BlockState getInBlockState() {
 
         if (this.inBlockState == null || this.sable$trackingSubLevel != null) {
             this.inBlockState = level.getBlockState(this.blockPosition);
+            this.sable$inBlockStatePos = this.blockPosition;
 
             final Iterable<SubLevel> intersecting = Sable.HELPER.getAllIntersecting(this.level, new BoundingBox3d(this.blockPosition));
 
@@ -265,6 +275,7 @@ public BlockState getInBlockState() {
                 final SubLevel subLevel = iter.next();
                 final BlockPos localBlockPos = BlockPos.containing(subLevel.logicalPose().transformPositionInverse(this.position.add(0.0, 0.001, 0.0)));
                 this.inBlockState = level.getBlockState(localBlockPos);
+                this.sable$inBlockStatePos = localBlockPos;
             }
         }
 

common/src/main/java/dev/ryanhcode/sable/mixinterface/entity/entity_sublevel_collision/EntityMovementExtension.java

@@ -2,6 +2,7 @@
 
 import dev.ryanhcode.sable.sublevel.SubLevel;
 import dev.ryanhcode.sable.sublevel.entity_collision.SubLevelEntityCollision;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -23,4 +24,9 @@ public interface EntityMovementExtension {
     void sable$setTrackingSubLevel(SubLevel subLevel);
 
     void sable$setLastTrackingSubLevelID(UUID uuid);
+
+    /**
+     * @return the position that the state returned by getInBlockState was gotten from
+     */
+    BlockPos sable$getInBlockStatePos();
 }