fix end automata turtle cannot warp to unloaded chunk

close IntelligenceModding/Advanced-Peripherals-Features#110

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/TurtlePeripheralOwner.java

@@ -6,20 +6,24 @@
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.util.InventoryUtil;
+import de.srendi.advancedperipherals.common.setup.APDataComponents;
 import de.srendi.advancedperipherals.common.util.fakeplayer.APFakePlayer;
 import de.srendi.advancedperipherals.common.util.fakeplayer.FakePlayerProviderTurtle;
 import de.srendi.advancedperipherals.lib.peripherals.IBasePeripheral;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.FrontAndTop;
 import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.core.component.PatchedDataComponentMap;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.UUID;
+
 public class TurtlePeripheralOwner extends BasePeripheralOwner {
     private final ITurtleAccess turtle;
     private final TurtleSide side;
@@ -83,6 +87,17 @@ public void putDataStorage(DataComponentPatch dataStorage) {
         turtle.setUpgradeData(side, dataStorage);
     }
 
+    public UUID getChunkLoadUUID() {
+        PatchedDataComponentMap patchMap = this.getPatchedDataStorage();
+        UUID id = patchMap.get(APDataComponents.CHUNKY_ID.get());
+        if (id == null) {
+            id = UUID.randomUUID();
+            patchMap.set(APDataComponents.CHUNKY_ID.get(), id);
+            this.putDataStorage(patchMap.asPatch());
+        }
+        return id;
+    }
+
     @Override
     public <T> T withPlayer(APFakePlayer.Action<T> function) throws LuaException {
         return FakePlayerProviderTurtle.withPlayer(turtle, function);
@@ -106,9 +121,8 @@ public void destroyUpgrade() {
     @Override
     public boolean isMovementPossible(@NotNull Level level, @NotNull BlockPos pos) {
         try {
-            return FakePlayerProviderTurtle.withPlayer(turtle, player -> {
+            return this.withPlayer(player -> {
                 if (!level.isInWorldBounds(pos)) return false;
-                if (!level.hasChunkAt(pos)) return false;
                 return level.getWorldBorder().isWithinBounds(pos);
             });
         } catch (LuaException e) {

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

@@ -6,17 +6,13 @@
 import dan200.computercraft.api.turtle.TurtleSide;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.TurtlePeripheralOwner;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
-import de.srendi.advancedperipherals.common.setup.APDataComponents;
 import de.srendi.advancedperipherals.common.util.ChunkManager;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
-import net.minecraft.core.component.PatchedDataComponentMap;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.UUID;
-
 public class ChunkyPeripheral extends BasePeripheral<TurtlePeripheralOwner> {
 
     public static final String PERIPHERAL_TYPE = "chunky";
@@ -26,17 +22,6 @@ public ChunkyPeripheral(ITurtleAccess turtle, TurtleSide side) {
         super(PERIPHERAL_TYPE, new TurtlePeripheralOwner(turtle, side));
     }
 
-    protected UUID getUUID() {
-        PatchedDataComponentMap patchMap = owner.getPatchedDataStorage();
-        UUID id = patchMap.get(APDataComponents.CHUNKY_ID.get());
-        if (id == null) {
-            id = UUID.randomUUID();
-            patchMap.set(APDataComponents.CHUNKY_ID.get(), id);
-            owner.putDataStorage(patchMap.asPatch());
-        }
-        return id;
-    }
-
     public ChunkPos getChunkPos() {
         return new ChunkPos(getPos());
     }
@@ -58,22 +43,22 @@ public void update() {
         ChunkManager manager = ChunkManager.get(level.getServer());
         ChunkPos currentChunk = getChunkPos();
         setLoadedChunk(currentChunk, manager, level);
-        manager.touch(getUUID());
+        manager.touch(owner.getChunkLoadUUID());
     }
 
     protected void setLoadedChunk(@Nullable ChunkPos newChunk, ChunkManager manager, ServerLevel level) {
         if (loadedCentralChunk != null) {
             if (loadedCentralChunk.equals(newChunk)) {
                 return;
             }
-            manager.removeForceChunk(level, getUUID());
+            manager.removeForceChunk(level, owner.getChunkLoadUUID());
             // Should not be used
             // level.setChunkForced(loadedChunk.x, loadedChunk.z, false);
             loadedCentralChunk = null;
         }
         if (newChunk != null) {
             loadedCentralChunk = newChunk;
-            manager.addForceChunk(level, getUUID(), loadedCentralChunk);
+            manager.addForceChunk(level, owner.getChunkLoadUUID(), loadedCentralChunk);
             // Should not be used
             // level.setChunkForced(newChunk.x, newChunk.z, true);
         }

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

@@ -13,6 +13,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.entity.TurtleEnderPearl;
 import de.srendi.advancedperipherals.common.setup.APDataComponents;
+import de.srendi.advancedperipherals.common.util.ChunkManager;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.common.util.Pair;
 import de.srendi.advancedperipherals.common.util.ServerWorker;
@@ -23,6 +24,9 @@
 import net.minecraft.core.GlobalPos;
 import net.minecraft.core.component.PatchedDataComponentMap;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
@@ -113,7 +117,7 @@ public final MethodResult deletePoint(String name) {
     }
 
     @LuaFunction(mainThread = true)
-    public final Collection<String> points() {
+    public final Collection<String> listPoints() {
         Map<String, GlobalPos> data = getPointDatas();
         return data.keySet();
     }
@@ -127,11 +131,12 @@ public final MethodResult warpToPoint(String name) throws LuaException {
 
         TurtlePeripheralOwner owner = automataCore.getPeripheralOwner();
         GlobalPos globalPos = pairData.right();
-        Level newLevel = owner.getLevel().getServer().getLevel(globalPos.dimension());
+        MinecraftServer server = owner.getLevel().getServer();
+        ServerLevel newLevel = server.getLevel(globalPos.dimension());
         BlockPos newPosition = globalPos.pos();
 
         return automataCore.withOperation(WARP, getWarpContext(globalPos.dimension(), newPosition), context -> {
-            // TODO: load destination
+            ChunkManager.get(server).addForceChunk(newLevel, owner.getChunkLoadUUID(), new ChunkPos(newPosition));
             boolean result = owner.move(newLevel, newPosition);
             if (!result) {
                 return MethodResult.of(null, "Cannot teleport to location");