Merge branch 'dev'

Author: aoqia194

build.gradle

@@ -287,8 +287,8 @@ publishing {
                 }
             }
             scm {
-                connection = "scm:git:https://github.com/aoqia194/" + project.name + "/.git"
-                developerConnection = "scm:git:ssh://github.com/aoqia194/" + project.name + "/.git"
+                connection = "scm:git:https://github.com/aoqia194/leaf-" + project.name + "/.git"
+                developerConnection = "scm:git:ssh://github.com/aoqia194/leaf-" + project.name + "/.git"
                 url = rootProject.url
             }
         }

gradle.properties

@@ -1,7 +1,7 @@
 group = dev.aoqia.leaf
 name = loom
 description = The Gradle plugin for Leaf (fabric fork)
-version = 0.1.6
+version = 0.1.7
 url = https://github.com/aoqia194/leaf-loom
 
 kotlin.stdlib.default.dependency = false

src/main/java/dev/aoqia/leaf/loom/configuration/CompileConfiguration.java

@@ -23,7 +23,6 @@
  */
 package dev.aoqia.leaf.loom.configuration;
 
-import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -62,6 +61,7 @@
 import dev.aoqia.leaf.loom.util.gradle.daemon.DaemonUtils;
 import dev.aoqia.leaf.loom.util.service.ScopedServiceFactory;
 import dev.aoqia.leaf.loom.util.service.ServiceFactory;
+import javax.inject.Inject;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
@@ -102,7 +102,8 @@ public void run() {
         });
 
         afterEvaluationWithService((serviceFactory) -> {
-            final ConfigContext configContext = new ConfigContextImpl(getProject(), serviceFactory, extension);
+            final ConfigContext configContext = new ConfigContextImpl(getProject(), serviceFactory,
+                extension);
 
             ZomboidSourceSets.get(getProject()).afterEvaluate(getProject());
             final boolean previousRefreshDeps = extension.refreshDeps();
@@ -112,7 +113,8 @@ public void run() {
                 getProject()
                     .getLogger()
                     .lifecycle(
-                        "Found existing cache lock file ({}), rebuilding loom cache. This may have been "
+                        "Found existing cache lock file ({}), rebuilding loom cache. This may " +
+                        "have been "
                         + "caused by a failed or canceled build.",
                         lockResult);
                 extension.setRefreshDeps(true);
@@ -121,22 +123,25 @@ public void run() {
             try {
                 setupZomboid(configContext);
 
-                if (!GradleUtils.getBooleanProperty(getProject(), Constants.Properties.ONLY_PROVIDE_JARS)) {
+                if (!GradleUtils.getBooleanProperty(getProject(),
+                    Constants.Properties.ONLY_PROVIDE_JARS)) {
                     LoomDependencyManager dependencyManager = new LoomDependencyManager();
                     extension.setDependencyManager(dependencyManager);
                     dependencyManager.handleDependencies(getProject(), serviceFactory);
                 }
             } catch (Exception e) {
                 ExceptionUtil.processException(e, DaemonUtils.Context.fromProject(getProject()));
                 disownLock();
-                throw ExceptionUtil.createDescriptiveWrapper(RuntimeException::new, "Failed to setup Zomboid", e);
+                throw ExceptionUtil.createDescriptiveWrapper(RuntimeException::new,
+                    "Failed to setup Zomboid", e);
             }
 
             releaseLock();
             extension.setRefreshDeps(previousRefreshDeps);
 
             // If only providing jars, we dont do mixin stuff or decompile tasks.
-            if (GradleUtils.getBooleanProperty(getProject(), Constants.Properties.ONLY_PROVIDE_JARS)) {
+            if (GradleUtils.getBooleanProperty(getProject(),
+                Constants.Properties.ONLY_PROVIDE_JARS)) {
                 return;
             }
 
@@ -161,27 +166,34 @@ public void run() {
         // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
         getTasks()
             .withType(AbstractCopyTask.class)
-            .configureEach(abstractCopyTask -> abstractCopyTask.setFilteringCharset(StandardCharsets.UTF_8.name()));
+            .configureEach(abstractCopyTask -> abstractCopyTask.setFilteringCharset(
+                StandardCharsets.UTF_8.name()));
         getTasks()
             .withType(JavaCompile.class)
-            .configureEach(javaCompile -> javaCompile.getOptions().setEncoding(StandardCharsets.UTF_8.name()));
+            .configureEach(
+                javaCompile -> javaCompile.getOptions().setEncoding(StandardCharsets.UTF_8.name()));
 
         if (getProject().getPluginManager().hasPlugin("org.jetbrains.kotlin.kapt")) {
-            // If loom is applied after kapt, then kapt will use the AP arguments too early for loom to pass the
+            // If loom is applied after kapt, then kapt will use the AP arguments too early for
+            // loom to pass the
             // arguments we need for mixin.
-            throw new IllegalArgumentException("leaf-loom must be applied BEFORE kapt in the plugins { } block.");
+            throw new IllegalArgumentException(
+                "leaf-loom must be applied BEFORE kapt in the plugins { } block.");
         }
     }
 
-    // This is not thread safe across getProject()s synchronize it here just to be sure, might be possible to move
+    // This is not thread safe across getProject()s synchronize it here just to be sure, might be
+    // possible to move
     // this further down, but for now this will do.
     private synchronized void setupZomboid(ConfigContext configContext) throws Exception {
         final Project project = configContext.project();
         final LoomGradleExtension extension = configContext.extension();
 
-        final ZomboidMetadataProvider clientMetadataProvider = ZomboidMetadataProvider.create(false, configContext);
+        final ZomboidMetadataProvider clientMetadataProvider = ZomboidMetadataProvider.create(false,
+            configContext);
         extension.setClientMetadataProvider(clientMetadataProvider);
-        final ZomboidMetadataProvider serverMetadataProvider = ZomboidMetadataProvider.create(true, configContext);
+        final ZomboidMetadataProvider serverMetadataProvider = ZomboidMetadataProvider.create(true,
+            configContext);
         extension.setServerMetadataProvider(serverMetadataProvider);
 
         var jarConfiguration = extension.getZomboidJarConfiguration().get();
@@ -197,10 +209,15 @@ private synchronized void setupZomboid(ConfigContext configContext) throws Excep
             return;
         }
 
+        // Realise the dependencies without actually resolving them, this forces any lazy
+        // providers to be created, populating the layered mapping factories.
+        project.getConfigurations().getByName(Configurations.MAPPINGS).getDependencies().toArray();
+
         // Created any layered mapping files.
         LayeredMappingsFactory.afterEvaluate(configContext);
 
-        final DependencyInfo mappingsDep = DependencyInfo.create(getProject(), Configurations.MAPPINGS);
+        final DependencyInfo mappingsDep = DependencyInfo.create(getProject(),
+            Configurations.MAPPINGS);
         final MappingConfiguration mappingConfiguration =
             MappingConfiguration.create(getProject(),
                 configContext.serviceFactory(),
@@ -209,10 +226,12 @@ private synchronized void setupZomboid(ConfigContext configContext) throws Excep
         extension.setMappingConfiguration(mappingConfiguration);
         mappingConfiguration.applyToProject(getProject(), mappingsDep);
 
-        NamedZomboidProvider<?> namedZomboidProvider = jarConfiguration.createNamedZomboidProvider(project);
+        NamedZomboidProvider<?> namedZomboidProvider = jarConfiguration.createNamedZomboidProvider(
+            project);
         registerGameProcessors(configContext);
 
-        ZomboidJarProcessorManager zomboidJarProcessorManager = ZomboidJarProcessorManager.create(getProject());
+        ZomboidJarProcessorManager zomboidJarProcessorManager = ZomboidJarProcessorManager.create(
+            getProject());
         if (zomboidJarProcessorManager != null) {
             // Wrap the named MC provider for one that will provide the processed jars
             namedZomboidProvider = jarConfiguration.createProcessedNamedZomboidProvider(
@@ -234,28 +253,29 @@ private void registerGameProcessors(ConfigContext configContext) {
             extension.getEnableTransitiveAccessWideners().get();
         extension.addZomboidJarProcessor(
             AccessWidenerJarProcessor.class,
-            "leaf-loom:access-widener",
+            "loom:access-widener",
             enableTransitiveAccessWideners,
             extension.getAccessWidenerPath());
 
         if (extension.getEnableModProvidedJavadoc().get()) {
-            extension.addZomboidJarProcessor(ModJavadocProcessor.class, "leaf-loom:mod-javadoc");
+            extension.addZomboidJarProcessor(ModJavadocProcessor.class, "loom:mod-javadoc");
         }
 
         final InterfaceInjectionExtensionAPI interfaceInjection = extension.getInterfaceInjection();
 
         if (interfaceInjection.isEnabled()) {
             extension.addZomboidJarProcessor(
                 InterfaceInjectionProcessor.class,
-                "leaf-loom:interface-inject",
+                "loom:interface-inject",
                 interfaceInjection.getEnableDependencyInterfaceInjection().get());
         }
     }
 
     private void setupMixinAp(MixinExtension mixin) {
         mixin.init();
 
-        // Disable some things used by log4j via the mixin AP that prevent it from being garbage collected
+        // Disable some things used by log4j via the mixin AP that prevent it from being garbage
+        // collected
         System.setProperty("log4j2.disable.jmx", "true");
         System.setProperty("log4j.shutdownHookEnabled", "false");
         System.setProperty("log4j.skipJansi", "true");
@@ -337,7 +357,8 @@ private LockResult acquireProcessLockWaiting(LockFile lockFile, Duration timeout
 
     // Returns true if our process already owns the lock
     @SuppressWarnings("BusyWait")
-    private LockResult acquireProcessLockWaiting_(LockFile lockFile, Duration timeout) throws IOException {
+    private LockResult acquireProcessLockWaiting_(LockFile lockFile, Duration timeout) throws
+        IOException {
         final long timeoutMs = timeout.toMillis();
         final Logger logger = Logging.getLogger("loom_acquireProcessLockWaiting");
         final long currentPid = ProcessHandle.current().pid();
@@ -354,7 +375,8 @@ private LockResult acquireProcessLockWaiting_(LockFile lockFile, Duration timeou
                     disowned = true;
                 } else {
                     lockingProcessId = Long.parseLong(lockValue);
-                    logger.lifecycle("\"{}\" is currently held by pid '{}'.", lockFile, lockingProcessId);
+                    logger.lifecycle("\"{}\" is currently held by pid '{}'.", lockFile,
+                        lockingProcessId);
                 }
             } catch (final Exception ignored) {
                 // ignored
@@ -367,10 +389,13 @@ private LockResult acquireProcessLockWaiting_(LockFile lockFile, Duration timeou
             Optional<ProcessHandle> handle = ProcessHandle.of(lockingProcessId);
 
             if (disowned) {
-                logger.lifecycle("Previous process has disowned the lock due to abrupt termination.");
+                logger.lifecycle(
+                    "Previous process has disowned the lock due to abrupt termination.");
                 Files.deleteIfExists(lockFile.file);
             } else if (handle.isEmpty()) {
-                logger.lifecycle("Locking process does not exist, assuming abrupt termination and deleting lock file.");
+                logger.lifecycle(
+                    "Locking process does not exist, assuming abrupt termination and deleting " +
+                    "lock file.");
                 Files.deleteIfExists(lockFile.file);
                 abrupt = true;
             } else {
@@ -400,7 +425,9 @@ private LockResult acquireProcessLockWaiting_(LockFile lockFile, Duration timeou
 
                     if (sleptMs >= timeoutMs) {
                         throw new GradleException(
-                            "Have been waiting on lock file '%s' for %s ms. Giving up as timeout is %s ms."
+                            ("Have been waiting on lock file '%s' for %s ms. Giving up as timeout" +
+                             " " +
+                             "is %s ms.")
                                 .formatted(lockFile, sleptMs, timeoutMs));
                     }
                 }
@@ -445,12 +472,14 @@ private void releaseLock() {
             Files.delete(lock);
         } catch (IOException e1) {
             try {
-                // If we failed to delete the lock file, moving it before trying to delete it may help.
+                // If we failed to delete the lock file, moving it before trying to delete it may
+                // help.
                 final Path del = lock.resolveSibling(lock.getFileName() + ".del");
                 Files.move(lock, del);
                 Files.delete(del);
             } catch (IOException e2) {
-                var exception = new UncheckedIOException("Failed to release getProject() configuration lock", e2);
+                var exception = new UncheckedIOException(
+                    "Failed to release getProject() configuration lock", e2);
                 exception.addSuppressed(e1);
                 throw exception;
             }

src/main/java/dev/aoqia/leaf/loom/configuration/InstallerData.java

@@ -47,11 +47,9 @@ public void applyToProject(Project project) {
         if (extension.getInstallerData() != null) {
             throw new IllegalStateException("Already applied installer data");
         }
-
         extension.setInstallerData(this);
 
         final JsonObject libraries = installerJson.get("libraries").getAsJsonObject();
-
         applyDependendencies(libraries.get("common").getAsJsonArray(), project);
 
         // Apply development dependencies if they exist.
@@ -62,19 +60,19 @@ public void applyToProject(Project project) {
 
     private void applyDependendencies(JsonArray jsonArray, Project project) {
         LoomGradleExtension extension = LoomGradleExtension.get(project);
-        Configuration loaderDepsConfig =
-                project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES);
-        Configuration annotationProcessor =
-                project.getConfigurations().getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME);
+        Configuration loaderDepsConfig = project.getConfigurations()
+            .getByName(Constants.Configurations.LOADER_DEPENDENCIES);
+        Configuration annotationProcessor = project.getConfigurations()
+            .getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME);
 
         for (JsonElement jsonElement : jsonArray) {
             final JsonObject jsonObject = jsonElement.getAsJsonObject();
             final String name = jsonObject.get("name").getAsString();
 
             LOGGER.debug("Adding dependency ({}) from installer JSON", name);
 
-            ExternalModuleDependency modDep =
-                    (ExternalModuleDependency) project.getDependencies().create(name);
+            ExternalModuleDependency modDep = (ExternalModuleDependency) project.getDependencies()
+                .create(name);
             modDep.setTransitive(false); // Match the launcher in not being transitive
             loaderDepsConfig.getDependencies().add(modDep);
 
@@ -101,17 +99,17 @@ private void addRepository(JsonObject jsonObject, Project project) {
 
         final String url = jsonObject.get("url").getAsString();
         final boolean isPresent = project.getRepositories().stream()
-                .filter(artifactRepository -> artifactRepository instanceof MavenArtifactRepository)
-                .map(artifactRepository -> (MavenArtifactRepository) artifactRepository)
-                .anyMatch(mavenArtifactRepository ->
-                        mavenArtifactRepository.getUrl().toString().equalsIgnoreCase(url));
+            .filter(artifactRepository -> artifactRepository instanceof MavenArtifactRepository)
+            .map(artifactRepository -> (MavenArtifactRepository) artifactRepository)
+            .anyMatch(mavenArtifactRepository ->
+                mavenArtifactRepository.getUrl().toString().equalsIgnoreCase(url));
 
         if (isPresent) {
             return;
         }
 
         project.getRepositories()
-                .maven(mavenArtifactRepository ->
-                        mavenArtifactRepository.setUrl(jsonObject.get("url").getAsString()));
+            .maven(mavenArtifactRepository ->
+                mavenArtifactRepository.setUrl(jsonObject.get("url").getAsString()));
     }
 }

src/main/java/dev/aoqia/leaf/loom/configuration/mods/ArtifactMetadata.java

@@ -94,7 +94,6 @@ public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVe
             }
 
             final Path installerPath = fs.getPath(INSTALLER_PATH);
-
             if (isFabricMod && Files.exists(installerPath)) {
                 final JsonObject jsonObject = LoomGradlePlugin.GSON.fromJson(
                         Files.readString(installerPath, StandardCharsets.UTF_8), JsonObject.class);

src/main/java/dev/aoqia/leaf/loom/configuration/processors/ZomboidJarProcessorManager.java

@@ -54,18 +54,20 @@ private ZomboidJarProcessorManager(List<ProcessorEntry<?>> jarProcessors) {
     @Nullable
     public static ZomboidJarProcessorManager create(Project project) {
         final LoomGradleExtension extension = LoomGradleExtension.get(project);
-        List<ZomboidJarProcessor<?>> processors =
-            new ArrayList<>(extension.getZomboidJarProcessors().get());
+        List<ZomboidJarProcessor<?>> processors = new ArrayList<>(
+            extension.getZomboidJarProcessors().get());
 
         for (JarProcessor legacyProcessor : extension.getGameJarProcessors().get()) {
-            processors.add(project.getObjects().newInstance(LegacyJarProcessorWrapper.class, legacyProcessor));
+            processors.add(
+                project.getObjects().newInstance(LegacyJarProcessorWrapper.class, legacyProcessor));
         }
 
         return ZomboidJarProcessorManager.create(processors, SpecContextImpl.create(project));
     }
 
     @Nullable
-    public static ZomboidJarProcessorManager create(List<ZomboidJarProcessor<?>> processors, SpecContext context) {
+    public static ZomboidJarProcessorManager create(List<ZomboidJarProcessor<?>> processors,
+        SpecContext context) {
         List<ProcessorEntry<?>> entries = new ArrayList<>();
 
         for (ZomboidJarProcessor<?> processor : processors) {
@@ -132,7 +134,8 @@ public void processJar(Path jar, ProcessorContext context) throws IOException {
                 entry.processJar(jar, context);
             } catch (IOException e) {
                 throw new IOException(
-                    "Failed to process jar when running jar processor: %s".formatted(entry.name()), e);
+                    "Failed to process jar when running jar processor: %s".formatted(entry.name()),
+                    e);
             }
         }
     }
@@ -165,7 +168,8 @@ private void processJar(Path jar, ProcessorContext context) throws IOException {
             processor().processJar(jar, spec, context);
         }
 
-        private boolean processMappings(MemoryMappingTree mappings, MappingProcessorContext context) {
+        private boolean processMappings(MemoryMappingTree mappings,
+            MappingProcessorContext context) {
             if (mappingsProcessor() == null) {
                 return false;
             }