From bf0261e851a0d64c8e31fe22e7674e1981056b89 Mon Sep 17 00:00:00 2001 From: glitch Date: Sat, 30 Sep 2023 17:10:58 -0500 Subject: [PATCH] Update to Loom 1.4 --- fabric-loom | 2 +- patches/0001-Initial-Quiltification.patch | 86 ++++++------------- ...abric-dependencies-replaced-by-Quilt.patch | 6 +- patches/0003-Support-QMJ.patch | 26 +++--- .../0004-Support-QMJ5-too-experimental.patch | 46 ++++++---- 5 files changed, 76 insertions(+), 90 deletions(-) diff --git a/fabric-loom b/fabric-loom index ffc786d..b7c8013 160000 --- a/fabric-loom +++ b/fabric-loom @@ -1 +1 @@ -Subproject commit ffc786d3cd4b6835196a3f8945d01119fcd0ac16 +Subproject commit b7c80133ce9e6f13ced8ee2634f2f62690eff2e9 diff --git a/patches/0001-Initial-Quiltification.patch b/patches/0001-Initial-Quiltification.patch index 838a57c..1230a39 100644 --- a/patches/0001-Initial-Quiltification.patch +++ b/patches/0001-Initial-Quiltification.patch @@ -13,43 +13,19 @@ This includes: - Adding Vineflower and using it by default diff --git a/build.gradle b/build.gradle -index c7ff152af65d5e2724df765f3539de2df0a1d519..33d81ac54db205b54b5858c11cf3f30f09222df5 100644 +index 014f8da9a6d07b509d938de7c6090c1b3b8de573..6df36c1184b3ee5581c68bb46d3004adc308b1ef 100644 --- a/build.gradle +++ b/build.gradle -@@ -23,7 +23,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +@@ -49,7 +49,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } } -group = 'net.fabricmc' +group = 'org.quiltmc' - archivesBaseName = project.name - def baseVersion = '1.3' + def baseVersion = '1.4' -@@ -45,6 +45,11 @@ repositories { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } -+ maven { -+ name = "Quilt" -+ url = "https://maven.quiltmc.org/repository/release" -+ } -+ gradlePluginPortal() - mavenCentral() - } - -@@ -108,6 +113,11 @@ dependencies { - // Kapt integration - compileOnly libs.kotlin.gradle.plugin - -+ // Plugins we apply -+ implementation('io.github.juuxel:loom-vineflower:1.11.0') { -+ exclude group: 'net.fabricmc', module: 'fabric-loom' -+ } -+ - // Testing - testImplementation(gradleTestKit()) - testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') { -@@ -184,10 +194,16 @@ codenarc { + def ENV = System.getenv() +@@ -251,10 +251,16 @@ codenarc { gradlePlugin { plugins { @@ -68,7 +44,7 @@ index c7ff152af65d5e2724df765f3539de2df0a1d519..33d81ac54db205b54b5858c11cf3f30f } } -@@ -242,8 +258,8 @@ publishing { +@@ -311,8 +317,8 @@ publishing { // Manually crate the plugin marker for snapshot versions snapshotPlugin(MavenPublication) { publication -> @@ -79,7 +55,7 @@ index c7ff152af65d5e2724df765f3539de2df0a1d519..33d81ac54db205b54b5858c11cf3f30f version baseVersion + '-SNAPSHOT' pom.withXml({ -@@ -253,9 +269,9 @@ publishing { +@@ -322,9 +328,9 @@ publishing { Node dependencies = root.appendChild(document.createElement('dependencies')) Node dependency = dependencies.appendChild(document.createElement('dependency')) Node groupId = dependency.appendChild(document.createElement('groupId')) @@ -91,7 +67,7 @@ index c7ff152af65d5e2724df765f3539de2df0a1d519..33d81ac54db205b54b5858c11cf3f30f Node version = dependency.appendChild(document.createElement('version')) version.setTextContent(baseVersion + '-SNAPSHOT') }) -@@ -263,6 +279,7 @@ publishing { +@@ -332,6 +338,7 @@ publishing { } repositories { maven { @@ -99,7 +75,7 @@ index c7ff152af65d5e2724df765f3539de2df0a1d519..33d81ac54db205b54b5858c11cf3f30f if (ENV.MAVEN_URL) { url ENV.MAVEN_URL credentials { -@@ -271,6 +288,26 @@ publishing { +@@ -340,6 +347,26 @@ publishing { } } } @@ -141,18 +117,9 @@ index 31014b156127886c44921900f480e68d4528da25..ee1d4c3083cdb729df09522e88a41351 kotlin.stdlib.default.dependency = false \ No newline at end of file diff --git a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java -index 9c9c938e2e57b1d41c732014a2d6f5bcefd37e7b..5f54c3745bd0e89cb3df6b56e8b2a36fcfb9e60b 100644 +index 8231476d474a431b632ee75251dbc76e9212bc7f..98be8d15cac40265413e890bf9eca9acff017944 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java -@@ -53,7 +53,7 @@ import net.fabricmc.loom.util.LibraryLocationLogger; - public class LoomGradlePlugin implements BootstrappedPlugin { - public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); -- public static final String LOOM_VERSION = Objects.requireNonNullElse(LoomGradlePlugin.class.getPackage().getImplementationVersion(), "0.0.0+unknown"); -+ public static final String LOOM_VERSION = Objects.requireNonNullElse(LoomGradlePlugin.class.getPackage().getImplementationVersion(), "0.12.0+unknown"); - - /** - * An ordered list of setup job classes. @@ -79,7 +79,7 @@ public class LoomGradlePlugin implements BootstrappedPlugin { } @@ -162,14 +129,6 @@ index 9c9c938e2e57b1d41c732014a2d6f5bcefd37e7b..5f54c3745bd0e89cb3df6b56e8b2a36f LibraryLocationLogger.logLibraryVersions(); // Apply default plugins -@@ -94,5 +94,7 @@ public class LoomGradlePlugin implements BootstrappedPlugin { - for (Class jobClass : SETUP_JOBS) { - project.getObjects().newInstance(jobClass).run(); - } -+ -+ project.apply(ImmutableMap.of("plugin", "io.github.juuxel.loom-vineflower")); - } - } diff --git a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java index 29b4a526050a69cb5ccaa2d067fa5ecaa0347bf0..dc4895d24e908cf5d041ae71ef17dac40e6c86bf 100644 --- a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java @@ -270,7 +229,7 @@ index d7f0c469b92b3acfb24a623306f8d63bf44eafbe..12f19648c39d6eec91d8bd09cdd3400a @Override diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java -index c47746099e922ab35c6528bf6992a3b1ed063018..d0cce1fab554e97e7dfca0855068b82a4e601bbc 100644 +index c47746099e922ab35c6528bf6992a3b1ed063018..53a0976dfbb51cdcbd444380904145b87eecc110 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -55,15 +55,17 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask { @@ -310,6 +269,17 @@ index c47746099e922ab35c6528bf6992a3b1ed063018..d0cce1fab554e97e7dfca0855068b82a } final boolean plainConsole = getProject().getGradle().getStartParameter().getConsoleOutput() == ConsoleOutput.Plain; +@@ -133,6 +135,10 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask { + } + + public LaunchConfig property(String side, String key, String value) { ++ if (key.startsWith("loader.")) { ++ // add the fabric loader property too for compat ++ property(side, "fabric." + key.substring("loader.".length()), value); ++ } + values.computeIfAbsent(side + "Properties", (s -> new ArrayList<>())) + .add(String.format("%s=%s", key, value)); + return this; diff --git a/src/main/java/net/fabricmc/loom/task/service/SourceRemapperService.java b/src/main/java/net/fabricmc/loom/task/service/SourceRemapperService.java index b3f5456c1317acc23b903df9451b59683d677dcf..18341c50640d4e42f2391ae46c3d2be772c3a18f 100644 --- a/src/main/java/net/fabricmc/loom/task/service/SourceRemapperService.java @@ -324,7 +294,7 @@ index b3f5456c1317acc23b903df9451b59683d677dcf..18341c50640d4e42f2391ae46c3d2be7 } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java -index eebfeee5b4b4245aa867ee4a3c8a1bf4ffae081a..d12a938af780a8adf995da406ce7a4c2274b7980 100644 +index 42692aabc0c49424b9fab10ae84b627ce6f5a9d5..4ad7a56e0eb19032b16b570208021dac077a03cf 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -32,6 +32,7 @@ public class Constants { @@ -353,7 +323,7 @@ index 3350a985f73e403f086a2a988283cbe4644d0cc2..eef1cd42b1e53497012165e1580c6199 + } } diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java -index 17fa8a52e63b8d17b7ae5e72402b47f4046f7e31..0ad332ebf7bf1dc6316ba3c32303a685c55e02a7 100644 +index 1f4fca35e5773219317492661abadbc3161ecba1..c70e73680419435ee83960c21518ce6734fac9ab 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -128,7 +128,7 @@ public class SourceRemapper { @@ -392,7 +362,7 @@ index 6575611dea711ca1bb284a76132110404cdd95cb..b6f0ed542dc183f5782e300c57dce2c3 private SharedServiceManager sharedServiceManager = new BuildSharedServiceManagerImpl(); private final AtomicInteger refCount = new AtomicInteger(0); diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy -index 5b2f0e105991b8493ca4473a0570cd7457156c07..2543ef15921abf504683452eb2e05cb2a05b1947 100644 +index 7431aae09931a6e8656dfb801b9005feb0baa823..c755bb6bc8faa028b19392ce391adbb0cf10b05f 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy @@ -46,6 +46,7 @@ class DecompileTest extends Specification implements GradleProjectTestTrait { @@ -402,12 +372,12 @@ index 5b2f0e105991b8493ca4473a0570cd7457156c07..2543ef15921abf504683452eb2e05cb2 + 'vineflower' | "genSourcesWithVineflower" | PRE_RELEASE_GRADLE 'fernflower' | "genSourcesWithFernFlower" | PRE_RELEASE_GRADLE 'cfr' | "genSourcesWithCfr" | PRE_RELEASE_GRADLE - } + 'vineflower' | "genSourcesWithVineflower" | PRE_RELEASE_GRADLE diff --git a/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy -index a741f095beaa9510e4c723b7d8fc6079a91790db..0ee6af97f298a13b35ea6c9f794592fc6ec8fdce 100644 +index 11e2a7070021ebd0fd9005b93151540c7c934b12..0ee3043e1a8429e37dca65e03f6e54498f3182f0 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy -@@ -237,7 +237,7 @@ trait GradleProjectTestTrait { +@@ -238,7 +238,7 @@ trait GradleProjectTestTrait { } File getGeneratedSources(String mappings, String jarType = "merged") { diff --git a/patches/0002-Exclude-Fabric-dependencies-replaced-by-Quilt.patch b/patches/0002-Exclude-Fabric-dependencies-replaced-by-Quilt.patch index fd4de1e..01b4ccb 100644 --- a/patches/0002-Exclude-Fabric-dependencies-replaced-by-Quilt.patch +++ b/patches/0002-Exclude-Fabric-dependencies-replaced-by-Quilt.patch @@ -5,15 +5,17 @@ Subject: [PATCH] Exclude Fabric dependencies replaced by Quilt diff --git a/src/main/java/net/fabricmc/loom/configuration/InstallerData.java b/src/main/java/net/fabricmc/loom/configuration/InstallerData.java -index 9496320b9c7f7c9374f208f5445ceb174a7837f2..4083a9cf3dc8c655743a9c1c58813b681a0aed1f 100644 +index ce8da78d03c3bbcc19a9620c9d5d30fc8a058e7d..0d77a02472d055fab95613dbbd4e6dbaa08ea4f9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/InstallerData.java +++ b/src/main/java/net/fabricmc/loom/configuration/InstallerData.java -@@ -35,7 +35,7 @@ import net.fabricmc.loom.LoomRepositoryPlugin; +@@ -40,9 +40,8 @@ import net.fabricmc.loom.LoomRepositoryPlugin; import net.fabricmc.loom.configuration.ide.idea.IdeaUtils; import net.fabricmc.loom.util.Constants; -public record InstallerData(String version, JsonObject installerJson) { +public record InstallerData(String version, JsonObject installerJson, boolean isQuilt) { + private static final Logger LOGGER = LoggerFactory.getLogger(InstallerData.class); +- public void applyToProject(Project project) { LoomGradleExtension extension = LoomGradleExtension.get(project); diff --git a/patches/0003-Support-QMJ.patch b/patches/0003-Support-QMJ.patch index 3195111..bb220cf 100644 --- a/patches/0003-Support-QMJ.patch +++ b/patches/0003-Support-QMJ.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Support QMJ diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java -index 45587d96394ba1e4d9dffb790d80a76b4b3f39f8..74e2503874e0db6773a55309b56176f947258d90 100644 +index 78584e11079ec0bb5000f5441ad159b65ed22b76..cfea29e66d4c9c266dbf87824b848446f36133b6 100644 --- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java +++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java -@@ -141,10 +141,10 @@ public interface LoomGradleExtensionAPI { +@@ -144,10 +144,10 @@ public interface LoomGradleExtensionAPI { void disableDeprecatedPomGeneration(MavenPublication publication); /** @@ -730,7 +730,7 @@ index 86316049c4c17f9362ab3a10cb25489d29a05229..04b0ede63d0f2058f0d84ac8db2ae5ed scheduleSourcesRemapping(project, sourceRemapper, modDependency); modDependencies.add(modDependency); diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java -index f302600a4517988772961bf6b4c7c4f6ab07c8aa..26b28183a5aa9011cad6c457a6990989f03d54fa 100644 +index 3ed36eef9786d0c89a45d5552d05be292425cee8..bfd83ec633a254ebc2aa1a05f7ffa88dadbb3e1a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -47,6 +47,7 @@ import org.gradle.api.attributes.Usage; @@ -762,10 +762,10 @@ index f302600a4517988772961bf6b4c7c4f6ab07c8aa..26b28183a5aa9011cad6c457a6990989 throw new UncheckedIOException("Failed to strip nested jars from %s".formatted(path), e); } diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java b/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java -index 7a773e781f1698a0ffaa48f65472911b03a2a9b3..6107b609b2fad5f997b19bbf73dafafe1c82e012 100644 +index 781ca37f2c763de0acbcb9254792052289ed00f9..ffdef6f8a9d6ae671c65a0068ec04426310e0474 100644 --- a/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java -@@ -36,17 +36,15 @@ import java.util.List; +@@ -38,18 +38,16 @@ import java.util.Objects; import javax.inject.Inject; @@ -779,12 +779,13 @@ index 7a773e781f1698a0ffaa48f65472911b03a2a9b3..6107b609b2fad5f997b19bbf73dafafe import net.fabricmc.loom.api.processor.MinecraftJarProcessor; import net.fabricmc.loom.api.processor.ProcessorContext; import net.fabricmc.loom.api.processor.SpecContext; + import net.fabricmc.loom.util.Checksum; -import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.fmj.FabricModJson; import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.mappingio.tree.MemoryMappingTree; -@@ -70,8 +68,8 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor javadocs = new ArrayList<>(); @@ -795,9 +796,9 @@ index 7a773e781f1698a0ffaa48f65472911b03a2a9b3..6107b609b2fad5f997b19bbf73dafafe if (javadoc != null) { javadocs.add(javadoc); -@@ -106,19 +104,18 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor patternFilterable.include("fabric.mod.json")).getSingleFile(); diff --git a/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java b/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java -index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb1509ced0 100644 +index 7da1ea1e580ddcd83153750031aed0f2a510b4f6..1126c8cb52e930426252d296b42c3a699b70eeb5 100644 --- a/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java @@ -28,6 +28,7 @@ import java.io.ByteArrayInputStream; @@ -99,8 +111,8 @@ index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; - import java.util.List; -@@ -40,6 +41,7 @@ import java.util.jar.Manifest; + import java.util.Collections; +@@ -41,6 +42,7 @@ import java.util.jar.Manifest; import javax.inject.Inject; import com.google.common.base.Preconditions; @@ -108,7 +120,7 @@ index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb import org.gradle.api.Action; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.file.RegularFileProperty; -@@ -60,8 +62,11 @@ import org.gradle.workers.WorkParameters; +@@ -62,8 +64,11 @@ import org.gradle.workers.WorkParameters; import org.gradle.workers.WorkQueue; import org.gradle.workers.WorkerExecutor; import org.jetbrains.annotations.ApiStatus; @@ -120,8 +132,8 @@ index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.task.service.JarManifestService; import net.fabricmc.loom.util.ZipReprocessorUtil; -@@ -75,6 +80,8 @@ public abstract class AbstractRemapJarTask extends Jar { - public static final String MANIFEST_CLIENT_ENTRIES_KEY = "Fabric-Loom-Client-Only-Entries"; +@@ -78,6 +83,8 @@ public abstract class AbstractRemapJarTask extends Jar { + public static final String MANIFEST_JAR_TYPE_KEY = "Fabric-Jar-Type"; public static final Attributes.Name MANIFEST_SPLIT_ENV_NAME = new Attributes.Name(MANIFEST_SPLIT_ENV_KEY); public static final Attributes.Name MANIFEST_CLIENT_ENTRIES_NAME = new Attributes.Name(MANIFEST_CLIENT_ENTRIES_KEY); + public static final String QUILT_MOD_JSON5_PATH = "quilt.mod.json5"; @@ -129,7 +141,7 @@ index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb @InputFile public abstract RegularFileProperty getInputFile(); -@@ -184,6 +191,18 @@ public abstract class AbstractRemapJarTask extends Jar { +@@ -200,6 +207,18 @@ public abstract class AbstractRemapJarTask extends Jar { outputFile = getParameters().getOutputFile().getAsFile().get().toPath(); } @@ -149,10 +161,10 @@ index 3abc7c0a49a1cb1a0f8da48a24e36bc852a4a90a..6554d5695ce9c128dfc02c512eeae7bb int count = ZipUtils.transform(outputFile, Map.of(MANIFEST_PATH, bytes -> { var manifest = new Manifest(new ByteArrayInputStream(bytes)); diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java -index 330ea8ece29f26a1e85a9dc844c234c588fa0e55..3464d09b8ab7d58f2d7c9107165bb2b63eb1dce9 100644 +index 71ccb96214c455694fe9e824991b7cca0075cc1d..c6da0fd215b4d15ea506d30dcaee4c6ce3b59e9c 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java -@@ -219,6 +219,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask { +@@ -221,6 +221,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask { markClientOnlyClasses(); } @@ -161,10 +173,10 @@ index 330ea8ece29f26a1e85a9dc844c234c588fa0e55..3464d09b8ab7d58f2d7c9107165bb2b6 addRefmaps(); addNestedJars(); diff --git a/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java -index cca9638ed583a3e25e3142f02188293f2c23a6c5..7138ecdddcff8cd9959408c4205552882f014d2e 100644 +index 2a9424acc87f88c62cb2e9595dea0c80300de0ba..1f46e09dada6bf1b3de84283f24421939b698a5c 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java -@@ -87,6 +87,7 @@ public abstract class RemapSourcesJarTask extends AbstractRemapJarTask { +@@ -88,6 +88,7 @@ public abstract class RemapSourcesJarTask extends AbstractRemapJarTask { try { sourceRemapperService.remapSourcesJar(inputFile, outputFile); @@ -173,7 +185,7 @@ index cca9638ed583a3e25e3142f02188293f2c23a6c5..7138ecdddcff8cd9959408c420555288 rewriteJar(); } catch (Exception e) { diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java -index d0cce1fab554e97e7dfca0855068b82a4e601bbc..e10a23735cf680311e94b04d4b4519f40641053f 100644 +index 53a0976dfbb51cdcbd444380904145b87eecc110..b206c7077f47fd31cd50bd289e5b6513db645a79 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -57,6 +57,7 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {