From 01da04742ac13fc8b6688b3f43a92e1ff89fc7e1 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Tue, 31 Oct 2023 18:38:50 +0200 Subject: [PATCH] Add ModPlatform.id --- .../forge/FieldMigratedMappingConfiguration.java | 3 +-- src/main/java/net/fabricmc/loom/util/ModPlatform.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingConfiguration.java index 7a96e6db..cdcbf202 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingConfiguration.java @@ -35,7 +35,6 @@ import java.util.AbstractMap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; @@ -103,7 +102,7 @@ public final class FieldMigratedMappingConfiguration extends MappingConfiguratio public static String createForgeMappingsIdentifier(LoomGradleExtension extension, String mappingsName, String version, String classifier, String minecraftVersion) { final String base = FieldMigratedMappingConfiguration.createMappingsIdentifier(mappingsName, version, classifier, minecraftVersion); - final String platform = extension.getPlatform().get().name().toLowerCase(Locale.ROOT); + final String platform = extension.getPlatform().get().id(); final String forgeVersion = extension.getForgeProvider().getVersion().getCombined(); return base + "-" + platform + "-" + forgeVersion; } diff --git a/src/main/java/net/fabricmc/loom/util/ModPlatform.java b/src/main/java/net/fabricmc/loom/util/ModPlatform.java index c1e69ef8..b5e6588f 100644 --- a/src/main/java/net/fabricmc/loom/util/ModPlatform.java +++ b/src/main/java/net/fabricmc/loom/util/ModPlatform.java @@ -45,6 +45,13 @@ public enum ModPlatform { this.experimental = experimental; } + /** + * {@return the lowercase ID of this mod platform} + */ + public String id() { + return name().toLowerCase(Locale.ROOT); + } + public boolean isExperimental() { return experimental; } @@ -60,8 +67,8 @@ public enum ModPlatform { public static void assertPlatform(LoomGradleExtensionAPI extension, ModPlatform platform) { assertPlatform(extension, platform, () -> { String msg = "Loom is not running on %s.%nYou can switch to it by adding 'loom.platform = %s' to your gradle.properties"; - String name = platform.name().toLowerCase(Locale.ROOT); - return msg.formatted(name, name); + String id = platform.id(); + return msg.formatted(id, id); }); }