Implement PortalLogic's TeleportBehavior

src/main/java/org/spongepowered/common/bridge/world/level/block/PortalBlockBridge.java

@@ -42,5 +42,5 @@ public interface PortalBlockBridge {
 
     Optional<Portal> bridge$generatePortal(ServerLocation location, Axis axis);
 
-    boolean bridge$teleport(Entity entity, ServerLocation destination, boolean generateDestinationPortal);
+    boolean bridge$teleport(ServerLocation origin, Entity entity, ServerLocation destination, boolean generateDestinationPortal);
 }

src/main/java/org/spongepowered/common/world/portal/NoOpPortalTeleportBehavior.java

@@ -0,0 +1,16 @@
+package org.spongepowered.common.world.portal;
+
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.world.portal.Portal;
+import org.spongepowered.api.world.portal.PortalLogic;
+import org.spongepowered.api.world.server.ServerLocation;
+
+public enum NoOpPortalTeleportBehavior implements PortalLogic.TeleportBehavior {
+    INSTANCE;
+
+    @Override
+    public ServerLocation spawnLocation(ServerLocation from, ServerLocation to, Entity entity) {
+        return to;
+    }
+
+}

src/main/java/org/spongepowered/common/world/portal/SpongeCompositePortalLogic.java

@@ -73,6 +73,14 @@ public Optional<PortalFinder> finder() {
                 .findFirst());
     }
 
+    @Override
+    public Optional<TeleportBehavior> teleporter() {
+        return Optional.of((from, to, entity) -> this.rules.stream().map(PortalLogic.class::cast)
+            .map(PortalLogic::teleporter).flatMap(Optional::stream)
+            .map(c -> c.spawnLocation(from, to, entity))
+            .findFirst().get());
+    }
+
     @Override
     public Optional<PortalGenerator> generator() {
         return Optional.of((at, axis) -> this.rules.stream().map(PortalLogic.class::cast)
@@ -82,17 +90,19 @@ public Optional<PortalGenerator> generator() {
     }
 
     @Override
-    public boolean teleport(final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
+    public boolean teleport(final ServerLocation origin, final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
         final var searchRange = 1;
         final var axis = Axis.X;
 
         var foundPortal = this.finder().flatMap(finder -> finder.findPortal(destination, searchRange));
         if (foundPortal.isPresent()) {
-            return foundPortal.map(Portal::position).map(entity::setLocation).orElse(false);
+            return foundPortal.flatMap(p -> this.teleporter().map(b -> b.spawnLocation(origin, destination, entity)))
+                    .map(entity::setLocation).orElse(false);
         }
         if (generateDestinationPortal) {
             var generatedPortal = this.generator().flatMap(generator -> generator.generatePortal(destination, axis));
-            return generatedPortal.map(Portal::position).map(entity::setLocation).orElse(false);
+            return generatedPortal.flatMap(p -> this.teleporter().map(b -> b.spawnLocation(origin, destination, entity)))
+               .map(entity::setLocation).orElse(false);
         }
         return false;
     }

src/main/java/org/spongepowered/common/world/portal/SpongeCustomPortalLogic.java

@@ -24,6 +24,7 @@
  */
 package org.spongepowered.common.world.portal;
 
+import net.minecraft.BlockUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -45,39 +46,46 @@ public final class SpongeCustomPortalLogic implements net.minecraft.world.level.
 
     private final PortalLogic.PortalExitCalculator exitCalculator;
     private final PortalLogic.PortalFinder finder;
+    private final PortalLogic.TeleportBehavior teleporter;
     private final PortalLogic.PortalGenerator generator;
 
     private int searchRange = 16;
     private Axis axis = Axis.X;
 
-    public SpongeCustomPortalLogic(final PortalLogic.PortalExitCalculator calulator,
-            final PortalLogic.PortalFinder finder,
-            final PortalLogic.PortalGenerator generator) {
+    public SpongeCustomPortalLogic(final PortalLogic.PortalExitCalculator calculator,
+                                   final PortalLogic.PortalFinder finder,
+                                   final PortalLogic.TeleportBehavior teleporter,
+                                   final PortalLogic.PortalGenerator generator) {
 
-        this.exitCalculator = calulator;
+        this.exitCalculator = calculator;
         this.finder = finder;
+        this.teleporter = teleporter;
         this.generator = generator;
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public DimensionTransition getPortalDestination(final ServerLevel fromLevel, final Entity entity, final BlockPos fromPos) {
         final var spongeEntity = (org.spongepowered.api.entity.Entity) entity;
         // Calculate desired portal location
         // Then find existing portal or generate if not found
         return this.exitCalculator.calculatePortalExit((ServerWorld) fromLevel, VecHelper.toVector3i(fromPos), spongeEntity)
-                .flatMap(calcExit -> this.finder.findPortal(calcExit, this.searchRange).map(Portal::position).or(() -> this.generator.generatePortal(calcExit, this.axis).map(Portal::position))
-                        .map(realExit -> SpongeCustomPortalLogic.generateTransition(entity, realExit))
-                ).orElse(null);
+            .flatMap(calcExit -> this.finder.findPortal(calcExit, this.searchRange)
+                .flatMap(p -> this.teleporter().map(b -> b.spawnLocation(((ServerWorld) fromLevel).location(VecHelper.toVector3d(fromPos)), p.position(), spongeEntity)))
+                .or(() -> this.generator.generatePortal(calcExit, this.axis)
+                    .flatMap(p -> this.teleporter().map(b -> b.spawnLocation(((ServerWorld) fromLevel).location(VecHelper.toVector3d(fromPos)), p.position(), spongeEntity))))
+                .map(realExit -> SpongeCustomPortalLogic.generateTransition(entity, realExit))
+            ).orElse(null);
     }
 
     private static DimensionTransition generateTransition(final Entity entity, final ServerLocation finalExit) {
         return new DimensionTransition(
-                (ServerLevel) finalExit.world(),
-                VecHelper.toVanillaVector3d(finalExit.position()),
-                entity.getDeltaMovement(),
-                entity.getYRot(),
-                entity.getXRot(),
-                DimensionTransition.PLACE_PORTAL_TICKET);
+            (ServerLevel) finalExit.world(),
+            VecHelper.toVanillaVector3d(finalExit.position()),
+            entity.getDeltaMovement(),
+            entity.getYRot(),
+            entity.getXRot(),
+            DimensionTransition.PLACE_PORTAL_TICKET);
     }
 
     @Override
@@ -90,20 +98,25 @@ public Optional<PortalFinder> finder() {
         return Optional.of(this.finder);
     }
 
+    @Override
+    public Optional<TeleportBehavior> teleporter() {
+        return Optional.of(this.teleporter);
+    }
+
     @Override
     public Optional<PortalGenerator> generator() {
         return Optional.of(this.generator);
     }
 
     @Override
-    public boolean teleport(final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
+    public boolean teleport(final ServerLocation origin, final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
         final var foundPortal = this.finder.findPortal(destination, this.searchRange);
         if (foundPortal.isPresent()) {
-            return foundPortal.map(Portal::position).map(entity::setLocation).orElse(false);
+            return foundPortal.flatMap(p -> this.teleporter().map(b -> b.spawnLocation(origin, destination, entity))).map(entity::setLocation).orElse(false);
         }
         if (generateDestinationPortal) {
             var generatedPortal = this.generator.generatePortal(destination, this.axis);
-            return generatedPortal.map(Portal::position).map(entity::setLocation).orElse(false);
+            return generatedPortal.flatMap(p -> this.teleporter().map(b -> b.spawnLocation(origin, destination, entity))).map(entity::setLocation).orElse(false);
         }
         return false;
     }

src/main/java/org/spongepowered/common/world/portal/SpongeNetherPortalExitCalculator.java

@@ -62,7 +62,7 @@ public Optional<ServerLocation> calculatePortalExit(final ServerWorld from, fina
             return Optional.empty();
         }
         final var scale = this.calculateScale(fromLevel, toLevel);
-        final var exitPosition = toLevel.getWorldBorder().clampToBounds(fromPos.x() * scale, fromPos.y(), fromPos.z() * scale);
+        final var exitPosition = toLevel.getWorldBorder().clampToBounds(entity.location().x() * scale, entity.location().y(), entity.location().z() * scale);
         return Optional.of(ServerLocation.of((ServerWorld) toLevel, VecHelper.toVector3i(exitPosition)));
     }
 

src/main/java/org/spongepowered/common/world/portal/SpongeNetherPortalTeleportBehavior.java

@@ -0,0 +1,54 @@
+package org.spongepowered.common.world.portal;
+
+import net.minecraft.BlockUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.portal.PortalShape;
+import net.minecraft.world.phys.Vec3;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.world.portal.PortalLogic;
+import org.spongepowered.api.world.server.ServerLocation;
+import org.spongepowered.common.util.VecHelper;
+
+public enum SpongeNetherPortalTeleportBehavior implements PortalLogic.TeleportBehavior {
+    INSTANCE;
+
+    @Override
+    public ServerLocation spawnLocation(ServerLocation from, ServerLocation to, Entity spongeEntity) {
+        final var entity = (net.minecraft.world.entity.Entity) spongeEntity;
+        final var level = ((ServerLevel) to.world());
+        final var originBlockPos = VecHelper.toBlockPos(from);
+        final var destBlockPos = VecHelper.toBlockPos(to);
+        final var portalBlockState = level.getBlockState(destBlockPos);
+        if (!portalBlockState.hasProperty(BlockStateProperties.HORIZONTAL_AXIS)) {
+            return to;
+        }
+        final var axis = portalBlockState.getValue(BlockStateProperties.HORIZONTAL_AXIS);
+        final var foundRectangle = BlockUtil.getLargestRectangleAround(destBlockPos, axis, 21, Direction.Axis.Y, 21, pos2 -> level.getBlockState(pos2) == portalBlockState);
+        BlockState $$5 = entity.level().getBlockState(originBlockPos);
+
+        Vec3 relativePortalPosition;
+        Direction.Axis originAxis = $$5.getValue(BlockStateProperties.HORIZONTAL_AXIS);
+        BlockUtil.FoundRectangle $$7 = BlockUtil.getLargestRectangleAround(originBlockPos, originAxis, 21, Direction.Axis.Y, 21, ($$2x) -> entity.level().getBlockState($$2x) == $$5);
+        relativePortalPosition = entity.getRelativePortalPosition(originAxis, $$7);
+
+        BlockPos minCorner = foundRectangle.minCorner;
+        BlockState blockState = level.getBlockState(minCorner);
+        Direction.Axis $$11 = blockState.getOptionalValue(BlockStateProperties.HORIZONTAL_AXIS).orElse(Direction.Axis.X);
+        double $$12 = foundRectangle.axis1Size;
+        double $$13 = foundRectangle.axis2Size;
+        EntityDimensions $$14 = entity.getDimensions(entity.getPose());
+        double $$17 = (double) $$14.width() / (double) 2.0F + ($$12 - (double) $$14.width()) * relativePortalPosition.x();
+        double $$18 = ($$13 - (double) $$14.height()) * relativePortalPosition.y();
+        double $$19 = (double) 0.5F + relativePortalPosition.z();
+        boolean $$20 = $$11 == Direction.Axis.X;
+        Vec3 $$21 = new Vec3((double) minCorner.getX() + ($$20 ? $$17 : $$19), (double) minCorner.getY() + $$18, (double) minCorner.getZ() + ($$20 ? $$19 : $$17));
+        Vec3 collisionFreePosition = PortalShape.findCollisionFreePosition($$21, level, entity, $$14);
+        return to.world().location(VecHelper.toVector3d(collisionFreePosition));
+    }
+
+}

src/main/java/org/spongepowered/common/world/portal/SpongePortalLogicBuilder.java

@@ -43,17 +43,24 @@ public PortalLogic.Builder reset() {
 
 
     @Override
-    public PortalLogic.Builder addPortal(final PortalLogic.PortalExitCalculator calulator,
+    public PortalLogic.Builder addPortal(final PortalLogic.PortalExitCalculator calculator,
             final PortalLogic.PortalFinder finder,
             final PortalLogic.PortalGenerator generator) {
-        var portal = new SpongeCustomPortalLogic(calulator, finder, generator);
+        var portal = new SpongeCustomPortalLogic(calculator, finder, (from, to, entity) -> to, generator);
         this.rules.add(portal);
         return this;
     }
 
     @Override
-    public <T extends PortalLogic.PortalExitCalculator & PortalLogic.PortalFinder & PortalLogic.PortalGenerator> PortalLogic.Builder addPortal(final T logic) {
-        var portal = new SpongeCustomPortalLogic(logic, logic, logic);
+    public PortalLogic.Builder addPortal(PortalLogic.PortalExitCalculator calculator, PortalLogic.PortalFinder finder, PortalLogic.TeleportBehavior teleporter, PortalLogic.PortalGenerator generator) {
+        var portal = new SpongeCustomPortalLogic(calculator, finder, teleporter, generator);
+        this.rules.add(portal);
+        return this;
+    }
+
+    @Override
+    public <T extends PortalLogic.PortalExitCalculator & PortalLogic.PortalFinder & PortalLogic.TeleportBehavior & PortalLogic.PortalGenerator> PortalLogic.Builder addPortal(final T logic) {
+        var portal = new SpongeCustomPortalLogic(logic, logic, logic, logic);
         this.rules.add(portal);
         return this;
     }
@@ -63,5 +70,4 @@ public PortalLogic build() {
         return new SpongeCompositePortalLogic(this.rules);
     }
 
-
 }

src/main/java/org/spongepowered/common/world/portal/SpongePortalLogicFactory.java

@@ -103,5 +103,4 @@ public Portal portalOf(final PortalLogic logic, final ServerLocation position, f
         return new SpongePortal(position, logic, aabb);
     }
 
-
 }

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/block/PortalMixin_API.java

@@ -30,6 +30,7 @@
 import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.common.bridge.world.level.block.PortalBlockBridge;
+import org.spongepowered.common.world.portal.SpongeNetherPortalTeleportBehavior;
 
 import java.util.Optional;
 
@@ -61,9 +62,17 @@ default Optional<PortalGenerator> generator() {
     }
 
     @Override
-    default boolean teleport(final Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
+    default Optional<TeleportBehavior> teleporter() {
         if (this instanceof PortalBlockBridge pbb) {
-            return pbb.bridge$teleport(entity, destination, generateDestinationPortal);
+            return Optional.of(SpongeNetherPortalTeleportBehavior.INSTANCE);
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    default boolean teleport(final ServerLocation origin, final Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
+        if (this instanceof PortalBlockBridge pbb) {
+            return pbb.bridge$teleport(origin, entity, destination, generateDestinationPortal);
         }
         return false;
     }

src/mixins/java/org/spongepowered/common/mixin/core/world/level/block/EndPortalBlockMixin.java

@@ -98,7 +98,7 @@ public abstract class EndPortalBlockMixin implements PortalBlockBridge {
     }
 
     @Override
-    public boolean bridge$teleport(final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
+    public boolean bridge$teleport(final ServerLocation origin, final org.spongepowered.api.entity.Entity entity, final ServerLocation destination, final boolean generateDestinationPortal) {
         final var toLevel = (ServerLevel) destination.world();
         if (toLevel.dimension() == Level.END) {
             if (generateDestinationPortal) {