Virtual Machine Support

Author: PulseBeat02

mcav-common/src/main/java/me/brandonli/mcav/media/player/vm/VMConfiguration.java

@@ -17,8 +17,9 @@
  */
 package me.brandonli.mcav.media.player.vm;
 
-import java.util.*;
-import org.checkerframework.checker.nullness.qual.KeyFor;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A builder class for creating QEMU virtual machine configurations.
@@ -27,10 +28,10 @@
  */
 public class VMConfiguration {
 
-  private final Map<String, String> options;
+  private final List<String> arguments;
 
   private VMConfiguration() {
-    this.options = new HashMap<>();
+    this.arguments = new ArrayList<>();
   }
 
   /**
@@ -49,8 +50,7 @@ public static VMConfiguration builder() {
    * @return this builder instance
    */
   public VMConfiguration memory(final int memoryMB) {
-    this.options.put("m", memoryMB + "M");
-    return this;
+    return this.option("m", memoryMB + "M");
   }
 
   /**
@@ -61,8 +61,7 @@ public VMConfiguration memory(final int memoryMB) {
    * @return this builder instance
    */
   public VMConfiguration memory(final int amount, final String unit) {
-    this.options.put("m", amount + unit);
-    return this;
+    return this.option("m", amount + unit);
   }
 
   /**
@@ -72,8 +71,7 @@ public VMConfiguration memory(final int amount, final String unit) {
    * @return this builder instance
    */
   public VMConfiguration cores(final int cores) {
-    this.options.put("smp", String.valueOf(cores));
-    return this;
+    return this.option("smp", String.valueOf(cores));
   }
 
   /**
@@ -83,8 +81,7 @@ public VMConfiguration cores(final int cores) {
    * @return this builder instance
    */
   public VMConfiguration cdrom(final String isoPath) {
-    this.options.put("cdrom", isoPath);
-    return this;
+    return this.option("cdrom", isoPath);
   }
 
   /**
@@ -94,8 +91,7 @@ public VMConfiguration cdrom(final String isoPath) {
    * @return this builder instance
    */
   public VMConfiguration hda(final String hdaPath) {
-    this.options.put("hda", hdaPath);
-    return this;
+    return this.option("hda", hdaPath);
   }
 
   /**
@@ -105,8 +101,7 @@ public VMConfiguration hda(final String hdaPath) {
    * @return this builder instance
    */
   public VMConfiguration hdb(final String hdbPath) {
-    this.options.put("hdb", hdbPath);
-    return this;
+    return this.option("hdb", hdbPath);
   }
 
   /**
@@ -116,8 +111,7 @@ public VMConfiguration hdb(final String hdbPath) {
    * @return this builder instance
    */
   public VMConfiguration boot(final String bootOrder) {
-    this.options.put("boot", bootOrder);
-    return this;
+    return this.option("boot", bootOrder);
   }
 
   /**
@@ -127,8 +121,7 @@ public VMConfiguration boot(final String bootOrder) {
    * @return this builder instance
    */
   public VMConfiguration network(final String netConfig) {
-    this.options.put("net", netConfig);
-    return this;
+    return this.option("net", netConfig);
   }
 
   /**
@@ -138,8 +131,7 @@ public VMConfiguration network(final String netConfig) {
    * @return this builder instance
    */
   public VMConfiguration cpu(final String model) {
-    this.options.put("cpu", model);
-    return this;
+    return this.option("cpu", model);
   }
 
   /**
@@ -149,8 +141,7 @@ public VMConfiguration cpu(final String model) {
    * @return this builder instance
    */
   public VMConfiguration machine(final String machineType) {
-    this.options.put("machine", machineType);
-    return this;
+    return this.option("machine", machineType);
   }
 
   /**
@@ -161,10 +152,10 @@ public VMConfiguration machine(final String machineType) {
    */
   public VMConfiguration kvm(final boolean enable) {
     if (enable) {
-      this.options.put("enable-kvm", "");
-    } else {
-      this.options.remove("enable-kvm");
+      return this.flag("enable-kvm");
     }
+    // Remove the flag if it exists
+    this.arguments.removeIf(arg -> arg.equals("-enable-kvm"));
     return this;
   }
 
@@ -175,8 +166,7 @@ public VMConfiguration kvm(final boolean enable) {
    * @return this builder instance
    */
   public VMConfiguration display(final String displayType) {
-    this.options.put("display", displayType);
-    return this;
+    return this.option("display", displayType);
   }
 
   /**
@@ -187,10 +177,10 @@ public VMConfiguration display(final String displayType) {
    */
   public VMConfiguration graphics(final boolean enable) {
     if (!enable) {
-      this.options.put("nographic", "");
-    } else {
-      this.options.remove("nographic");
+      return this.flag("nographic");
     }
+    // Remove the flag if it exists
+    this.arguments.removeIf(arg -> arg.equals("-nographic"));
     return this;
   }
 
@@ -201,8 +191,7 @@ public VMConfiguration graphics(final boolean enable) {
    * @return this builder instance
    */
   public VMConfiguration audio(final String driver) {
-    this.options.put("audio", driver);
-    return this;
+    return this.option("audio", driver);
   }
 
   /**
@@ -222,8 +211,7 @@ public VMConfiguration diskSize(final int size) {
    * @return this builder instance
    */
   public VMConfiguration diskSize(final String size) {
-    this.options.put("drive", "file=fat:rw:" + size);
-    return this;
+    return this.option("drive", "file=fat:rw:" + size);
   }
 
   /**
@@ -234,7 +222,13 @@ public VMConfiguration diskSize(final String size) {
    * @return this builder instance
    */
   public VMConfiguration option(final String key, final String value) {
-    this.options.put(key, value);
+    this.arguments.removeIf(arg -> arg.equals("-" + key));
+    final int valueIndex = this.arguments.indexOf("-" + key) + 1;
+    if (valueIndex > 0 && valueIndex < this.arguments.size()) {
+      this.arguments.remove(valueIndex);
+    }
+    this.arguments.add("-" + key);
+    this.arguments.add(value);
     return this;
   }
 
@@ -245,17 +239,19 @@ public VMConfiguration option(final String key, final String value) {
    * @return this builder instance
    */
   public VMConfiguration flag(final String flag) {
-    this.options.put(flag, "");
+    if (!this.arguments.contains("-" + flag)) {
+      this.arguments.add("-" + flag);
+    }
     return this;
   }
 
   /**
-   * Returns an unmodifiable view of the configuration options.
+   * Returns an unmodifiable view of the configuration arguments.
    *
-   * @return the configured options
+   * @return the configured arguments list
    */
-  public Map<String, String> getOptions() {
-    return Collections.unmodifiableMap(this.options);
+  public List<String> getArguments() {
+    return Collections.unmodifiableList(this.arguments);
   }
 
   /**
@@ -264,16 +260,6 @@ public Map<String, String> getOptions() {
    * @return a string array of QEMU arguments
    */
   public String[] buildArgs() {
-    final List<String> args = new ArrayList<>();
-    final Set<Map.Entry<@KeyFor("this.options") String, String>> entries = this.options.entrySet();
-    for (final Map.Entry<String, String> entry : entries) {
-      final String key = entry.getKey();
-      final String value = entry.getValue();
-      args.add("-" + key);
-      if (!value.isEmpty()) {
-        args.add(value);
-      }
-    }
-    return args.toArray(new String[0]);
+    return this.arguments.toArray(new String[0]);
   }
 }

sandbox/src/main/java/me/brandonli/mcav/sandbox/command/AnnotationParserHandler.java

@@ -41,7 +41,8 @@ public final class AnnotationParserHandler {
     new VideoControlCommand(),
     new VideoEntityCommand(),
     new VideoChatCommand(),
-    new VideoScoreboardCommand()
+    new VideoScoreboardCommand(),
+    new VirtualizeCommand()
   );
 
   private final CommandManager<CommandSender> manager;

sandbox/src/main/java/me/brandonli/mcav/sandbox/command/BrowserCommand.java

@@ -37,13 +37,13 @@
 import me.brandonli.mcav.sandbox.utils.ArgumentUtils;
 import me.brandonli.mcav.sandbox.utils.DitheringArgument;
 import me.brandonli.mcav.utils.immutable.Pair;
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.incendo.cloud.annotation.specifier.Greedy;
 import org.incendo.cloud.annotation.specifier.Quoted;
 import org.incendo.cloud.annotation.specifier.Range;
 import org.incendo.cloud.annotations.*;
+import org.incendo.cloud.bukkit.data.MultiplePlayerSelector;
 
 public final class BrowserCommand implements AnnotationCommandFeature {
 
@@ -55,7 +55,7 @@ public void registerFeature(final MCAVSandbox plugin, final AnnotationParser<Com
   @Command("mcav browser release")
   @Permission("mcav.browser.release")
   @CommandDescription("mcav.command.browser.release.info")
-  public void playBrowser(final CommandSender player) {
+  public void releaseBrowser(final CommandSender player) {
     if (this.browser != null) {
       try {
         this.browser.release();
@@ -67,16 +67,17 @@ public void playBrowser(final CommandSender player) {
     player.sendMessage(Message.RELEASE_BROWSER.build());
   }
 
-  @Command("mcav browser create <browserResolution> <blockDimensions> <mapId> <ditheringAlgorithm> <url>")
+  @Command("mcav browser create <playerSelector> <browserResolution> <blockDimensions> <mapId> <ditheringAlgorithm> <url>")
   @Permission("mcav.command.browser.create")
   @CommandDescription("mcav.command.browser.create.info")
   public void playBrowser(
     final CommandSender player,
+    final MultiplePlayerSelector playerSelector,
     @Argument(suggestions = "resolutions") @Quoted final String browserResolution,
     @Argument(suggestions = "dimensions") @Quoted final String blockDimensions,
     @Argument(suggestions = "ids") @Range(min = "0") final int mapId,
     final DitheringArgument ditheringAlgorithm,
-    @Quoted final String url
+    @Greedy final String url
   ) {
     final Pair<Integer, Integer> resolution;
     final Pair<Integer, Integer> dimensions;
@@ -115,7 +116,7 @@ public void playBrowser(
     final int blockWidth = dimensions.getFirst();
     final int blockHeight = dimensions.getSecond();
 
-    final Collection<UUID> players = Bukkit.getOnlinePlayers().stream().map(Player::getUniqueId).toList();
+    final Collection<UUID> players = ArgumentUtils.parsePlayerSelectors(playerSelector);
     final MapConfiguration configuration = MapConfiguration.builder()
       .map(mapId)
       .mapBlockHeight(blockHeight)