Linux Changes

Author: PulseBeat02

README.md

@@ -37,8 +37,9 @@ and chat. There is also an `installer` module that provides a simple way to inst
 `jda` module that integrates with the [Java Discord API](https://github.com/discord-jda/JDA), and a `http` module that
 integrates with [Javalin](https://github.com/javalin/javalin) to provide a simple way to stream videos over HTTP.
 
-The `sandbox` module only supports Paper and forks of it! However, any other aspect of the library can be used in any
+The `sandbox` plugin only supports Paper and forks of it! However, any other aspect of the library can be used in any
 Java context.
+
 ---
 
 ### Licensing

TODO

@@ -1,7 +1,5 @@
 Development Milestones
   - Build QEMU Statically for All Platforms
-  - Fix Linux Library Issues
-
   - Add Interaction Support for Virtual Machine
   - Add Interaction Support for Browser
   - Add Images and GIF Support into Plugin

build.gradle.kts

@@ -22,10 +22,13 @@ subprojects {
     apply(plugin = "com.github.node-gradle.node")
     apply(plugin = "com.diffplug.spotless")
 
+    val targetJavaVersion = 21
     java {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-        toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+        val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+        val language = JavaLanguageVersion.of(targetJavaVersion)
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+        toolchain.languageVersion.set(language)
     }
 
     tasks {
@@ -43,6 +46,7 @@ subprojects {
 
         withType<JavaCompile>().configureEach {
             val set = setOf("-parameters")
+            options.release.set(targetJavaVersion)
             options.compilerArgs.addAll(set)
             options.encoding = "UTF-8"
             options.isFork = true

docs/_toc.yml

@@ -18,7 +18,7 @@ parts:
       - file: image.md
       - file: ffmpeg.md
       - file: examples.md
-  - caption: MCAV Minecraft Module 🧱
+  - caption: MCAV Bukkit Module 🧱
     chapters:
       - file: minecraft.md
       - file: resourcepack.md

docs/minecraft.md

@@ -1,8 +1,12 @@
-## Minecraft Platform Module
+## Bukkit Platform Module
 
-The Minecraft platform module is an external module that provides Minecraft-specific playback for
+The Bukkit platform module is an external module that provides Minecraft-specific playback for
 players. There are several useful utilities to output video to maps, entities, scoreboards, and chat in this module.
 
+```{note}
+The Bukkit module only supports the latest version of Minecraft.
+```
+
 If you would like access to the Bukkit platform module, add the following dependency to the project instead of the
 `mcav-common` dependency:
 

docs/started.md

@@ -5,6 +5,10 @@
 MCAV is a Java library that can be used in any project. To get started, you need to add the MCAV dependency to your
 project. For more information about other modules, see the Minecraft or Installer documentation.
 
+```{note}
+All of MCAV's modules require at least Java 21 in order to run.
+```
+
 ```kts
 repositories {
     maven("https://repo.brandonli.me/snapshots")

mcav-bukkit/build.gradle.kts

@@ -23,21 +23,8 @@ dependencies {
     testImplementation(project(":mcav-common"))
 }
 
-val targetJavaVersion = 21
-java {
-    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    val language = JavaLanguageVersion.of(targetJavaVersion)
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
-    toolchain.languageVersion.set(language)
-}
-
 tasks {
 
-    withType<JavaCompile>().configureEach {
-        options.release.set(targetJavaVersion)
-    }
-
     java {
         withSourcesJar()
         withJavadocJar()

mcav-common/src/main/java/me/brandonli/mcav/capability/installer/vlc/github/ReleasePackage.java renamed to mcav-common/src/main/java/me/brandonli/mcav/CLibrary.java

@@ -15,23 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package me.brandonli.mcav.capability.installer.vlc.github;
+package me.brandonli.mcav;
 
-public final class ReleasePackage {
+import com.sun.jna.Library;
+import com.sun.jna.Native;
 
-  private final String url;
-  private final String hash;
+public interface CLibrary extends Library {
+  CLibrary INSTANCE = Native.load("c", CLibrary.class);
 
-  ReleasePackage(final String url, final String hash) {
-    this.url = url;
-    this.hash = hash;
-  }
-
-  public String getUrl() {
-    return this.url;
-  }
-
-  public String getHash() {
-    return this.hash;
-  }
+  int setenv(String name, String value, int overwrite);
 }

mcav-common/src/main/java/me/brandonli/mcav/LibraryInjector.java

@@ -29,9 +29,12 @@
 import me.brandonli.mcav.media.player.driver.ChromeDriverServiceProvider;
 import me.brandonli.mcav.media.player.multimedia.vlc.MediaPlayerFactoryProvider;
 import me.brandonli.mcav.media.player.pipeline.filter.video.dither.palette.Palette;
+import me.brandonli.mcav.utils.os.OS;
+import me.brandonli.mcav.utils.os.OSUtils;
 import org.bytedeco.ffmpeg.ffmpeg;
 import org.bytedeco.javacpp.Loader;
 import org.bytedeco.javacv.FFmpegLogCallback;
+import org.bytedeco.opencv.global.*;
 import org.bytedeco.opencv.opencv_java;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,16 +126,34 @@ private void loadMapCache() {
   private void loadModules() {
     final long start = System.currentTimeMillis();
     LOGGER.info("Loading JavaCV modules...");
-    final LibraryInjector injector = new LibraryInjector();
-    injector.load();
     FFmpegLogCallback.set();
     Loader.load(Loader.class);
-    Loader.load(opencv_java.class);
+    this.loadOpenCVModules();
     Loader.load(ffmpeg.class);
     final long end = System.currentTimeMillis();
     LOGGER.info("JavaCV modules loaded in {} ms", end - start);
   }
 
+  private void loadOpenCVModules() {
+    final OS os = OSUtils.getOS();
+    if (os == OS.LINUX) {
+      // avoid loading headless libraries
+      System.setProperty("org.bytedeco.javacpp.loadlibraries", "false");
+      Loader.load(opencv_core.class);
+      Loader.load(opencv_imgproc.class);
+      Loader.load(opencv_imgcodecs.class);
+      Loader.load(opencv_videoio.class);
+      Loader.load(opencv_video.class);
+      Loader.load(opencv_calib3d.class);
+      Loader.load(opencv_features2d.class);
+      Loader.load(opencv_objdetect.class);
+      Loader.load(opencv_photo.class);
+      Loader.load(opencv_dnn.class);
+    } else {
+      Loader.load(opencv_java.class);
+    }
+  }
+
   private void installQemu() {
     try {
       final QemuInstaller installer = QemuInstaller.create();

mcav-common/src/main/java/me/brandonli/mcav/MCAV.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package me.brandonli.mcav.capability.installer.vlc.github;
+package me.brandonli.mcav.capability.installer.vlc;
 
 import static java.util.Objects.requireNonNull;
 
@@ -67,25 +67,22 @@ public static Download[] readVLCDownloadsFromJsonResource(final String resourceP
   }
 
   private static Download[] getDownloads() {
-    final ReleasePackage releasePackage = download(true);
-    final ReleasePackage other = download(false);
+    final String releasePackage = download(true);
+    final String other = download(false);
     if (releasePackage == null || other == null) {
       return new Download[0];
     }
-    final Download linux64 = new Download(
-      Platform.ofPlatform(OS.LINUX, Arch.X86, Bits.BITS_64),
-      releasePackage.getUrl(),
-      releasePackage.getHash()
-    );
-    final Download linux32 = new Download(Platform.ofPlatform(OS.LINUX, Arch.X86, Bits.BITS_32), other.getUrl(), other.getHash());
+    final Download linux64 = new Download(Platform.ofPlatform(OS.LINUX, Arch.X86, Bits.BITS_64), releasePackage, null);
+    final Download linux32 = new Download(Platform.ofPlatform(OS.LINUX, Arch.X86, Bits.BITS_32), other, null);
     return new Download[] { linux64, linux32 };
   }
 
-  private static @Nullable ReleasePackage download(final boolean continuous) {
+  private static @Nullable String download(final boolean continuous) {
     final JsonArray assets = getJsonAssets(continuous);
     if (assets == null) {
       return null;
     }
+
     String downloadUrl = "";
     final int size = assets.size();
     for (int i = 0; i < size; i++) {
@@ -103,14 +100,12 @@ private static Download[] getDownloads() {
       return null;
     }
 
-    final String hash = IOUtils.getSHA256Hash(downloadUrl);
-    return new ReleasePackage(downloadUrl, hash);
+    return downloadUrl;
   }
 
   private static JsonArray getJsonAssets(final boolean continuous) {
-    try {
+    try (final HttpClient client = HttpClient.newHttpClient()) {
       final String apiUrl = continuous ? RELEASE_X86_64_URL : RELEASE_X86_32_URL;
-      final HttpClient client = HttpClient.newHttpClient();
       final URI uri = URI.create(apiUrl);
       final HttpRequest request = HttpRequest.newBuilder().uri(uri).GET().build();
       final HttpResponse.BodyHandler<String> bodyHandler = HttpResponse.BodyHandlers.ofString();

mcav-common/src/main/java/me/brandonli/mcav/capability/installer/vlc/github/ReleasePackageManager.java renamed to mcav-common/src/main/java/me/brandonli/mcav/capability/installer/vlc/ReleasePackageManager.java

@@ -22,7 +22,6 @@
 import java.util.Optional;
 import me.brandonli.mcav.capability.installer.AbstractInstaller;
 import me.brandonli.mcav.capability.installer.Download;
-import me.brandonli.mcav.capability.installer.vlc.github.ReleasePackageManager;
 import me.brandonli.mcav.capability.installer.vlc.installation.InstallationStrategy;
 import me.brandonli.mcav.capability.installer.vlc.installation.LinuxInstallationStrategy;
 import me.brandonli.mcav.capability.installer.vlc.installation.OSXInstallationStrategy;

mcav-common/src/main/java/me/brandonli/mcav/capability/installer/vlc/VLCInstaller.java

@@ -37,8 +37,8 @@
 import me.brandonli.mcav.media.player.pipeline.step.VideoPipelineStep;
 import me.brandonli.mcav.media.source.FFmpegDirectSource;
 import me.brandonli.mcav.media.source.Source;
-import me.brandonli.mcav.utils.ByteUtils;
 import me.brandonli.mcav.utils.ExecutorUtils;
+import me.brandonli.mcav.utils.natives.ByteUtils;
 import org.bytedeco.javacv.Frame;
 import org.bytedeco.javacv.FrameGrabber;
 import org.checkerframework.checker.nullness.qual.Nullable;

mcav-common/src/main/java/me/brandonli/mcav/media/player/multimedia/cv/AbstractVideoPlayerCV.java

@@ -29,8 +29,8 @@
 import me.brandonli.mcav.media.player.pipeline.step.AudioPipelineStep;
 import me.brandonli.mcav.media.player.pipeline.step.VideoPipelineStep;
 import me.brandonli.mcav.media.source.Source;
-import me.brandonli.mcav.utils.ByteUtils;
 import me.brandonli.mcav.utils.MetadataUtils;
+import me.brandonli.mcav.utils.natives.ByteUtils;
 import me.brandonli.mcav.utils.os.OSUtils;
 import org.checkerframework.checker.initialization.qual.UnderInitialization;
 import uk.co.caprica.vlcj.factory.MediaPlayerApi;

mcav-common/src/main/java/me/brandonli/mcav/media/player/multimedia/vlc/VLCPlayer.java

@@ -22,7 +22,7 @@
 import me.brandonli.mcav.media.image.StaticImage;
 import me.brandonli.mcav.media.player.pipeline.filter.video.dither.DitherUtils;
 import me.brandonli.mcav.media.player.pipeline.filter.video.dither.palette.Palette;
-import me.brandonli.mcav.utils.NativeUtils;
+import me.brandonli.mcav.utils.natives.NativeUtils;
 import me.brandonli.mcav.utils.os.Arch;
 import me.brandonli.mcav.utils.os.Bits;
 import me.brandonli.mcav.utils.os.OS;

mcav-common/src/main/java/me/brandonli/mcav/media/player/pipeline/filter/video/dither/algorithm/error/FilterLiteDither.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package me.brandonli.mcav.utils;
+package me.brandonli.mcav.utils.natives;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

mcav-common/src/main/java/me/brandonli/mcav/utils/ByteUtils.java renamed to mcav-common/src/main/java/me/brandonli/mcav/utils/natives/ByteUtils.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package me.brandonli.mcav.utils;
+package me.brandonli.mcav.utils.natives;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -35,7 +35,7 @@ public class NativeLoadingException extends AssertionError {
     super(msg);
   }
 
-  NativeLoadingException(final @Nullable String msg, final @Nullable Throwable cause) {
+  public NativeLoadingException(final @Nullable String msg, final @Nullable Throwable cause) {
     super(msg, cause);
   }
 }