✨ Added Stream Support for Plugin (Supposedly Working, Need to Test +…

… Add Discord Support)

api/src/main/java/io/github/pulsebeat02/ezmediacore/player/VideoPlayer.java

@@ -57,9 +57,14 @@ public interface VideoPlayer extends LibraryInjectable, Viewable, Dimensional {
   void setCallback(@NotNull final Callback callback);
 
   @NotNull
-  MrlConfiguration getMrlConfiguration();
+  MrlConfiguration getDirectVideoMrl();
 
-  void setMrlConfiguration(@NotNull final MrlConfiguration configuration);
+  void setDirectVideoMrl(@NotNull final MrlConfiguration configuration);
+
+  @NotNull
+  MrlConfiguration getDirectAudioMrl();
+
+  void setDirectAudioMrl(@NotNull final MrlConfiguration configuration);
 
   @NotNull
   FrameConfiguration getFrameConfiguration();

deluxemediaplugin/src/main/java/io/github/pulsebeat02/deluxemediaplugin/command/video/VideoCommand.java

@@ -46,7 +46,6 @@
 import io.github.pulsebeat02.ezmediacore.resourcepack.ResourcepackSoundWrapper;
 import io.github.pulsebeat02.ezmediacore.resourcepack.hosting.HttpServer;
 import io.github.pulsebeat02.ezmediacore.utility.HashingUtils;
-import io.github.pulsebeat02.ezmediacore.utility.PathUtils;
 import io.github.pulsebeat02.ezmediacore.utility.ResourcepackUtils;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -130,7 +129,7 @@ private int playVideo(@NotNull final CommandContext<CommandSender> context) {
 			case DEBUG_HIGHLIGHTS -> {
 				if (sender instanceof Player) {
 					this.attributes.setPlayer(
-							this.builder.createBlockHighlightPlayer((Player) sender, players));
+							this.builder.createBlockHighlightPlayer((Player) sender));
 				} else {
 					audience.sendMessage(format(text("You must be a player to execute this command!", RED)));
 					return SINGLE_SUCCESS;
@@ -156,7 +155,7 @@ private int playVideo(@NotNull final CommandContext<CommandSender> context) {
 			default -> throw new IllegalArgumentException("Illegal Audio Output!");
 		}
 
-		this.attributes.getPlayer().setPlayerState(PlayerControls.START, MrlConfiguration.ofMrl(this.attributes.getVideoMrl()));
+		this.attributes.getPlayer().setPlayerState(PlayerControls.START, this.attributes.getVideoMrl());
 
 		return SINGLE_SUCCESS;
 	}
@@ -191,7 +190,7 @@ private int resumeVideo(@NotNull final CommandContext<CommandSender> context) {
 				.thenRunAsync(
 						() ->
 								ResourcepackUtils.forceResourcepackLoad(
-										plugin.library(), this.attributes.getUrl(), this.attributes.getHash()))
+										plugin.library(), this.attributes.getResourcepackUrl(), this.attributes.getResourcepackHash()))
 				.thenRun(() -> gold(audience, "Resumed the video!"));
 		return SINGLE_SUCCESS;
 	}
