rename portal warp methods to preparePortalWarp & activePortalWarp

as well as other clean ups in the warp logic

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataWarpingPlugin.java

@@ -198,13 +198,13 @@ public final MethodResult distanceToPoint(String name) {
      *   facing = "north", -- where will the turtle face after teleport
      *   costs = 10000, -- the costs to cross the portal
      *   canSpawn = true, -- if the target position is not blocked and turtle are able to spawn there
-     *   shipId = "xxx", -- the random id used for ship the portal. You have to call portalShipActive(shipId) if needed.
+     *   warpId = "xxx", -- the random id used for ship the portal. You have to call activePortalWarp(warpId) if needed.
      * }
      * </code>
      * </pre>
      */
     @LuaFunction
-    public final MethodResult portalShipPrepare(IArguments arguments) throws LuaException {
+    public final MethodResult preparePortalWarp(IArguments arguments) throws LuaException {
         Direction direction;
         switch (arguments.optString(0).orElse("").toLowerCase(Locale.ROOT)) {
             case "up", "top" -> direction = Direction.UP;
@@ -218,20 +218,20 @@ public final MethodResult portalShipPrepare(IArguments arguments) throws LuaExce
         TurtlePeripheralOwner owner = automataCore.getPeripheralOwner();
         ITurtleAccess turtle = owner.getTurtle();
         TurtleEnderPearl shipPearl = new TurtleEnderPearl(turtle, direction);
-        String shipId = shipPearl.getStringUUID();
+        String warpId = shipPearl.getStringUUID();
         ServerWorker.add(() -> {
             MethodResult res;
             try {
                 res = automataCore.withOperation(PREPARE_PORTAL, new SingleOperationContext(1, 1), context -> {
-                    shipPearl.setCallback(pearl -> {
+                    shipPearl.setCallbacks(pearl -> {
                         if (pearl == null || pearl.isRemoved()) {
-                            automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, shipId, "PEARL_GONE");
-                            shipPearls.remove(shipId);
+                            automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, warpId, "PEARL_GONE");
+                            shipPearls.remove(warpId);
                             return;
                         }
                         Level level = pearl.level();
                         if (level == turtle.getLevel()) {
-                            automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, shipId, "NO_PORTAL_FOUND");
+                            automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, warpId, "NO_PORTAL_FOUND");
                             pearl.discard();
                             return;
                         }
@@ -242,11 +242,12 @@ public final MethodResult portalShipPrepare(IArguments arguments) throws LuaExce
                             "facing", pearl.getDirection().getName(),
                             "costs", getCostsToLevel(level.dimension()),
                             "canSpawn", owner.isMovementPossible(level, pos),
-                            "shipId", shipId
+                            "warpId", warpId
                         );
-                        shipPearls.put(shipId, pearl);
+                        shipPearls.values().removeIf(TurtleEnderPearl::isRemoved);
+                        shipPearls.put(warpId, pearl);
                         automataCore.queueEvent(PortalPrepareCallback.EVENT_ID, data);
-                    });
+                    }, shipPearls::remove);
                     turtle.getLevel().addFreshEntity(shipPearl);
                     return null;
                 }, null);
@@ -255,18 +256,18 @@ public final MethodResult portalShipPrepare(IArguments arguments) throws LuaExce
             }
             if (res != null) {
                 Object err = res.getResult()[1];
-                automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, shipId, err);
+                automataCore.queueEvent(PortalPrepareCallback.FAILED_EVENT_ID, warpId, err);
             }
         });
-        return new PortalPrepareCallback(shipId).pull;
+        return new PortalPrepareCallback(warpId).pull;
     }
 
     /**
-     * @param id the random shipId, one of the result from portalShipPrepare()
+     * @param id the random warpId from the result of preparePortalWarp()
      * @return true | nil, string
      */
     @LuaFunction(mainThread = true)
-    public final MethodResult portalShipActive(String id) throws LuaException {
+    public final MethodResult activePortalWarp(String id) throws LuaException {
         TurtlePeripheralOwner owner = automataCore.getPeripheralOwner();
         TurtleEnderPearl shipPearl = shipPearls.get(id);
         if (shipPearl == null) {
@@ -279,12 +280,12 @@ public final MethodResult portalShipActive(String id) throws LuaException {
         Level level = shipPearl.level();
         BlockPos newPosition = shipPearl.blockPosition();
         return automataCore.withOperation(ACTIVE_PORTAL, new SingleOperationContext(getCostsToLevel(level.dimension()), 1), context -> {
+            shipPearls.remove(id);
             shipPearl.discard();
             boolean result = owner.move(level, newPosition);
             if (!result) {
                 return MethodResult.of(null, "Cannot teleport to location");
             }
-            shipPearls.remove(id);
             return MethodResult.of(true);
         }, context -> {
             if (!owner.isMovementPossible(level, newPosition)) {
@@ -330,7 +331,7 @@ public MethodResult resume(Object[] datas) {
             if (!EVENT_ID.equals(datas[0]) || datas.length != 2) {
                 return pull;
             }
-            if (!(datas[1] instanceof Map<?, ?> data) || !id.equals(data.get("shipId"))) {
+            if (!(datas[1] instanceof Map<?, ?> data) || !id.equals(data.get("warpId"))) {
                 return pull;
             }
             return MethodResult.of(data);

src/main/java/de/srendi/advancedperipherals/common/entity/TurtleEnderPearl.java

@@ -33,6 +33,7 @@ public class TurtleEnderPearl extends ThrowableProjectile {
     private ITurtleAccess turtle = null;
     private BlockPos spawnPos = null;
     private Consumer<TurtleEnderPearl> callback = null;
+    private Consumer<String> onExpire = null;
     private int life = 20;
     private boolean changedDim = false;
 
@@ -58,8 +59,9 @@ public ITurtleAccess getTurtle() {
         return turtle;
     }
 
-    public void setCallback(Consumer<TurtleEnderPearl> callback) {
+    public void setCallbacks(Consumer<TurtleEnderPearl> callback, Consumer<String> onExpire) {
         this.callback = callback;
+        this.onExpire = onExpire;
     }
 
     @Override
@@ -88,6 +90,9 @@ public void tick() {
             // clean after 5s
             if (this.life < -100) {
                 this.discard();
+                if (this.onExpire != null) {
+                    this.onExpire.accept(this.getStringUUID());
+                }
                 return;
             }
             return;

src/main/java/de/srendi/advancedperipherals/common/setup/APItems.java

@@ -18,7 +18,6 @@
 import de.srendi.advancedperipherals.lib.annotation.DefaultTranslation;
 import net.minecraft.world.item.ArmorMaterials;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Items;
 import net.neoforged.neoforge.registries.DeferredHolder;
 
 public class APItems {