diff --git a/legacytest/forge/src/main/java/mymod/MyMod.java b/legacytest/forge/src/main/java/mymod/MyMod.java index 6a108083..f7f1e519 100644 --- a/legacytest/forge/src/main/java/mymod/MyMod.java +++ b/legacytest/forge/src/main/java/mymod/MyMod.java @@ -8,4 +8,14 @@ public class MyMod { public void run() { DetectedVersion.tryDetectVersion(); } + + @javax.annotation.Nullable + private static Object javaxNullableTest() { + return null; + } + + @org.jetbrains.annotations.Nullable + private static Object jetbrainsNullableTest() { + return null; + } } diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeMetadataTransform.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeMetadataTransform.java index 45eabd84..b6600682 100644 --- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeMetadataTransform.java +++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeMetadataTransform.java @@ -2,7 +2,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import java.util.List; import javax.inject.Inject; import org.gradle.api.Action; import org.gradle.api.artifacts.CacheableRule; @@ -121,15 +120,5 @@ public void adaptWithConfig(ComponentMetadataContext context, JsonObject config) }); variantMetadata.withFiles(metadata -> metadata.addFile(universalJarName, universalJarName)); }); - - // Use a fake capability to make it impossible for the implicit variants to be selected - for (var implicitVariantName : List.of("compile", "runtime")) { - details.withVariant(implicitVariantName, variant -> { - variant.withCapabilities(caps -> { - caps.removeCapability(id.getGroup(), id.getName()); - caps.addCapability("___dummy___", "___dummy___", "___dummy___"); - }); - }); - } } } diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyMetadataTransform.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyMetadataTransform.java index a4bf8819..5aaddfc5 100644 --- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyMetadataTransform.java +++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyMetadataTransform.java @@ -5,6 +5,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.util.List; import java.util.jar.JarInputStream; import org.gradle.api.GradleException; import org.gradle.api.artifacts.ComponentMetadataContext; @@ -40,6 +41,17 @@ protected final void executeWithConfig(ComponentMetadataContext context, String throw new GradleException("Couldn't find config.json in " + path); } adaptWithConfig(context, configRootHolder[0]); + + // Use a fake capability to make it impossible for the implicit variants to be selected + for (var implicitVariantName : List.of("compile", "runtime")) { + var details = context.getDetails(); + details.withVariant(implicitVariantName, variant -> { + variant.withCapabilities(caps -> { + caps.removeCapability(details.getId().getGroup(), details.getId().getName()); + caps.addCapability("___dummy___", "___dummy___", "___dummy___"); + }); + }); + } } protected abstract void adaptWithConfig(ComponentMetadataContext context, JsonObject config);