R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPEs

Browse Source 
Apparently class retained annotations are not available in AnnotatedConstruct#getAnnotation
This commit is contained in:
Fury_Phoenix 2023-12-03 15:50:17 -08:00
parent 2660df6db3
commit ecfc4ebc39
No known key found for this signature in database
GPG Key ID: 0595F98084987DB8
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/ClientMixinValidator.java
View File

@ -6,10 +6,10 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.processing.Messager;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
import net.fabricmc.api.Environment;
@ -30,16 +30,25 @@ public class ClientMixinValidator {
private final ProcessingEnvironment processingEnv;
private final Messager messager;
public ClientMixinValidator(ProcessingEnvironment env) {
typeHandleProvider = AnnotatedMixinsAccessor.getMixinAP(env);
processingEnv = env;
messager = env.getMessager();
}
public boolean validateMixin(TypeElement annotatedMixinClass) {
return targetsClient(annotatedMixinClass) &&
!getAnnotationHandle(annotatedMixinClass, ClientOnlyMixin.class).exists();
}
// some sort of javac bug with method reference resolution for mixed staticness
public boolean targetsClient(TypeElement annotatedMixinClass) {
return targetsClient(
ClientMixinValidator.getTargets(
getAnnotationHandle(annotatedMixinClass, Mixin.class)
)) && !getAnnotationHandle(annotatedMixinClass, ClientOnlyMixin.class).exists();
));
}
private boolean targetsClient(List<?> classTargets) {
@ -49,13 +58,11 @@ public class ClientMixinValidator {
private boolean targetsClient(Object classTarget) {
return switch (classTarget) {
case null -> throw new IllegalArgumentException("Can't be empty!");
case TypeMirror tm ->
EnvType.CLIENT == getEnvType(tm);
// If you're using a dollar sign in class names you are insane
case String s && (getEnvType(s) != null) ->
EnvType.CLIENT == getEnvType(s);
case String s -> warn(s);
case String s ->
EnvType.CLIENT == getEnvType(s.split("\\$")[0]);
default ->
throw new IllegalArgumentException("Unhandled type: " + classTarget.getClass() + "\n"
+ "Stringified contents: " + classTarget.toString());
@ -64,16 +71,17 @@ public class ClientMixinValidator {
private EnvType getEnvType(Object o) {
TypeHandle handle = getTypeHandle(o);
if(handle.isImaginary())
if(handle == null) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, o + " can't be found, skipping!");
return null;
Environment env = handle.getElement().getAnnotation(Environment.class);
if(env == null)
return null;
return env.value();
}
String[] stringEnum = handle.getAnnotation(Environment.class).getValue("value");
if(stringEnum == null) return null;
return Enum.valueOf(EnvType.class, stringEnum[1]);
}
private boolean warn(String s) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, s + "can't be loaded, so it is skipped!");
private boolean warn(Object o) {
messager.printMessage(Diagnostic.Kind.WARNING, o + " can't be loaded, so it is skipped!");
return false;
}

2
annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java
View File

@ -83,7 +83,7 @@ public class MixinProcessor extends AbstractProcessor {
return;
ClientMixinValidator validator = new ClientMixinValidator(processingEnv);
mixins.parallel()
.filter(validator::targetsClient)
.filter(validator::validateMixin)
.map(validator::getEntry)
.forEach(this::logClientClassTarget);
}