Way too much

adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java

@@ -573,7 +573,7 @@ public class Iris extends VolmitPlugin implements Listener, ReloadAware {
     }
 
     private static String logPrefix(Iris plugin) {
-        return plugin == null ? "[Iris] " : plugin.getTag();
+        return plugin == null ? ComponentLog.discriminator("Iris", "&a") : plugin.getTag();
     }
 
     /**

adapters/bukkit/plugin/src/main/java/art/arcane/iris/IrisBootstrap.java

@@ -9,6 +9,7 @@ import art.arcane.iris.core.lifecycle.WorldReplacementBootstrap;
 import art.arcane.iris.core.lifecycle.WorldReplacementBootstrapMarker;
 import art.arcane.iris.core.pack.DefaultPackBootstrapProvisioner;
 import art.arcane.iris.core.pack.DefaultPackBootstrapProvisioner.ProvisionResult;
+import art.arcane.iris.util.common.misc.SlimJar;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;
@@ -26,6 +27,7 @@ public final class IrisBootstrap implements PluginBootstrap {
     public void bootstrap(BootstrapContext context) {
         WorldReplacementBootstrapMarker.markBootstrapped();
         try {
+            loadRuntimeLibraries(context);
             BukkitStartupPaths startupPaths = BukkitStartupPaths.resolveCurrent();
             reconcilePendingWorldReplacements(context, startupPaths);
             quarantineWorthlessHusks(startupPaths, message -> context.getLogger().warn(message));
@@ -38,6 +40,27 @@ public final class IrisBootstrap implements PluginBootstrap {
         }
     }
 
+    private static void loadRuntimeLibraries(BootstrapContext context) {
+        SlimJar.loadBootstrap(
+                context.getDataDirectory().resolve("cache").resolve("libraries"),
+                new SlimJar.BootstrapLogger() {
+                    @Override
+                    public void info(String message) {
+                        context.getLogger().info(message);
+                    }
+
+                    @Override
+                    public void error(String message) {
+                        context.getLogger().error(message);
+                    }
+
+                    @Override
+                    public void debug(String message) {
+                        context.getLogger().debug(message);
+                    }
+                });
+    }
+
     private static void reconcilePendingWorldReplacements(
             BootstrapContext context,
             BukkitStartupPaths startupPaths

adapters/bukkit/plugin/src/main/java/art/arcane/iris/IrisPluginLoader.java

@@ -0,0 +1,69 @@
+package art.arcane.iris;
+
+import art.arcane.iris.util.common.misc.SlimJar;
+import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
+import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
+import io.papermc.paper.plugin.loader.PluginLoader;
+import io.papermc.paper.plugin.loader.library.impl.JarLibrary;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+@SuppressWarnings("UnstableApiUsage")
+public final class IrisPluginLoader implements PluginLoader {
+    @Override
+    public void classloader(PluginClasspathBuilder classpathBuilder) {
+        PluginProviderContext context = classpathBuilder.getContext();
+        Path libraryRoot = context.getDataDirectory().resolve("cache").resolve("libraries");
+        SlimJar.loadBootstrap(libraryRoot, new SlimJar.BootstrapLogger() {
+            @Override
+            public void info(String message) {
+                context.getLogger().info(message);
+            }
+
+            @Override
+            public void error(String message) {
+                context.getLogger().error(message);
+            }
+
+            @Override
+            public void debug(String message) {
+                context.getLogger().debug(message);
+            }
+        });
+        for (Path library : relocatedLibraries(libraryRoot)) {
+            classpathBuilder.addLibrary(new JarLibrary(library));
+        }
+    }
+
+    static List<Path> relocatedLibraries(Path libraryRoot) {
+        try (Stream<Path> paths = Files.walk(libraryRoot)) {
+            List<Path> libraries = paths
+                    .filter(Files::isRegularFile)
+                    .filter(path -> path.getFileName().toString().endsWith(".jar"))
+                    .filter(IrisPluginLoader::isRelocatedLibrary)
+                    .sorted()
+                    .toList();
+            if (libraries.isEmpty()) {
+                throw new IllegalStateException("Iris runtime library provisioning produced no relocated libraries.");
+            }
+            return libraries;
+        } catch (IOException failure) {
+            throw new IllegalStateException("Unable to enumerate provisioned Iris runtime libraries.", failure);
+        }
+    }
+
+    private static boolean isRelocatedLibrary(Path path) {
+        int count = path.getNameCount();
+        for (int i = 0; i < count - 2; i++) {
+            if ("relocated".equals(path.getName(i).toString())
+                    && "Iris".equals(path.getName(i + 1).toString())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

adapters/bukkit/plugin/src/main/java/art/arcane/iris/core/commands/CommandStudio.java

@@ -96,6 +96,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -412,7 +413,8 @@ public class CommandStudio implements DirectorExecutor {
             return;
         }
 
-        VisionGUI.launch(IrisToolbelt.access(world).getEngine());
+        UUID openerId = sender().isPlayer() ? player().getUniqueId() : null;
+        VisionGUI.launch(IrisToolbelt.access(world).getEngine(), openerId);
         sender().sendMessage(IrisLanguage.text(BukkitCommandMessagesExtended.COMMAND_STUDIO_OPENING_MAP));
     }
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/core/gui/BukkitGuiHost.java

@@ -30,6 +30,7 @@ import org.bukkit.event.Listener;
 
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class BukkitGuiHost implements GuiHost.Provider {
@@ -72,8 +73,8 @@ public final class BukkitGuiHost implements GuiHost.Provider {
     }
 
     @Override
-    public GuiOverlay overlayFor(Engine engine) {
-        return engine == null ? null : new BukkitVisionOverlay(engine);
+    public GuiOverlay overlayFor(Engine engine, UUID openerId) {
+        return engine == null ? null : new BukkitVisionOverlay(engine, openerId);
     }
 
     private static final class HotloadListener implements Listener {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/core/gui/BukkitVisionOverlay.java

@@ -18,7 +18,6 @@
 
 package art.arcane.iris.core.gui;
 
-import art.arcane.iris.core.runtime.WorldRuntimeControlService;
 import art.arcane.iris.engine.IrisComplex;
 import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.framework.render.RenderType;
@@ -28,7 +27,6 @@ import art.arcane.iris.platform.bukkit.BukkitWorldBinding;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.format.Form;
-import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.LivingEntity;
@@ -39,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -50,14 +49,16 @@ import static art.arcane.iris.util.common.data.registry.Attributes.MAX_HEALTH;
 
 public final class BukkitVisionOverlay implements GuiOverlay {
     private final Engine engine;
+    private final UUID openerId;
     private final AtomicBoolean nativeTeleportActive = new AtomicBoolean();
     private final AtomicBoolean playerRefreshQueued = new AtomicBoolean();
     private final AtomicLong teleportSequence = new AtomicLong();
     private final AtomicReference<VisionTeleportRequest> latestTeleport = new AtomicReference<>();
     private volatile List<GuiMarker> playerMarkers = List.of();
 
-    public BukkitVisionOverlay(Engine engine) {
+    public BukkitVisionOverlay(Engine engine, UUID openerId) {
         this.engine = engine;
+        this.openerId = openerId;
     }
 
     /**
@@ -177,67 +178,20 @@ public final class BukkitVisionOverlay implements GuiOverlay {
                 return;
             }
             List<Player> players = BukkitWorldBinding.players(target);
-            if (players.isEmpty()) {
+            Player player = selectPlayer(players);
+            if (player == null) {
                 finish(request);
                 return;
             }
-            Player player = players.get(0);
-            requestTeleportChunk(request, target, player, world);
-        });
-        if (!scheduled) {
-            finish(request);
-        }
-    }
-
-    private void requestTeleportChunk(
-            VisionTeleportRequest request,
-            IrisWorld target,
-            Player player,
-            World world
-    ) {
-        int blockX = request.blockX;
-        int blockZ = request.blockZ;
-        int chunkX = blockX >> 4;
-        int chunkZ = blockZ >> 4;
-        CompletableFuture<Chunk> requested;
-        try {
-            requested = WorldRuntimeControlService.get().requestChunkAsync(
-                    world,
-                    chunkX,
-                    chunkZ,
-                    true,
-                    true
-            );
-        } catch (Throwable failure) {
-            fail(request, target, world, failure);
-            return;
-        }
-        if (requested == null) {
-            fail(request, target, world, new IllegalStateException(
-                    "Vision destination chunk request returned no future."));
-            return;
-        }
-        requested.whenComplete((chunk, failure) -> {
-            if (!isCurrent(request, target)) {
-                finish(request);
-                return;
-            }
-            if (failure != null) {
-                fail(request, target, world, failure);
-                return;
-            }
-            if (chunk == null || chunk.getWorld() != world) {
-                fail(request, target, world, new IllegalStateException(
-                        "Vision destination chunk request returned no chunk."));
-                return;
-            }
-            boolean scheduled = J.runRegion(world, chunkX, chunkZ, () -> {
-                if (!isCurrent(request, target)) {
-                    finish(request);
-                    return;
-                }
-                int yy = world.getHighestBlockYAt(blockX, blockZ) + 1;
-                Location destination = new Location(world, blockX, yy, blockZ);
+            int blockX = request.blockX;
+            int blockZ = request.blockZ;
+            try {
+                int blockY = engine.getMinHeight() + engine.getHeight(blockX, blockZ, false) + 2;
+                Location destination = new Location(
+                        world,
+                        blockX + 0.5D,
+                        blockY,
+                        blockZ + 0.5D);
                 if (!J.runEntity(player, () -> delegateTeleport(
                         request,
                         target,
@@ -247,12 +201,25 @@ public final class BukkitVisionOverlay implements GuiOverlay {
                     fail(request, target, world, new IllegalStateException(
                             "Failed to schedule the Vision teleport on the player entity."));
                 }
-            });
-            if (!scheduled) {
-                fail(request, target, world, new IllegalStateException(
-                        "Failed to schedule the Vision surface lookup on its owning region."));
+            } catch (Throwable failure) {
+                fail(request, target, world, failure);
             }
         });
+        if (!scheduled) {
+            finish(request);
+        }
+    }
+
+    private Player selectPlayer(List<Player> players) {
+        if (openerId == null) {
+            return players.isEmpty() ? null : players.get(0);
+        }
+        for (Player player : players) {
+            if (openerId.equals(player.getUniqueId())) {
+                return player;
+            }
+        }
+        return null;
     }
 
     private void delegateTeleport(

adapters/bukkit/plugin/src/main/resources/paper-plugin.yml

@@ -2,6 +2,7 @@ name: ${name}
 version: ${version}
 main: ${main}
 bootstrapper: ${bootstrapper}
+loader: art.arcane.iris.IrisPluginLoader
 folia-supported: true
 api-version: '${apiVersion}'
 load: STARTUP