Merge Hytale config ownership matching

Author: Villagers654

frontend/src/modules/worldlist/utils/configOwner.ts

@@ -0,0 +1,15 @@
+import type { WorldModListItem } from '@/modules/worldlist/api/worldListClient';
+
+/** Hytale derives its data folder from manifest Group + '_' + Name, preserving case. */
+export function configOwnerLabel(path: string, mods: WorldModListItem[]): string {
+    const folder = path.split('/')[0];
+    const owners = new Map<string, WorldModListItem>();
+    for (const mod of mods) {
+        const parts = mod.modId?.split(':');
+        if (!parts || parts.length !== 2 || parts.some(part => !part.trim() || /[/\\]/.test(part))) continue;
+        if (`${parts[0]}_${parts[1]}` === folder) owners.set(mod.modId!, mod);
+    }
+    if (owners.size > 1) return 'Ambiguous mod';
+    const owner = owners.values().next().value;
+    return owner ? `${owner.title} (${owner.modId})` : 'Unattributed';
+}

frontend/src/modules/worldlist/views/WorldModListView.tsx

@@ -1,3 +1,4 @@
+import { configOwnerLabel } from '@/modules/worldlist/utils/configOwner';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Helmet } from 'react-helmet-async';
 import { Link, useParams } from 'react-router-dom';
