Hotwire compat

CHANGELOG.md

@@ -1,7 +1,6 @@
-## 1.6.2
-- Fix emoji rendering
-- Fix rare Vulkan crash
-- Add an API for detecting when HUDs are moved externally
-- Fix FPS regression with 3DSkinLayers
-- Fix FPS regression with HUDs
-- Dropped compatibility with Hypixel SkyBlock mods (Apec, Firmament, Odin, Skyblocker, SkyHanni and other MoulConfig-based mods) on Minecraft versions below 26.1, which can no longer be used to play SkyBlock
+## Unreleased changes
+- Added integration with the Hotwire mod (0.7.3 and above) for turning mods on and off, updating them and adding new ones without restarting the game
+
+### For mod developers
+- Added `ModInfo.parentId`, `ModInfo.seenMods` and `ModInfo.refreshLoadedMods()`, along with a `ModInfo` constructor that takes the parent mod's ID
+- `ConfigEntrypoint`s now also run for mods added or updated via Hotwire while the game is running

buildSrc/src/main/kotlin/oneconfig-setup.gradle.kts

@@ -7,6 +7,7 @@ import org.gradle.api.publish.PublishingExtension
 import org.gradle.authentication.http.BasicAuthentication
 import org.gradle.plugins.signing.SigningExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
 import gg.essential.gradle.util.prebundle
 import java.lang.Boolean.TRUE
@@ -358,6 +359,10 @@ if (enableMoulRelocatorKsp) {
     tasks.matching { it.name.startsWith("ksp") }.configureEach {
         enabled = false
     }
+    // the ksp plugin still registers its output dir, so stale output from builds where ksp ran would compile
+    val kspOutput = layout.buildDirectory.dir("generated/ksp").get().asFile
+    tasks.withType<KotlinCompile>().configureEach { exclude { it.file.startsWith(kspOutput) } }
+    tasks.withType<JavaCompile>().configureEach { exclude { it.file.startsWith(kspOutput) } }
 }
 
 group = rootProject.group

minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/CompatibilityPlatformImpl.java

@@ -1,8 +1,12 @@
 package org.polyfrost.oneconfig.api.platform.v1.internal;
 
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.metadata.CustomValue;
+import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.kyori.adventure.text.Component;
 import net.minecraft.client.Minecraft;
 import org.polyfrost.oneconfig.api.platform.v1.CompatibilityPlatform;
@@ -25,6 +29,11 @@
 public class CompatibilityPlatformImpl implements CompatibilityPlatform {
     Options options = new OptionsImpl();
     Keys keys = new KeysImpl();
+    //? fabric || ornithe {
+    // compat asks for the mods on every lookup, and building them reads all their metadata
+    private List<ModContainer> modsFrom = List.of();
+    private Set<ModInfo> mods = Set.of();
+    //? }
 
     @Override
     public void displayChatMessage(Component text) {
@@ -44,32 +53,62 @@ public void displayChatMessage(Component text) {
     public Set<ModInfo> getMods() {
         //? fabric || ornithe {
 
-        return FabricLoader.getInstance().getAllMods().stream()
-                .map(mod -> {
-                    var metadata = mod.getMetadata();
-                    return new ModInfo(
-                        metadata.getId(),
-                        metadata.getName(),
-                        metadata.getVersion().getFriendlyString(),
-                        mod.getRootPaths().getFirst(),
-                        metadata.getIconPath(Integer.MAX_VALUE).orElse(null),
-                        metadata.getAuthors().stream()
-                                .map(person -> person.getName())
-                                .filter(name -> !name.isBlank())
-                                .collect(Collectors.joining(", ")),
-                        metadata.getContributors().stream()
-                                .map(person -> person.getName())
-                                .filter(name -> !name.isBlank())
-                                .collect(Collectors.joining(", ")),
-                        metadata.getDescription()
-                    );
-                }).collect(Collectors.toSet());
+        FabricLoader loader = FabricLoader.getInstance();
+        synchronized (loader) {
+            List<ModContainer> containers = List.copyOf(loader.getAllMods());
+            if (containers.equals(modsFrom)) return mods;
+            mods = containers.stream()
+                    .map(mod -> {
+                        var metadata = mod.getMetadata();
+                        return new ModInfo(
+                            metadata.getId(),
+                            metadata.getName(),
+                            metadata.getVersion().getFriendlyString(),
+                            mod.getRootPaths().getFirst(),
+                            metadata.getIconPath(Integer.MAX_VALUE).orElse(null),
+                            metadata.getAuthors().stream()
+                                    .map(person -> person.getName())
+                                    .filter(name -> !name.isBlank())
+                                    .collect(Collectors.joining(", ")),
+                            metadata.getContributors().stream()
+                                    .map(person -> person.getName())
+                                    .filter(name -> !name.isBlank())
+                                    .collect(Collectors.joining(", ")),
+                            metadata.getDescription(),
+                            mod.getContainingMod().map(parent -> parent.getMetadata().getId()).orElseGet(() -> modMenuParent(metadata))
+                        );
+                    }).collect(Collectors.toSet());
+            modsFrom = containers;
+            return mods;
+        }
         //? }
 
         //? neoforge {
         //? }
     }
 
+    //? fabric || ornithe {
+    /** The parent Mod Menu lists a separately shipped mod under: its "parent" custom value, a bare id or an object with an id, or Fabric API for its modules */
+    private static String modMenuParent(ModMetadata metadata) {
+        try {
+            CustomValue parent = metadata.containsCustomValue("modmenu")
+                ? metadata.getCustomValue("modmenu").getAsObject().get("parent")
+                : null;
+            if (parent != null && parent.getType() == CustomValue.CvType.OBJECT) parent = parent.getAsObject().get("id");
+            if (parent != null && parent.getType() == CustomValue.CvType.STRING) return parent.getAsString();
+        } catch (ClassCastException ignored) {
+            // malformed metadata from another mod should not break the mod list
+        }
+        // Mod Menu files Fabric API modules under Fabric API itself even when they ship as separate jars
+        if (metadata.containsCustomValue("fabric-api:module-lifecycle")) {
+            FabricLoader loader = FabricLoader.getInstance();
+            String parent = loader.isModLoaded("fabric-api") || !loader.isModLoaded("fabric") ? "fabric-api" : "fabric";
+            return parent.equals(metadata.getId()) ? null : parent;
+        }
+        return null;
+    }
+    //? }
+
     @Override
     public boolean isDevelopment() {
         return FabricLoader.getInstance().isDevelopmentEnvironment();

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java

@@ -46,6 +46,7 @@
 import org.polyfrost.oneconfig.api.event.v1.events.ResourceFinishedLoading;
 import org.polyfrost.oneconfig.api.event.v1.events.ScreenOpenEvent;
 import org.polyfrost.oneconfig.api.event.v1.events.ShutdownEvent;
+import org.polyfrost.oneconfig.api.event.v1.events.TickEvent;
 import org.polyfrost.oneconfig.api.event.v1.events.WorldEvent;
 import org.polyfrost.oneconfig.api.hud.v1.HudManager;
 import org.polyfrost.oneconfig.api.hud.v1.events.HudEditorToggleEvent;
@@ -349,6 +350,7 @@ private static void registerEventHandlers() {
                     WWaypointsCompat.register();
                     ThemeRegistry.INSTANCE.loadFromConfig();
                 });
+        EventManager.register(TickEvent.End.class, ConfigEntrypoints::registerAdded);
         EventManager.register(WorldEvent.Load.class, e -> {
             showFirstLaunchNotification();
             ItemCatalog.INSTANCE.markIconsAvailable();

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java

@@ -159,6 +159,9 @@ public List<String> getMixins() {
         mixins.add("compat.skyhanni.Mixin_SkyHanniRenderData");
         mixins.add("compat.firmament.Mixin_FirmamentHudMeta");
         //?}
+        // the tick listener can run too late on every version Hotwire supports, as a world can open before the next tick
+        //? if > 1.8.9
+        mixins.add("compat.Mixin_RegisterAddedConfigs");
         // Firmament has no stable release for 26.2 yet
         //? skyblock && < 26.2
         //mixins.add("compat.firmament.Mixin_FirmamentContentCapture");