Fix overloads

This commit is contained in:
Fury_Phoenix 2023-12-10 16:21:26 -08:00
parent 52293cbc50
commit e190a71327
No known key found for this signature in database
GPG Key ID: 0595F98084987DB8

View File

@ -7,7 +7,6 @@ import java.lang.invoke.*;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -72,7 +71,7 @@ public class ClientMixinValidator {
)); ));
} }
private boolean targetsClient(List<?> classTargets) { private boolean targetsClient(Collection<?> classTargets) {
return classTargets.stream().anyMatch(this::targetsClient); return classTargets.stream().anyMatch(this::targetsClient);
} }
@ -157,11 +156,9 @@ public class ClientMixinValidator {
private static Collection<Object> getTargets(IAnnotationHandle mixinAnnotation) { private static Collection<Object> getTargets(IAnnotationHandle mixinAnnotation) {
Collection<? extends TypeMirror> clzss = mixinAnnotation.getList("value"); Collection<? extends TypeMirror> clzss = mixinAnnotation.getList("value");
Collection<? extends String> imaginary = mixinAnnotation.getList("targets"); Collection<? extends String> imaginary = mixinAnnotation.getList("targets");
Collection<Object> targets = return Stream.of(clzss, imaginary)
Stream.of(clzss, imaginary)
.flatMap(Collection::stream) .flatMap(Collection::stream)
.collect(Collectors.toList()); .collect(Collectors.toList());
return targets;
} }
private static Map<Class<? extends Annotation>, Class<? extends Enum<?>>> private static Map<Class<? extends Annotation>, Class<? extends Enum<?>>>