Skip to content

Fix legacy not being able to access JetBrains annotations #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shartte merged 3 commits into from
Jul 17, 2025
Merged

Fix legacy not being able to access JetBrains annotations #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d3d502
Test that legacy can access JB annotations
Technici4n Jul 17, 2025
9977c9b
Actually fix the issue
Technici4n Jul 17, 2025
1766e18
Pull shared logic into parent class
Technici4n Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions legacytest/forge/src/main/java/mymod/MyMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
11 changes: 0 additions & 11 deletions ...cy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeMetadataTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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___");
});
});
}
}
}
12 changes: 12 additions & 0 deletions src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyMetadataTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading