Interaction Working

Author: PulseBeat02

TODO

@@ -1,5 +1,4 @@
 High Priority Tasks:
-  - Fix Interaction Support for Virtual Machine and Browser Maps
   - Rewrite all JavaDocs / Code Clean Up
   - Write Documentation for Plugin
 

mcav-common/src/main/java/me/brandonli/mcav/media/player/driver/ChromeDriverPlayer.java

@@ -30,6 +30,7 @@
 import me.brandonli.mcav.media.source.BrowserSource;
 import me.brandonli.mcav.utils.ExecutorUtils;
 import org.openqa.selenium.Dimension;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -106,7 +107,10 @@ private void startScreenCapture() {
     final int width = metadata.getVideoWidth();
     final int height = metadata.getVideoHeight();
     final Dimension size = new Dimension(width, height);
-    this.driver.manage().window().setSize(size);
+    final WebDriver.Options options = this.driver.manage();
+    final WebDriver.Window window = options.window();
+    window.setSize(size);
+    window.maximize();
 
     final String resource = this.source.getResource();
     this.driver.get(resource);
@@ -172,11 +176,17 @@ public void sendMouseEvent(final int x, final int y, final MouseClick type) {
 
   private int[] translateCoordinates(final int x, final int y) {
     final VideoMetadata videoMetadata = this.source.getMetadata();
-    final int targetWidth = videoMetadata.getVideoWidth();
-    final int targetHeight = videoMetadata.getVideoHeight();
-    final int newX = (int) (((float) x / this.frameWidth) * targetWidth);
-    final int newY = (int) (((float) y / this.frameHeight) * targetHeight);
-    return new int[] { newX, newY };
+    final int sourceWidth = videoMetadata.getVideoWidth();
+    final int sourceHeight = videoMetadata.getVideoHeight();
+    final int targetWidth = (int) this.frameWidth;
+    final int targetHeight = (int) this.frameHeight;
+    final double widthRatio = (double) targetWidth / sourceWidth;
+    final double heightRatio = (double) targetHeight / sourceHeight;
+    final int newX = (int) (x * widthRatio);
+    final int newY = (int) (y * heightRatio);
+    final int clampedX = Math.clamp(newX, 0, targetWidth - 1);
+    final int clampedY = Math.clamp(newY, 0, targetHeight - 1);
+    return new int[] { clampedX, clampedY };
   }
 
   /**

mcav-common/src/main/java/me/brandonli/mcav/media/player/driver/ChromeDriverServiceProvider.java

@@ -48,7 +48,7 @@ public final class ChromeDriverServiceProvider {
     manager.clearResolutionCache();
     manager.cachePath(raw);
     manager.setup();
-    SERVICE = new ChromeDriverService.Builder().withLogLevel(ChromiumDriverLogLevel.DEBUG).usingAnyFreePort().build();
+    SERVICE = new ChromeDriverService.Builder().withLogLevel(ChromiumDriverLogLevel.WARNING).usingAnyFreePort().build();
   }
 
   private ChromeDriverServiceProvider() {

mcav-common/src/main/java/me/brandonli/mcav/media/player/vnc/VNCPlayerImpl.java

@@ -196,16 +196,20 @@ public void moveMouse(final int x, final int y) {
   }
 
   private int[] translateCoordinates(final int x, final int y) {
-    final int originWidth = this.videoMetadata.getVideoWidth();
-    final int originHeight = this.videoMetadata.getVideoHeight();
     if (this.current == null) {
       throw new PlayerException("VNC source not started!");
     }
+    final int sourceWidth = this.videoMetadata.getVideoWidth();
+    final int sourceHeight = this.videoMetadata.getVideoHeight();
     final int targetWidth = this.current.getWidth();
     final int targetHeight = this.current.getHeight();
-    final int newX = (int) (((float) x / originWidth) * targetWidth);
-    final int newY = (int) (((float) y / originHeight) * targetHeight);
-    return new int[] { newX, newY };
+    final double widthRatio = (double) targetWidth / sourceWidth;
+    final double heightRatio = (double) targetHeight / sourceHeight;
+    final int newX = (int) (x * widthRatio);
+    final int newY = (int) (y * heightRatio);
+    final int clampedX = Math.clamp(newX, 0, targetWidth - 1);
+    final int clampedY = Math.clamp(newY, 0, targetHeight - 1);
+    return new int[] { clampedX, clampedY };
   }
 
   /**

sandbox/src/main/java/me/brandonli/mcav/sandbox/command/interaction/AbstractInteractiveCommand.java

@@ -18,6 +18,7 @@
 package me.brandonli.mcav.sandbox.command.interaction;
 
 import io.papermc.paper.event.player.AsyncChatEvent;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -27,7 +28,10 @@
 import me.brandonli.mcav.sandbox.utils.Keys;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.bukkit.FluidCollisionMode;
+import org.bukkit.Location;
 import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
@@ -63,6 +67,10 @@ public void registerFeature(final MCAVSandbox plugin, final AnnotationParser<Com
 
   @Override
   public void shutdown() {
+    if (this.player != null) {
+      this.releasePlayer();
+      this.player = null;
+    }
     HandlerList.unregisterAll(this);
   }
 
@@ -74,31 +82,37 @@ public void onBlockBreak(final BlockBreakEvent event) {
     }
 
     final Player mcPlayer = event.getPlayer();
-    if (!this.activePlayers.contains(mcPlayer)) {
-      return;
-    }
-
-    final RayTraceResult entityRay = mcPlayer.rayTraceEntities(100, false);
+    final RayTraceResult entityRay = mcPlayer.rayTraceBlocks(100, FluidCollisionMode.NEVER);
     if (entityRay == null) {
       return;
     }
 
-    final Entity entity = entityRay.getHitEntity();
-    if (!(entity instanceof final ItemFrame frame)) {
+    final Block block = entityRay.getHitBlock();
+    if (block == null) {
       return;
     }
 
-    final PersistentDataContainer data = frame.getPersistentDataContainer();
-    if (!data.has(Keys.MAP_KEY, PersistentDataType.BOOLEAN)) {
+    final Location blockLocation = block.getLocation();
+    final World world = blockLocation.getWorld();
+    final Collection<Entity> entities = world.getNearbyEntities(blockLocation, 0.5, 0.5, 0.5);
+    for (final Entity entity : entities) {
+      if (!(entity instanceof final ItemFrame frame)) {
+        continue;
+      }
+
+      final PersistentDataContainer data = frame.getPersistentDataContainer();
+      if (!data.has(Keys.MAP_KEY, PersistentDataType.BOOLEAN)) {
+        continue;
+      }
+      event.setCancelled(true);
+
+      final int[] coordinates = InteractUtils.getBoardCoordinates(mcPlayer, frame);
+      final int x = coordinates[0];
+      final int y = coordinates[1];
+      this.handleLeftClick(player, x, y);
+
       return;
     }
-    event.setCancelled(true);
-
-    final Block block = event.getBlock();
-    final int[] coordinates = InteractUtils.getBoardCoordinates(mcPlayer);
-    final int x = coordinates[0];
-    final int y = coordinates[1];
-    this.handleLeftClick(player, x, y);
   }
 
   @EventHandler
@@ -166,6 +180,7 @@ public void onChatMessage(final AsyncChatEvent event) {
     if (player == null) {
       return;
     }
+    event.setCancelled(true);
 
     final Component message = event.message();
     final String raw = PLAIN_TEXT_SERIALIZER.serialize(message);

sandbox/src/main/java/me/brandonli/mcav/sandbox/utils/InteractUtils.java

@@ -38,7 +38,14 @@ private InteractUtils() {
 
   public static int[] getBoardCoordinates(final Player player) {
     final Entity firstEntity = player.getTargetEntity(100);
-    if (!(firstEntity instanceof final ItemFrame frame)) {
+    if (firstEntity == null) {
+      throw new IllegalArgumentException("No target entity found within range");
+    }
+    return getBoardCoordinates(player, firstEntity);
+  }
+
+  public static int[] getBoardCoordinates(final Player player, final Entity entity) {
+    if (!(entity instanceof final ItemFrame frame)) {
       throw new IllegalArgumentException("Target entity is not an ItemFrame");
     }