What the hail

.gitignore

@@ -114,7 +114,14 @@ gradle-app.setting
 # Cache of project
 .gradletasknamecache
 
-**/build/
+/*/build/
+/build/
+/*/.gradle/
+/.gradle/
+
+/.idea/
+/.vscode/
+/.fleet/
 
 # Common working directory
 run/

api/build.gradle.kts

@@ -13,9 +13,6 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-
     implementation("org.jetbrains:annotations:23.0.0")
 
     implementation("io.github.ultreon:ubo:1.3.0")

api/src/main/java/dev/ultreon/devices/api/TextureLoader.java

@@ -0,0 +1,10 @@
+package dev.ultreon.devices.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface TextureLoader {
+    int load(InputStream stream) throws IOException;
+
+    void destroy(int textureID);
+}

api/src/main/java/module-info.java

@@ -0,0 +1,3 @@
+module devices.api {
+    requires java.base;
+}

bios/build.gradle

@@ -0,0 +1,26 @@
+plugins {
+    id 'java'
+}
+
+group = 'dev.ultreon.mods'
+version = '0.9.0'
+
+base {
+    archivesName = "devices-bios"
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.jetbrains:annotations:24.0.0'
+
+    implementation project(':api')
+}

common/src/api/java/dev/ultreon/devices/api/bios/Bios.java → bios/src/main/java/dev/ultreon/vbios/Bios.java

