diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-01-19 22:02:33 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-01-19 22:02:33 +0800 |
| commit | fd391958c0f23820f274786244a5927695951f19 (patch) | |
| tree | 5d7cba1305dbb5b698034799814bcc2dbcbe343e | |
| parent | b57e5a82270b9c001ad2b8442ab4a6f8e0570398 (diff) | |
| download | architectury-loom-fd391958c0f23820f274786244a5927695951f19.tar.gz architectury-loom-fd391958c0f23820f274786244a5927695951f19.tar.bz2 architectury-loom-fd391958c0f23820f274786244a5927695951f19.zip | |
Adding Constant of the plugin id, don't duplicate the classpath if it is already the root project.
| -rw-r--r-- | settings.gradle | 1 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java | 3 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/Constants.java | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/settings.gradle b/settings.gradle index 58341acf..78daf2cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ rootProject.name = "forgified-fabric-loom" - diff --git a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java index 7135df03..a8844f22 100644 --- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java +++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java @@ -45,6 +45,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; import net.fabricmc.loom.api.decompilers.DecompilationMetadata; import net.fabricmc.loom.api.decompilers.LoomDecompiler; +import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.ConsumingOutputStream; import net.fabricmc.loom.util.OperatingSystem; @@ -100,7 +101,7 @@ public abstract class AbstractFernFlowerDecompiler implements LoomDecompiler { progressGroup.started(); ExecResult result = ForkingJavaExec.javaexec( - project.getRootProject().getPlugins().hasPlugin("forgified-fabric-loom") ? project.getRootProject() : project, + project.getRootProject().getPlugins().hasPlugin(Constants.PLUGIN_ID) ? project.getRootProject() : project, spec -> { spec.setMain(fernFlowerExecutor().getName()); spec.jvmArgs("-Xms200m", "-Xmx3G"); diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index c9a7c15c..eb37930e 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -34,6 +34,7 @@ import net.fabricmc.loom.configuration.RemappedConfigurationEntry; import net.fabricmc.loom.util.gradle.GradleSupport; public class Constants { + public static final String PLUGIN_ID = "forgified-fabric-loom"; public static final String LIBRARIES_BASE = "https://libraries.minecraft.net/"; public static final String RESOURCES_BASE = "http://resources.download.minecraft.net/"; public static final String VERSION_MANIFESTS = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json"; |