Fix eternal fabric and dimensional trapdoor

Author: Runemoro

src/main/java/org/dimdev/dimdoors/shared/ModConfig.java

@@ -48,6 +48,10 @@ public static class General {
         @LangKey("dimdoors.general.riftCloseSpeed")
         @RangeDouble(min = 0)
         public float riftCloseSpeed = 1f;
+
+        @Name("depthSpreadFactor")
+        @LangKey("dimdoors.general.depthSpreadFactor")
+        public int depthSpreadFactor = 10;
     }
 
     public static class Pockets {

src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricEternal.java

@@ -8,12 +8,16 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.dimdev.ddutils.Location;
+import org.dimdev.ddutils.RotatedLocation;
 import org.dimdev.dimdoors.DimDoors;
+import org.dimdev.dimdoors.shared.rifts.destinations.EscapeDestination;
 
 public class BlockFabricEternal extends BlockEmptyDrops { // TODO: make this a glowing red liquid
 
     public static final Material ETERNAL_FABRIC = new Material(MapColor.PINK);
     public static final String ID = "eternal_fabric";
+    public static EscapeDestination exitLimbo = new EscapeDestination(true);
 
     public BlockFabricEternal() {
         super(ETERNAL_FABRIC);
@@ -29,6 +33,6 @@ public BlockFabricEternal() {
 
     @Override
     public void onEntityWalk(World world, BlockPos pos, Entity entity) {
-        // TODO: implement using a destination
+        exitLimbo.teleport(new RotatedLocation(new Location(world, pos), (int) (entity.rotationYaw / 90) * 90, 0), entity);
     }
 }

src/main/java/org/dimdev/dimdoors/shared/rifts/destinations/EscapeDestination.java

@@ -15,12 +15,15 @@
 import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
+import org.dimdev.pocketlib.VirtualLocation;
 
 import java.util.UUID;
 
 @Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class EscapeDestination extends RiftDestination {
-    //public EscapeDestination() {}
+    boolean canEscapeLimbo = false;
+
+    public EscapeDestination() {}
 
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
@@ -35,19 +38,20 @@ public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
 
     @Override
     public boolean teleport(RotatedLocation loc, Entity entity) {
-        if (!ModDimensions.isDimDoorsPocketDimension(entity.world)) {
-            if (entity.world.provider instanceof WorldProviderLimbo) {
-                DimDoors.sendTranslatedMessage(entity, "rifts.destinations.escape.cannot_escape_limbo");
-            } else {
-                DimDoors.sendTranslatedMessage(entity, "rifts.destinations.escape.not_in_pocket_dim");
-            }
+        if (!ModDimensions.isDimDoorsPocketDimension(entity.world) && !(entity.world.provider instanceof WorldProviderLimbo)) {
+            DimDoors.sendTranslatedMessage(entity, "rifts.destinations.escape.not_in_pocket_dim");
             return false;
         }
+        if (entity.world.provider instanceof WorldProviderLimbo && !canEscapeLimbo) {
+            DimDoors.sendTranslatedMessage(entity, "rifts.destinations.escape.cannot_escape_limbo");
+            return false;
+        }
+
         UUID uuid = entity.getUniqueID();
         if (uuid != null) {
             Location destLoc = RiftRegistry.instance().getOverworldRift(uuid);
-            if (destLoc != null && destLoc.getTileEntity() instanceof TileEntityRift) {
-                //TeleportUtils.teleport(entity, new VirtualLocation(destLoc, rift.virtualLocation.getDepth()).projectToWorld()); // TODO
+            if (destLoc != null && destLoc.getTileEntity() instanceof TileEntityRift || canEscapeLimbo) {
+                TeleportUtils.teleport(entity, VirtualLocation.fromLocation(loc.getLocation()).projectToWorld(false));
                 return true;
             } else {
                 if (destLoc == null) {

src/main/java/org/dimdev/pocketlib/VirtualLocation.java

@@ -2,9 +2,12 @@
 
 import lombok.*;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import org.dimdev.annotatednbt.NBTSerializable;
 import org.dimdev.annotatednbt.Saved;
 import org.dimdev.ddutils.Location;
+import org.dimdev.ddutils.WorldUtils;
 import org.dimdev.ddutils.nbt.INBTStorable;
 import org.dimdev.ddutils.nbt.NBTUtils;
 import org.dimdev.dimdoors.shared.ModConfig;
@@ -38,4 +41,16 @@ public static VirtualLocation fromLocation(Location location) {
         }
         return virtualLocation;
     }
+
+    public Location projectToWorld(boolean limboConsideredWorld) {
+        World world = WorldUtils.getWorld(dim);
+        if (!limboConsideredWorld && world.provider instanceof WorldProviderLimbo) {
+            world = WorldUtils.getWorld(0);
+        }
+        float spread = ModConfig.general.depthSpreadFactor * depth; // TODO: gaussian spread
+        int newX = (int) (x + spread * 2 * (Math.random() - 0.5));
+        int newZ = (int) (z + spread * 2 * (Math.random() - 0.5));
+        BlockPos pos = world.getTopSolidOrLiquidBlock(new BlockPos(newX, 0, newZ));
+        return new Location(world, pos);
+    }
 }