Split ignore file into bootstrap-prod.

Author: LexManos

…t/minecraftforge/bootstrap/dev/Util.java …t/minecraftforge/bootstrap/api/Util.javabs-dev/src/main/java/net/minecraftforge/bootstrap/dev/Util.java renamed to bs-api/src/main/java/net/minecraftforge/bootstrap/api/Util.java bs-dev/src/main/java/net/minecraftforge/bootstrap/dev/Util.java renamed to bs-api/src/main/java/net/minecraftforge/bootstrap/api/Util.java

@@ -2,10 +2,9 @@
  * Copyright (c) Forge Development LLC
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.bootstrap.dev;
+package net.minecraftforge.bootstrap.api;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.lang.module.ModuleDescriptor;
 import java.nio.file.FileSystem;
@@ -16,24 +15,32 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
 import java.util.jar.Attributes.Name;
 import java.util.regex.Pattern;
-import java.util.jar.JarFile;
 
-class Util {
+/**
+ * A small utility class that I found useful to have between Bootstrap projects
+ */
+public class Util {
     private static final Name AUTOMATIC_MODULE_NAME = new Name("Automatic-Module-Name");
     private static final Name MULTI_RELEASE         = new Name("Multi-Release");
     private static final Name FORGE_MODULE_LAYER    = new Name("Forge-Module-Layer");
     private static final String META_INF            = "META-INF";
     private static final String MANIFEST            = "MANIFEST.MF";
     private static final String VERSIONS            = "versions";
-    private static final String VERSION_DIR         = META_INF + '/' + VERSIONS + '/';
     private static final String MODULE_INFO         = "module-info.class";
 
-    static ModuleVersion findModuleName(Collection<Path> paths) {
+    public record ModuleInfo(String name, String version, String layer) {}
+
+    /**
+     * Attempt to get the Module Info for a collection of paths.
+     * The first one found will be returned.
+     *
+     * It will throw any errors that happen when reading the paths.
+     *
+     * @return Null if no named module is found
+     */
+    public static ModuleInfo findModule(Collection<Path> paths) {
         for (var path : paths) {
             var ret = findModuleNameImpl(path, false);
             if (ret.name != null)
@@ -42,7 +49,15 @@ static ModuleVersion findModuleName(Collection<Path> paths) {
         return null;
     }
 
-    static ModuleVersion findModuleName(Path... paths) {
+    /**
+     * Attempt to get the Module Info for a array of paths.
+     * The first one found will be returned
+     *
+     * It will throw any errors that happen when reading the paths.
+     *
+     * @return Null if no named module is found
+     */
+    public static ModuleInfo findModule(Path... paths) {
         for (var path : paths) {
             var ret = findModuleNameImpl(path, false);
             if (ret.name != null)
@@ -51,14 +66,62 @@ static ModuleVersion findModuleName(Path... paths) {
         return null;
     }
 
-    record ModuleVersion(String name, String version, String layer) {}
-    static ModuleVersion findModuleNameImpl(Path path, boolean slow) {
+    /**
+     * Attempt to get the Module Info for a collection of paths.
+     * The first one found will be returned.
+     *
+     * If no manifest or module-info is found, and this is a single jar path,
+     * it will attempt to parse the filename as a module name.
+     *
+     * It will throw any errors that happen when reading the paths.
+     *
+     * @return Null if no named module is found
+     */
+    public static ModuleInfo findAutomaticModule(Collection<Path> paths) {
+        var ret = findModule(paths);
+        if (ret != null)
+            return ret;
+
+        if (paths.size() == 1)
+            return findAutomaticModuleImpl(paths.iterator().next());
+
+        return null;
+    }
+
+    /**
+     * Attempt to get the Module Info for a collection of paths.
+     * The first one found will be returned.
+     *
+     * If no manifest or module-info is found, and this is a single jar path,
+     * it will attempt to parse the filename as a module name.
+     *
+     * It will throw any errors that happen when reading the paths.
+     *
+     * @return Null if no named module is found
+     */
+    public static ModuleInfo findAutomaticModule(Path... paths) {
+        var ret = findModule(paths);
+        if (ret != null)
+            return ret;
+
+        if (paths.length == 1)
+            return findAutomaticModuleImpl(paths[0]);
+
+        return null;
+    }
+
+
+
+    /* ======================================================================
+     *                               PRIVATE
+     * ======================================================================
+     */
+
+    private static ModuleInfo findModuleNameImpl(Path path, boolean slow) {
         try {
             Candidates data = null;
             if (Files.isDirectory(path)) {
                 data = findCandidatesDirectory(path);
-            } else if (slow) {
-                data = findCandidatesZip(path);
             } else {
                 try (FileSystem jarFS = FileSystems.newFileSystem(path)) {
                     var root = jarFS.getPath("/");
@@ -94,7 +157,7 @@ static ModuleVersion findModuleNameImpl(Path path, boolean slow) {
                 version = desc.version().map(Object::toString).orElse(null);
             }
 
-            return new ModuleVersion(name, version, layer);
+            return new ModuleInfo(name, version, layer);
         } catch (IOException e) {
             return sneak(e);
         }
@@ -144,45 +207,6 @@ private static Candidates findCandidatesDirectory(Path path) {
         }
     }
 
-    private static Candidates findCandidatesZip(Path path) {
-        // I would use JarFile here and let the JVM handle all this.
-        // but it only works on File objects not Paths
-        // Normal java gets around this by extracting all non-file paths
-        // to a temp directory and opening them as normal files.
-        // I do not want to do this. So this is what you get.
-        try (var zip = new ZipInputStream(Files.newInputStream(path))) {
-            var infos = new ArrayList<InfoData>();
-            Manifest mf = null;
-            ZipEntry entry;
-            while ((entry = zip.getNextEntry()) != null) {
-                var name = entry.getName();
-                if (mf == null && JarFile.MANIFEST_NAME.equalsIgnoreCase(name)) {
-                    mf = new Manifest(zip);
-                } else if (name.endsWith(MODULE_INFO)) {
-                    int version = 0;
-                    if (name.startsWith(VERSION_DIR)) {
-                        if (!isMultiRelease(mf))
-                            continue;
-
-                        int idx = name.indexOf('/', VERSION_DIR.length());
-                        var ver = name.substring(VERSION_DIR.length(), idx);
-                        try {
-                            version = Integer.parseInt(ver);
-                        } catch (NumberFormatException e) {
-                            // If its not a numerical directory we don't care
-                            version = Integer.MAX_VALUE;
-                        }
-                    }
-                    if (version <= Runtime.version().feature())
-                        infos.add(new InfoData(version, zip.readAllBytes()));
-                }
-            }
-            return new Candidates(mf, infos);
-        } catch (IOException e) {
-            return sneak(e);
-        }
-    }
-
     private static Path findInsensitive(Path root, String name) {
         if (root == null)
             return null;
@@ -208,68 +232,16 @@ private static boolean isMultiRelease(Manifest mf) {
     }
 
     @SuppressWarnings("unchecked")
-    static <E extends Throwable, R> R sneak(Exception exception) throws E {
+    private static <E extends Throwable, R> R sneak(Exception exception) throws E {
         throw (E)exception;
     }
 
-    // Only here for testing/profiling because I don't want to setup a whole benchmark sub-project
-    // Intentionally left in so others can reproduce and I dont have to write this later.
-    public static void main(String[] args) {
-        var runs = 100;
-        var slow = false; // Wither or not to force the slow code path
-        var forgeWorkspace = Path.of(args.length == 1 ? args[0] : "Z:/Projects/Forge_1214");
-        if (Files.exists(forgeWorkspace)) {
-            var exploded = forgeWorkspace.resolve("projects/forge/bin/main");
-            if (Files.exists(exploded)) {
-                for (int x = 0; x < runs; x++) {
-                    var mod = findModuleNameImpl(exploded, slow);
-                    if (mod == null || !"net.minecraftforge.forge".equals(mod.name()))
-                        throw new IllegalStateException("Failed to find correct module name from exploded: " + mod);
-                }
-            }
-            var jared = forgeWorkspace.resolve("projects/mcp/build/mcp/downloadServer/server.jar");
-            if (Files.exists(jared)) {
-                for (int x = 0; x < runs; x++) {
-                    var mod = findModuleNameImpl(jared, slow);
-                    if (mod != null && mod.name() != null)
-                        throw new IllegalStateException("Expected null module from server jar but was " + mod);
-                }
-            }
-        }
-
-        var paths = findAllClassPathEntries();
-
-        for (int x = 0; x < runs; x++) {
-            for (var path : paths) {
-                var mod = findModuleNameImpl(path, slow);
-                System.out.println(mod);
-            }
-        }
-    }
-
-    private static List<Path> findAllClassPathEntries() {
-        try {
-            var parts = System.getProperty("java.class.path").split(File.pathSeparator);
-            var paths = new ArrayList<Path>();
-            for (var part : parts) {
-                var path = new File(part).getCanonicalFile().toPath();
-                if (!Files.exists(path))
-                    continue;
-                if (Files.isDirectory(path) && Files.list(path).findAny().isEmpty())
-                    continue;
-                paths.add(path);
-            }
-            return paths;
-        } catch (IOException e) {
-            return sneak(e);
-        }
-    }
-
-    public static ModuleVersion findAutomaticModuleName(Path[] paths) {
-        if (paths.length != 1 || paths[0].getFileName() == null)
+    private static ModuleInfo findAutomaticModuleImpl(Path path) {
+        var filename = path.getFileName();
+        if (filename == null)
             return null;
 
-        var name = paths[0].getFileName().toString();
+        var name = path.getFileName().toString();
         if (!name.endsWith(".jar"))
             return null;
 
@@ -288,7 +260,7 @@ public static ModuleVersion findAutomaticModuleName(Path[] paths) {
             name = name.substring(0, start);
         }
 
-        return new ModuleVersion(cleanModuleName(name), version, null);
+        return new ModuleInfo(cleanModuleName(name), version, null);
     }
 
     // Stolen from jdk.internal.module.ModulePath

bs-dev/src/main/java/module-info.java

@@ -4,6 +4,7 @@
  */
 module net.minecraftforge.bootstrap.dev {
     exports net.minecraftforge.bootstrap.dev;
+
     requires net.minecraftforge.bootstrap.api;
 
     provides net.minecraftforge.bootstrap.api.BootstrapClasspathModifier with