Skip to content

Fix default @Mod detection for multiple entrypoints #90

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
noeppi-noeppi merged 1 commit into from
Jan 11, 2026
Merged

Fix default @Mod detection for multiple entrypoints #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions src/ap/java/org/moddingx/libx/annotation/processor/modinit/ModInitProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
import java.util.*;
import java.util.stream.Collectors;

public class ModInitProcessor extends Processor implements ModEnv {

Expand Down Expand Up @@ -54,14 +55,23 @@ public void run(Set<? extends TypeElement> annotations, RoundEnvironment roundEn

{
TypeElement modAnnotation = this.typeElement(Classes.MOD);
TypeMirror modxType = this.forClass(Classes.MODX);
Set<? extends Element> elems = roundEnv.getElementsAnnotatedWith(modAnnotation);
if (elems.size() == 1) {
Element elem = elems.iterator().next();
String modid = this.modidFromAnnotation(elems.iterator().next());
if (modid != null) {
this.defaultModid = modid;
this.defaultMod = elem;
}

Set<String> modids = elems.stream()
.map(this::modidFromAnnotation)
.filter(Objects::nonNull)
.collect(Collectors.toSet());

if (modids.size() == 1) {
Optional<? extends Element> main = elems.stream()
.filter(e -> this.subTypeErasure(e.asType(), modxType))
.findFirst();

main.ifPresent(element -> {
this.defaultModid = modids.iterator().next();
this.defaultMod = element;
});
}
}

Expand Down