@@ -210,7 +211,7 @@ export const WorldModListView: React.FC = () => {
                     <p className="text-sm text-slate-500 dark:text-slate-400">Config defaults are included in the ZIP. The launcher adds world configs to the worlds you select and preserves existing files.</p>
                     {list.configs.map(config => (
                         <details key={`${config.scope}/${config.path}`} className="rounded-xl border border-slate-200 p-4 dark:border-white/10">
-                            <summary className="cursor-pointer text-sm font-medium">{config.scope === 'GLOBAL' ? 'Global mods' : 'World mods'} / {config.path}</summary>
+                            <summary className="cursor-pointer text-sm font-medium">{configOwnerLabel(config.path, list.mods)} · {config.scope === 'GLOBAL' ? 'Global mods' : 'World mods'} / {config.path}</summary>
                             <pre className="mt-3 max-h-80 overflow-auto whitespace-pre text-xs">{config.content}</pre>
                         </details>
                     ))}

frontend/tests/modules/worldlist/configOwner.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest';
+import { configOwnerLabel } from '@/modules/worldlist/utils/configOwner';
+import type { WorldModListItem } from '@/modules/worldlist/api/worldListClient';
+const mod = (modId: string, title = 'Marketplace title') => ({ modId, title }) as WorldModListItem;
+describe('Hytale config ownership', () => {
+    it('uses exact Group_Name from mod ID, preserving dots and underscores', () => {
+        expect(configOwnerLabel('org.example_mods_Fancy_Mod/config.json', [mod('org.example_mods:Fancy_Mod')]))
+            .toBe('Marketplace title (org.example_mods:Fancy_Mod)');
+    });
+    it('does not guess from titles, case differences or custom directories', () => {
+        const mods = [mod('Author:Plugin', 'Plugin')];
+        for (const path of ['Plugin/config.json', 'author_Plugin/config.json', 'custom/config.json']) {
+            expect(configOwnerLabel(path, mods)).toBe('Unattributed');
+        }
+    });
+    it('keeps underscore collisions ambiguous and deduplicates identical IDs', () => {
+        expect(configOwnerLabel('A_B_C/config.json', [mod('A_B:C'), mod('A:B_C')])).toBe('Ambiguous mod');
+        expect(configOwnerLabel('A_B/config.json', [mod('A:B'), mod('A:B')])).toBe('Marketplace title (A:B)');
+    });
+});

frontend/tests/modules/worldlist/modpackSeed.test.ts

@@ -24,6 +24,13 @@ describe('shared list config seeding', () => {
         expect(await zip.file('overrides/Mods/Example/settings.toml')!.async('string')).toBe('value=2\r\n');
         expect(await zip.file('overrides/Saves/My World/mods/Example/config.json')!.async('string')).toBe('{"world":true}');
     });
+    it('keeps the manifest-derived folder when converting a list to a modpack', async () => {
+        const file = await worldListToOverrideFile({ ...base, mods: [{
+            id: 'item', modId: 'org.example_mods:Fancy_Mod', title: 'Unrelated marketplace title', downloadable: true,
+        }], configs: [{ scope: 'WORLD', path: 'org.example_mods_Fancy_Mod/nested/Gameplay.json', content: '{}' }] });
+        const zip = await JSZip.loadAsync(await read(file!));
+        expect(await zip.file('overrides/Saves/My World/mods/org.example_mods_Fancy_Mod/nested/Gameplay.json')!.async('string')).toBe('{}');
+    });
     it('rejects unsafe paths', async () => {
         await expect(worldListToOverrideFile({ ...base, configs: [
             { scope: 'WORLD', path: '../config.json', content: '{}' },

launcher/src/main/java/net/modtale/launcher/config/HytaleConfigFiles.java

@@ -21,17 +21,21 @@ public final class HytaleConfigFiles {
 
     public List<ConfigFile> discover(Path globalMods, Path world) throws IOException {
         List<ConfigFile> files = new ArrayList<>(discoverMods(globalMods));
-        files.addAll(discoverWorld(world));
+        files.addAll(attribute(discoverWorldFiles(world), HytaleConfigOwnership.read(globalMods, world.resolve("mods"))));
         return List.copyOf(files);
     }
 
     public List<ConfigFile> discoverMods(Path mods) throws IOException {
         List<ConfigFile> files = new ArrayList<>();
         scan(mods, "Global mods", files);
-        return List.copyOf(files);
+        return attribute(files, HytaleConfigOwnership.read(mods));
     }
 
     public List<ConfigFile> discoverWorld(Path world) throws IOException {
+        return attribute(discoverWorldFiles(world), HytaleConfigOwnership.read(world.resolve("mods")));
+    }
+
+    private List<ConfigFile> discoverWorldFiles(Path world) throws IOException {
         List<ConfigFile> files = new ArrayList<>();
         scan(world.resolve("mods"), "World mods", files);
         add(world, world.resolve("config.json"), "World", files);
@@ -47,12 +51,28 @@ public List<ConfigFile> discoverWorld(Path world) throws IOException {
         return List.copyOf(files);
     }
 
+    private List<ConfigFile> attribute(List<ConfigFile> files, HytaleConfigOwnership ownership) {
+        return files.stream().map(file -> {
+            if (!(file.label().startsWith("Global mods / ") || file.label().startsWith("World mods / "))) return file;
+            Path relative = file.root().relativize(file.path());
+            Set<String> owners = relative.getNameCount() < 2 ? Set.of() : ownership.owners(relative.getName(0).toString());
+            String id = owners.size() == 1 ? owners.iterator().next() : "";
+            String owner = id.isEmpty() ? (owners.isEmpty() ? "Unattributed" : "Ambiguous mod") : id;
+            String scope = file.label().startsWith("Global") ? "Global mods" : "World mods";
+            return new ConfigFile(file.root(), file.path(), scope + " / " + owner + " / "
+                    + relative.toString().replace('\\', '/'), id);
+        }).toList();
+    }
+
     private void scan(Path root, String scope, List<ConfigFile> files) throws IOException {
         if (!Files.isDirectory(root, LinkOption.NOFOLLOW_LINKS)) return;
         try (Stream<Path> paths = Files.walk(root, 8)) {
             List<Path> candidates = paths.limit(20_001).toList();
             if (candidates.size() > 20_000) throw new IOException("Too many files to scan for configs.");
             for (Path path : candidates) {
+                // Loose asset packs contain game JSON, not editable plugin settings.
+                Path relative = root.relativize(path);
+                if (relative.getNameCount() > 1 && Files.isRegularFile(root.resolve(relative.getName(0)).resolve("manifest.json"), LinkOption.NOFOLLOW_LINKS)) continue;
                 add(root, path, scope, files);
                 if (files.size() > 2000) throw new IOException("Too many config files to display.");
             }
@@ -133,7 +153,8 @@ private Path checked(ConfigFile file) throws IOException {
         return path;
     }
 
-    public record ConfigFile(Path root, Path path, String label) {
+    public record ConfigFile(Path root, Path path, String label, String pluginId) {
+        public ConfigFile(Path root, Path path, String label) { this(root, path, label, ""); }
         @Override public String toString() { return label; }
     }
     public record Snapshot(ConfigFile file, String text) {}

launcher/src/main/java/net/modtale/launcher/config/HytaleConfigOwnership.java

@@ -0,0 +1,73 @@
+package net.modtale.launcher.config;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.zip.ZipFile;
+
+/** Matches the exact manifest Group + "_" + Name used by PendingLoadJavaPlugin.load(). */
+final class HytaleConfigOwnership {
+    private static final ObjectMapper JSON = new ObjectMapper();
+    private static final int MAX_MANIFEST_BYTES = 1024 * 1024;
+    private final Map<String, Set<String>> idsByFolder = new HashMap<>();
+
+    static HytaleConfigOwnership read(Path... roots) throws IOException {
+        var ownership = new HytaleConfigOwnership();
+        for (Path root : new LinkedHashSet<>(Arrays.asList(roots))) {
+            if (!Files.isDirectory(root, LinkOption.NOFOLLOW_LINKS)) continue;
+            try (var paths = Files.list(root)) {
+                var candidates = paths.limit(20_001).toList();
+                if (candidates.size() > 20_000) throw new IOException("Too many mods to identify configs.");
+                for (Path path : candidates) ownership.readManifest(path);
+            }
+        }
+        return ownership;
+    }
+
+    private void readManifest(Path path) {
+        if (Files.isSymbolicLink(path)) return;
+        String name = path.getFileName().toString().toLowerCase(Locale.ROOT);
+        try {
+            if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
+                Path manifest = path.resolve("manifest.json");
+                if (!Files.isRegularFile(manifest, LinkOption.NOFOLLOW_LINKS)) return;
+                try (var input = Files.newInputStream(manifest)) { add(read(input), null, 0); }
+            } else if (Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS)
+                    && (name.endsWith(".jar") || name.endsWith(".zip"))) {
+                try (var zip = new ZipFile(path.toFile())) {
+                    var entry = zip.getEntry("manifest.json");
+                    if (entry != null) try (var input = zip.getInputStream(entry)) { add(read(input), null, 0); }
+                }
+            }
+        } catch (IOException ignored) {
+            // An unreadable manifest provides no evidence of config ownership.
+        }
+    }
+
+    private JsonNode read(InputStream input) throws IOException {
+        byte[] bytes = input.readNBytes(MAX_MANIFEST_BYTES + 1);
+        if (bytes.length > MAX_MANIFEST_BYTES) throw new IOException("Manifest is too large.");
+        return JSON.readTree(bytes);
+    }
+
+    private void add(JsonNode manifest, String inheritedGroup, int depth) {
+        if (manifest == null || !manifest.isObject() || depth > 16) return;
+        String group = manifest.path("Group").asText(inheritedGroup);
+        String name = manifest.path("Name").asText("");
+        if (component(group) && component(name)) {
+            idsByFolder.computeIfAbsent(group + "_" + name, ignored -> new TreeSet<>()).add(group + ":" + name);
+        }
+        for (JsonNode child : manifest.path("SubPlugins")) add(child, group, depth + 1);
+    }
+
+    private static boolean component(String value) {
+        return value != null && !value.isBlank() && value.chars().noneMatch(c -> c < 32 || c == ':' || c == '/' || c == '\\');
+    }
+
+    Set<String> owners(String folder) { return idsByFolder.getOrDefault(folder, Set.of()); }
+}

launcher/src/main/java/net/modtale/launcher/ui/library/ConfigEditorModal.java

@@ -47,7 +47,7 @@ final class ConfigEditorModal {
     void show(Path globalMods, Path world, String worldName) {
         Label title = new Label("Configs · " + worldName);
         title.getStyleClass().add("config-editor-title");
-        Label hint = new Label("Close Hytale before editing. JSON is validated; other formats are saved as text. A backup is kept beside each saved file. Configs are saved in launcher settings and sync when signed in.");
+        Label hint = new Label("Close Hytale before editing. JSON is validated; other formats are saved as text. A backup is kept beside each saved file. Configs are saved in launcher settings and sync when signed in. Mod ownership uses manifest IDs; custom or missing mod folders appear as Unattributed.");
         hint.setWrapText(true);
         hint.getStyleClass().add("library-muted-text");
         search.setPromptText("Search config files");

launcher/src/main/java/net/modtale/launcher/ui/library/ShareConfigSelectionModal.java

@@ -24,7 +24,7 @@ static void show(StackPane host, List<ConfigFile> files, Consumer<List<ConfigFil
         overlay.setPadding(new Insets(24));
         Label title = new Label("Include configs in this list");
         title.getStyleClass().add("config-editor-title");
-        Label hint = new Label("Selected files will be public with the shared list. Choose only the mod settings you want to share. Leave everything unchecked to share mods only.");
+        Label hint = new Label("Selected files will be public with the shared list. Choose only the mod settings you want to share. Leave everything unchecked to share mods only. Unattributed folders could not be matched to a mod; their original paths are preserved.");
         hint.setWrapText(true);
         Map<ConfigFile, CheckBox> choices = new LinkedHashMap<>();
         VBox rows = new VBox(10);

launcher/src/test/java/net/modtale/launcher/config/HytaleConfigFilesTest.java

@@ -24,7 +24,7 @@ void discoversGlobalAndWorldConfigsWithoutManifestsArchivesOrOtherWorlds() throw
         write("Saves/Other/mods/Example_Plugin/config.json", "{}");
         List<ConfigFile> files = discover();
         assertEquals(4, files.size());
-        assertTrue(files.stream().anyMatch(file -> file.label().equals("World mods / Example_Plugin/config.json")));
+        assertTrue(files.stream().anyMatch(file -> file.label().equals("World mods / Unattributed / Example_Plugin/config.json")));
     }
 
     @Test

launcher/src/test/java/net/modtale/launcher/config/HytaleConfigOwnershipTest.java

@@ -0,0 +1,77 @@
+package net.modtale.launcher.config;
+
+import static org.junit.jupiter.api.Assertions.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import net.modtale.launcher.install.WorldListConfigInstaller;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class HytaleConfigOwnershipTest {
+    @TempDir Path directory;
+
+    @Test void matchesManifestIdentityRatherThanFilenameNameOrCase() throws Exception {
+        jar("Mods/unrelated-download-name.jar", "{\"Group\":\"com.azuredoom\",\"Name\":\"levelingcore\"}");
+        jar("Mods/other.jar", "{\"Group\":\"Other\",\"Name\":\"levelingcore\"}");
+        config("world/mods/com.azuredoom_levelingcore/config.json");
+        config("world/mods/Other_levelingcore/settings.toml");
+        config("world/mods/com.azuredoom_Levelingcore/config.json");
+        config("world/mods/unrelated-download-name/config.json");
+        config("world/mods/levelingcore/config.json");
+        var found = new HytaleConfigFiles().discover(directory.resolve("Mods"), directory.resolve("world"));
+        assertEquals(5, found.size());
+        assertEquals(2, found.stream().filter(file -> !file.pluginId().isEmpty()).count());
+        assertTrue(found.stream().anyMatch(file -> file.pluginId().equals("com.azuredoom:levelingcore")
+                && file.label().contains("World mods / com.azuredoom:levelingcore /")));
+        assertEquals(3, found.stream().filter(file -> file.label().contains("Unattributed")).count());
+    }
+
+    @Test void handlesLocalWorldModsInheritedSubPluginsAndAmbiguousUnderscores() throws Exception {
+        jar("world/mods/bundle.jar", "{\"Group\":\"Author\",\"Name\":\"Parent\",\"SubPlugins\":[{\"Name\":\"Child\"}]}");
+        jar("Mods/one.jar", "{\"Group\":\"A_B\",\"Name\":\"C\"}");
+        jar("Mods/two.jar", "{\"Group\":\"A\",\"Name\":\"B_C\"}");
+        config("world/mods/Author_Child/config.json");
+        config("world/mods/A_B_C/config.json");
+        var found = new HytaleConfigFiles().discover(directory.resolve("Mods"), directory.resolve("world"));
+        assertTrue(found.stream().anyMatch(file -> file.pluginId().equals("Author:Child")));
+        assertTrue(found.stream().anyMatch(file -> file.pluginId().isEmpty() && file.label().contains("Ambiguous mod")));
+    }
+
+    @Test void excludesLooseAssetJsonAndDoesNotGuessCustomFolders() throws Exception {
+        Path manifest = config("Mods/loose-pack/manifest.json");
+        Files.writeString(manifest, "{\"Group\":\"Author\",\"Name\":\"Assets\"}");
+        config("Mods/loose-pack/Server/Item/Items/example.json");
+        jar("Mods/corrupt.jar", "{broken");
+        config("world/mods/custom-author-folder/nested/settings.json");
+        var found = new HytaleConfigFiles().discover(directory.resolve("Mods"), directory.resolve("world"));
+        assertEquals(1, found.size());
+        assertEquals("", found.getFirst().pluginId());
+        assertTrue(found.getFirst().label().contains("Unattributed"));
+    }
+
+    @Test void sharedConfigsPreserveExactManifestFolderAndOwnerAfterRebasing() throws Exception {
+        jar("Mods/modtale-project-slug-v2.jar", "{\"Group\":\"org.example_mods\",\"Name\":\"Fancy_Mod\"}");
+        config("world/mods/org.example_mods_Fancy_Mod/nested/Gameplay.json");
+        var capture = new WorldListConfigCapture();
+        var found = capture.discover(directory.resolve("Mods"), directory.resolve("world"));
+        assertEquals("org.example_mods:Fancy_Mod", found.getFirst().pluginId());
+        var configs = capture.capture(found, directory.resolve("Mods"), directory.resolve("world"));
+        assertEquals("org.example_mods_Fancy_Mod/nested/Gameplay.json", configs.getFirst().path());
+        WorldListConfigInstaller.install(configs, "WORLD", directory.resolve("recipient/mods"));
+        var restored = new HytaleConfigFiles().discover(directory.resolve("Mods"), directory.resolve("recipient"));
+        assertEquals(List.of("org.example_mods:Fancy_Mod"), restored.stream().map(HytaleConfigFiles.ConfigFile::pluginId).toList());
+    }
+
+    private Path config(String relative) throws Exception {
+        Path path = directory.resolve(relative); Files.createDirectories(path.getParent()); Files.writeString(path, "{}"); return path;
+    }
+    private void jar(String relative, String manifest) throws Exception {
+        Path path = directory.resolve(relative); Files.createDirectories(path.getParent());
+        try (var zip = new ZipOutputStream(Files.newOutputStream(path))) {
+            zip.putNextEntry(new ZipEntry("manifest.json")); zip.write(manifest.getBytes(java.nio.charset.StandardCharsets.UTF_8)); zip.closeEntry();
+        }
+    }
+}