Add sublevel ejector support

Depends on Creators-of-Create/Create#10395 upstream

Author: Ocelot5836

neoforge/src/main/java/dev/ryanhcode/sable/neoforge/mixin/compatibility/create/ejector/EjectorBlockEntityMixin.java

@@ -1,12 +1,15 @@
 package dev.ryanhcode.sable.neoforge.mixin.compatibility.create.ejector;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.simibubi.create.content.logistics.depot.EjectorBlockEntity;
 import com.simibubi.create.content.logistics.depot.EntityLauncher;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import dev.ryanhcode.sable.ActiveSableCompanion;
 import dev.ryanhcode.sable.Sable;
 import dev.ryanhcode.sable.api.physics.handle.RigidBodyHandle;
 import dev.ryanhcode.sable.api.sublevel.SubLevelContainer;
+import dev.ryanhcode.sable.companion.math.JOMLConversion;
 import dev.ryanhcode.sable.mixinterface.clip_overwrite.ClipContextExtension;
 import dev.ryanhcode.sable.neoforge.mixinhelper.compatibility.create.ejector.SubLevelScanResult;
 import dev.ryanhcode.sable.physics.config.dimension_physics.DimensionPhysicsData;
@@ -16,6 +19,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -24,6 +28,7 @@
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -79,8 +84,7 @@ public EjectorBlockEntityMixin(final BlockEntityType<?> type, final BlockPos pos
         final double px = this.launcher.getHorizontalDistance();
         final double py = this.launcher.getVerticalDistance();
 
-        // TODO: Make this use gravity at the ejector position
-        final double g = -DimensionPhysicsData.getGravity(this.level).y;
+        final double g = -DimensionPhysicsData.getGravity(this.level, JOMLConversion.atCenterOf(blockPos)).y;
 
         double vx = c;
         if (py > 0) {
@@ -107,6 +111,12 @@ public EjectorBlockEntityMixin(final BlockEntityType<?> type, final BlockPos pos
         }
     }
 
+    @WrapOperation(method = "activateDeferred", at= @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;setPos(DDD)V"))
+    public void setPos(final Entity instance, final double x, final double y, final double z, final Operation<Void> original) {
+        final Vector3d projected = Sable.HELPER.projectOutOfSubLevel(instance.level(), new Vector3d(x, y, z));
+        original.call(instance, projected.x, projected.y, projected.z);
+    }
+
     private @Nullable SubLevelScanResult sable$lookForLaunchableSubLevels() {
         final ActiveSableCompanion helper = Sable.HELPER;
         final SubLevel containingSubLevel = helper.getContaining(this);

neoforge/src/main/java/dev/ryanhcode/sable/neoforge/mixin/compatibility/create/ejector/EjectorBlockMixin.java

@@ -0,0 +1,28 @@
+package dev.ryanhcode.sable.neoforge.mixin.compatibility.create.ejector;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.simibubi.create.content.logistics.depot.EjectorBlock;
+import dev.ryanhcode.sable.Sable;
+import dev.ryanhcode.sable.companion.math.JOMLConversion;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
+import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(EjectorBlock.class)
+public class EjectorBlockMixin {
+
+    @Redirect(method = "updateEntityAfterFallOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/Vec3;distanceTo(Lnet/minecraft/world/phys/Vec3;)D"))
+    public double distanceTo(final Vec3 instance, final Vec3 vec, @Local(argsOnly = true) final Entity entity) {
+        return Math.sqrt(Sable.HELPER.distanceSquaredWithSubLevels(entity.level(), instance, vec));
+    }
+
+    @Redirect(method = "updateEntityAfterFallOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/Vec3;add(Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3;"))
+    public Vec3 setPos(final Vec3 instance, final Vec3 vec, @Local(argsOnly = true) final Entity entity) {
+        final Vector3d projected = Sable.HELPER.projectOutOfSubLevel(entity.level(), JOMLConversion.toJOML(instance)).add(vec.x, vec.y, vec.z);
+        return JOMLConversion.toMojang(projected);
+    }
+}

neoforge/src/main/resources/sable-neoforge.mixins.json

@@ -97,6 +97,7 @@
     "compatibility.create.display_link.DisplayLinkBlockEntityMixin",
     "compatibility.create.display_link.DisplayLinkBlockMixin",
     "compatibility.create.ejector.EjectorBlockEntityMixin",
+    "compatibility.create.ejector.EjectorBlockMixin",
     "compatibility.create.elevator_controls.ElevatorControlsHandlerMixin",
     "compatibility.create.entity_falls_on_block.BasinBlockMixin",
     "compatibility.create.entity_falls_on_block.BeltMillstoneBlocksMixin",