@@ -1,6 +1,6 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
-import dev.ultreon.devices.api.bios.efi.VEFI_System;
+import dev.ultreon.vbios.efi.VEFI_System;
 
 public interface Bios {
     void registerInterrupt(BiosInterruptType interrupt, InterruptHandler handler);

common/src/api/java/dev/ultreon/devices/api/bios/BiosCallType.java → bios/src/main/java/dev/ultreon/vbios/BiosCallType.java

@@ -1,6 +1,6 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
-import dev.ultreon.devices.api.bios.efi.*;
+import dev.ultreon.vbios.efi.*;
 
 public enum BiosCallType {
     POWER_OFF(void.class),

common/src/api/java/dev/ultreon/devices/api/bios/BiosInterruptType.java → bios/src/main/java/dev/ultreon/vbios/BiosInterruptType.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
 public enum BiosInterruptType {
     DOUBLE_FAULT,

common/src/api/java/dev/ultreon/devices/api/bios/FrameBufferCall.java → bios/src/main/java/dev/ultreon/vbios/FrameBufferCall.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
 import java.nio.ByteBuffer;
 

common/src/api/java/dev/ultreon/devices/api/bios/FrameBufferInfo.java → bios/src/main/java/dev/ultreon/vbios/FrameBufferInfo.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
 public record FrameBufferInfo(
     int width,

common/src/api/java/dev/ultreon/devices/api/bios/InterruptData.java → bios/src/main/java/dev/ultreon/vbios/InterruptData.java

@@ -1,7 +1,9 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
 public interface InterruptData {
     <T> T getField(String name);
 
     void setField(String name, Object value);
+
+    BiosInterruptType interruptType();
 }

common/src/api/java/dev/ultreon/devices/api/bios/InterruptHandler.java → bios/src/main/java/dev/ultreon/vbios/InterruptHandler.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios;
 
 @FunctionalInterface
 public interface InterruptHandler {

bios/src/main/java/dev/ultreon/vbios/boot/BootSector.java

@@ -0,0 +1,7 @@
+package dev.ultreon.vbios.boot;
+
+import dev.ultreon.vbios.Bios;
+
+public interface BootSector {
+    void boot(Bios bios);
+}

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_DeviceID.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_DeviceID.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 import java.util.UUID;
 

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_DeviceInfo.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_DeviceInfo.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_DeviceInfo(VEFI_DeviceID[] ids) {
 

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_DiskInfo.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_DiskInfo.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_DiskInfo(VEFI_DeviceID deviceID, VEFI_DriveType driveType) {
     public VEFI_DiskInfo(VEFI_DeviceID deviceID, byte b) {

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_DriveType.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_DriveType.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public enum VEFI_DriveType {
     HDD,

bios/src/main/java/dev/ultreon/vbios/efi/VEFI_Executable.java

@@ -0,0 +1,7 @@
+package dev.ultreon.vbios.efi;
+
+import dev.ultreon.vbios.Bios;
+
+public interface VEFI_Executable {
+    void execute(Bios bios, VEFI_System system);
+}

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_File.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_File.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_File(int handle) {
 

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_FileInfo.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_FileInfo.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_FileInfo(VEFI_DeviceID id, String path) {
 

common/src/api/java/dev/ultreon/devices/api/bios/VEFI_Handle.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_Handle.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_Handle(
     int handle

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_IconType.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_IconType.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public enum VEFI_IconType {
     VEFI_Error,

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_Notification.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_Notification.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_Notification(VEFI_IconType type, String header, String message) {
 }

common/src/api/java/dev/ultreon/devices/api/bios/efi/VEFI_System.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_System.java

@@ -1,12 +1,13 @@
-package dev.ultreon.devices.api.bios.efi;
+package dev.ultreon.vbios.efi;
 
-import dev.ultreon.devices.api.bios.Bios;
+import dev.ultreon.devices.api.TextureLoader;
+import dev.ultreon.vbios.Bios;
 import dev.ultreon.devices.api.device.VEFI_Disk;
 import org.intellij.lang.annotations.Language;
 
 import java.io.IOException;
 
-public interface VEFI_System {
+public interface VEFI_System extends TextureLoader {
     int F_READ = 0;
     int F_WRITE = 1;
     int F_EXEC = 2;
@@ -74,11 +75,44 @@ public interface VEFI_System {
     void readFileB(VEFI_File file, byte[] data, int offset, int length);
     void readFileT(VEFI_File file, char[] data, int offset, int length);
 
+    /**
+     * Closes a file handle
+     *
+     * @param file the file to close
+     */
     void closeFile(VEFI_File file);
 
+    /**
+     * Get the vBIOS instance.
+     *
+     * @return the vBIOS
+     */
     Bios getBios();
 
-    Object runIsolated(Class<?> contex, @Language("jvm-class-name") String className, String packageName, Object... args);
-
+    /**
+     * Run a class in an isolated context.
+     *
+     * @param context the context class, this is used to find the location in the classpath
+     * @param className the class name of the class to run in the context
+     * @param packageName the allowed package name that can be loaded.
+     * @param args the arguments to pass to the class.
+     * @return the instance of the class in the isolated context
+     */
+    Object runIsolated(Class<?> context, @Language("jvm-class-name") String className, String packageName, Object... args);
+
+    /**
+     * Closes a disk after it is no longer in use.
+     *
+     * @param vefiDisk the vEFI disk to close
+     * @throws IOException if an I/O error occurs or if the disk is already closed
+     */
     void closeDisk(VEFI_Disk vefiDisk) throws IOException;
+
+    /**
+     * Offloads code to the vGPU thread.
+     * This is basically the Minecraft render thread.
+     *
+     * @param call the code to offload
+     */
+    void offload(Runnable call);
 }

common/src/api/java/dev/ultreon/devices/api/bios/VEFI_VideoSize.java → bios/src/main/java/dev/ultreon/vbios/efi/VEFI_VideoSize.java

@@ -1,4 +1,4 @@
-package dev.ultreon.devices.api.bios;
+package dev.ultreon.vbios.efi;
 
 public record VEFI_VideoSize(
     int width,

bios/src/main/java/module-info.java

@@ -0,0 +1,4 @@
+module devices.bios {
+    requires devices.api;
+    requires java.base;
+}

build.gradle

@@ -59,7 +59,6 @@ subprojects {
             url 'https://maven.quiltmc.org/repository/release/'
         }
 
-
         maven {
             url "https://cursemaven.com"
             content {

common/build.gradle

@@ -4,37 +4,12 @@ architectury {
 }
 
 sourceSets {
-    api {
-        java {
-            srcDirs += [
-                    "src/api/java"
-            ]
-        }
-    }
-
-    mineos {
-        java {
-            srcDirs += [
-                    "src/mineos/java"
-            ]
-        }
-
-        runtimeClasspath += sourceSets.api.output
-        compileClasspath += sourceSets.api.output
-    }
-
     main {
         resources {
             srcDirs += [
                     "src/main/generated/resources"
             ]
         }
-
-        runtimeClasspath += sourceSets.api.output
-        compileClasspath += sourceSets.api.output
-
-        runtimeClasspath += sourceSets.mineos.output
-        compileClasspath += sourceSets.mineos.output
     }
 }
 
@@ -46,10 +21,17 @@ repositories {
     maven { url = "https://cursemaven.com" }
 }
 
+configurations {
+    osInstaller {
+        canBeConsumed = true
+        canBeResolved = true
+    }
+}
+
 dependencies {
-    apiImplementation 'org.jetbrains:annotations:24.0.0'
-    mineosImplementation 'org.jetbrains:annotations:24.0.0'
-    mineosImplementation "org.apache.commons:commons-compress:1.26.1"
+    implementation project(":api")
+    implementation project(":bios")
+    osInstaller project(":mineos:installer")
 
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
@@ -67,7 +49,14 @@ dependencies {
     modCompileOnly 'com.electronwill.night-config:core:3.6.3'
     modCompileOnly 'com.electronwill.night-config:toml:3.6.3'
 
-    implementation("de.waldheinz:fat32-lib:0.6.5")
+    implementation "de.waldheinz:fat32-lib:0.6.5"
+}
+
+processResources {
+    from {
+        configurations.osInstaller
+        into "assets/devices/device_installers"
+    }
 }
 
 sourceSets {
@@ -85,22 +74,6 @@ jar {
     from("LICENSE") {
         rename { "${it}_${archivesBaseName}" }
     }
-
-    from(sourceSets.api.output)
-}
-
-tasks.register("mineosJar", Jar) {
-    archiveBaseName = "MineOS"
-    archiveVersion = "1.0.0"
-    archiveClassifier = null
-
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    from("LICENSE") {
-        rename { "${it}_MineOS" }
-    }
-
-    from(sourceSets.mineos.output)
 }
 
 publishing {