@@ -201,7 +200,7 @@ private void buildResourcepack(@NotNull final Audience audience) {
 		final JavaPlugin loader = plugin.getBootstrap();
 		try {
 			final HttpServer server = plugin.getHttpServer();
-			final Path audio = this.attributes.getAudio();
+			final Path audio = Path.of(this.attributes.getOggMrl().getMrl());
 			final Path ogg = audio.getParent().resolve("trimmed.ogg");
 			final long ms = this.attributes.getPlayer().getElapsedMilliseconds();
 			plugin.log("Resuming Video at %s Milliseconds!".formatted(ms));
@@ -214,8 +213,8 @@ private void buildResourcepack(@NotNull final Audience audience) {
 			wrapper.addSound(loader.getName().toLowerCase(Locale.ROOT), ogg);
 			wrapper.wrap();
 			final Path path = wrapper.getResourcepackFilePath();
-			this.attributes.setUrl(server.createUrl(path));
-			this.attributes.setHash(HashingUtils.createHashSHA(path).orElseThrow(AssertionError::new));
+			this.attributes.setResourcepackUrl(server.createUrl(path));
+			this.attributes.setResourcepackHash(HashingUtils.createHashSHA(path).orElseThrow(AssertionError::new));
 			Files.delete(audio);
 			Files.move(ogg, ogg.resolveSibling("audio.ogg"));
 		} catch (final IOException e) {
@@ -225,16 +224,16 @@ private void buildResourcepack(@NotNull final Audience audience) {
 	}
 
 	private boolean mediaNotSpecified(@NotNull final Audience audience) {
-		if (this.attributes.getVideoMrl() == null && !this.attributes.isYoutube()) {
-			red(audience, "File and URL not specified yet!");
+		if (this.attributes.getVideoMrl() == null) {
+			red(audience, "Video not loaded!");
 			return true;
 		}
 		return false;
 	}
 
 	private boolean mediaProcessingIncomplete(@NotNull final Audience audience) {
 		if (!this.attributes.getCompletion().get()) {
-			red(audience, "The video is still being processed!");
+			red(audience, "Video is still processing!");
 			return true;
 		}
 		return false;
@@ -250,13 +249,9 @@ private void releaseIfPlaying() {
 	}
 
 	private void sendPlayInformation(@NotNull final Audience audience) {
-		final String mrl = this.attributes.getVideoMrl();
+		final MrlConfiguration mrl = this.attributes.getVideoMrl();
 		if (mrl != null) {
-			if (this.attributes.isYoutube()) {
-				gold(audience, "Starting Video on URL: %s".formatted(mrl));
-			} else {
-				gold(audience, "Starting Video on File: %s".formatted(PathUtils.getName(Path.of(mrl))));
-			}
+			gold(audience, "Starting Video on MRL %s".formatted(mrl.getMrl()));
 		}
 	}
 

deluxemediaplugin/src/main/java/io/github/pulsebeat02/deluxemediaplugin/command/video/VideoCommandAttributes.java

@@ -26,8 +26,8 @@
 
 import io.github.pulsebeat02.deluxemediaplugin.command.dither.DitherSetting;
 import io.github.pulsebeat02.ezmediacore.ffmpeg.EnhancedExecution;
+import io.github.pulsebeat02.ezmediacore.player.MrlConfiguration;
 import io.github.pulsebeat02.ezmediacore.player.VideoPlayer;
-import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,21 +46,21 @@ public final class VideoCommandAttributes {
   private DitherSetting dither;
   private AudioOutputType audioOutputType;
   private VideoType mode;
-  private String video;
-  private Path audio;
+
+  private MrlConfiguration videoMrl;
+  private MrlConfiguration oggMrl;
 
   private EnhancedExecution extractor;
-  private boolean youtube;
-  private String mrl; // for file resource load video mrl
+
   private int map;
 
   private int frameWidth;
   private int frameHeight;
   private int pixelWidth;
   private int pixelHeight;
 
-  private String url; // for resourcepack url
-  private byte[] hash;
+  private String resourcepackUrl; // for resourcepack url
+  private byte[] resourcepackHash;
 
   public VideoCommandAttributes() {
     this.dither = DitherSetting.FILTER_LITE;
@@ -89,22 +89,6 @@ public void setPlayer(@NotNull final VideoPlayer player) {
     this.player = player;
   }
 
-  public @Nullable String getVideoMrl() {
-    return this.video;
-  }
-
-  public void setVideoMrl(@NotNull final String video) {
-    this.video = video;
-  }
-
-  public boolean isYoutube() {
-    return this.youtube;
-  }
-
-  public void setYoutube(final boolean youtube) {
-    this.youtube = youtube;
-  }
-
   public int getFrameWidth() {
     return this.frameWidth;
   }
@@ -165,36 +149,20 @@ public void setMode(@NotNull final VideoType mode) {
     this.mode = mode;
   }
 
-  public @Nullable String getUrl() {
-    return this.url;
-  }
-
-  public void setUrl(@NotNull final String url) {
-    this.url = url;
-  }
-
-  public byte @Nullable [] getHash() {
-    return this.hash;
-  }
-
-  public void setHash(final byte @NotNull [] hash) {
-    this.hash = hash;
+  public @Nullable String getResourcepackUrl() {
+    return this.resourcepackUrl;
   }
 
-  public @NotNull Path getAudio() {
-    return this.audio;
+  public void setResourcepackUrl(@NotNull final String resourcepackUrl) {
+    this.resourcepackUrl = resourcepackUrl;
   }
 
-  public void setAudio(@NotNull final Path audio) {
-    this.audio = audio;
+  public byte @Nullable [] getResourcepackHash() {
+    return this.resourcepackHash;
   }
 
-  public @NotNull String getMrl() {
-    return this.mrl;
-  }
-
-  public void setMrl(@NotNull final String mrl) {
-    this.mrl = mrl;
+  public void setResourcepackHash(final byte @NotNull [] resourcepackHash) {
+    this.resourcepackHash = resourcepackHash;
   }
 
   public EnhancedExecution getExtractor() {
@@ -212,4 +180,20 @@ public AudioOutputType getAudioOutputType() {
   public void setAudioOutputType(@NotNull final AudioOutputType audioOutputType) {
     this.audioOutputType = audioOutputType;
   }
+
+  public MrlConfiguration getVideoMrl() {
+    return this.videoMrl;
+  }
+
+  public void setVideoMrl(final MrlConfiguration videoMrl) {
+    this.videoMrl = videoMrl;
+  }
+
+  public MrlConfiguration getOggMrl() {
+    return this.oggMrl;
+  }
+
+  public void setOggMrl(final MrlConfiguration oggMrl) {
+    this.oggMrl = oggMrl;
+  }
 }

deluxemediaplugin/src/main/java/io/github/pulsebeat02/deluxemediaplugin/command/video/VideoCreator.java

@@ -112,7 +112,7 @@ public VideoCreator(
 	}
 
 	public @NotNull VideoPlayer createBlockHighlightPlayer(
-			@NotNull final Player sender, @NotNull final Collection<? extends Player> viewers) {
+			@NotNull final Player sender) {
 		return VideoBuilder.unspecified()
 				.callback(
 						CallbackBuilder.blockHighlight()