diff options
author | Jonas Herzig <jonas@spark-squared.com> | 2022-01-11 16:32:38 +0100 |
---|---|---|
committer | Jonas Herzig <jonas@spark-squared.com> | 2022-01-11 16:32:38 +0100 |
commit | beb659eb6cde56b560531bc61abc3db3b02d8702 (patch) | |
tree | fb4425590ba7fc506f1ae15fd88c9b6404b488a3 /src/main/java/net/fabricmc | |
parent | 98173e3874d59d98bdb05298a6bf8e85d2502de8 (diff) | |
download | architectury-loom-beb659eb6cde56b560531bc61abc3db3b02d8702.tar.gz architectury-loom-beb659eb6cde56b560531bc61abc3db3b02d8702.tar.bz2 architectury-loom-beb659eb6cde56b560531bc61abc3db3b02d8702.zip |
Rename `isModLauncher` -> `isModernForge`
Usages are more related to the modern Forge than to ModLauncher specifically.
Diffstat (limited to 'src/main/java/net/fabricmc')
-rw-r--r-- | src/main/java/net/fabricmc/loom/LoomGradleExtension.java | 2 | ||||
-rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index b5566765..06208777 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -143,7 +143,7 @@ public interface LoomGradleExtension extends LoomGradleExtensionAPI { return isForge() && getForgeUserdevProvider().isLegacyForge(); } - default boolean isModLauncher() { + default boolean isModernForge() { return isForge() && !isLegacyForge(); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index ae52c76f..a8970bca 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -66,7 +66,7 @@ public class LaunchProvider extends DependencyProvider { .property("client", "java.library.path", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath()) .property("client", "org.lwjgl.librarypath", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath()); - if (!getExtension().isModLauncher()) { + if (!getExtension().isModernForge()) { launchConfig .argument("client", "--assetIndex") .argument("client", getExtension().getMinecraftProvider().getVersionInfo().assetIndex().fabricId(getExtension().getMinecraftProvider().minecraftVersion())) @@ -74,7 +74,7 @@ public class LaunchProvider extends DependencyProvider { .argument("client", new File(getDirectories().getUserCache(), "assets").getAbsolutePath()); } - if (getExtension().isModLauncher()) { + if (getExtension().isModernForge()) { launchConfig // Should match YarnNamingService.PATH_TO_MAPPINGS in forge-runtime .property("fabric.yarnWithSrg.path", getExtension().getMappingsProvider().tinyMappingsWithSrg.toAbsolutePath().toString()) |