From 47b614e0efb1f5386120f7f374627f2d511399e5 Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Sun, 10 Dec 2023 16:57:29 -0800 Subject: [PATCH] Rework platform detection logic again --- annotation-processor/build.gradle | 1 - .../mixinAp/annotation/ClientMixinValidator.java | 14 ++++++-------- .../groovy/modernfix.common-conventions.gradle | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle index 741235a9..432847e0 100644 --- a/annotation-processor/build.gradle +++ b/annotation-processor/build.gradle @@ -18,7 +18,6 @@ dependencies { // Platform classes implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" implementation "net.minecraftforge:mergetool:1.1.0" - implementation "net.neoforged:mergetool:2.0.0" implementation project(":annotations") } diff --git a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/ClientMixinValidator.java b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/ClientMixinValidator.java index 46c421fc..84cf122f 100644 --- a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/ClientMixinValidator.java +++ b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/ClientMixinValidator.java @@ -98,15 +98,13 @@ public class ClientMixinValidator { private boolean isClientMarked(TypeElement te) { for (var entry : getPlatformClasses(markers).entrySet()) { - Annotation marker = te.getAnnotation(entry.getKey()); - if(marker == null) continue; + IAnnotationHandle marker = getAnnotationHandle(te, entry.getKey()); + if(!marker.exists()) continue; - Optional accessor = getAccessor(entry.getKey(), entry.getValue()); - Optional enumValue = accessor.map((mh) -> this.invoke(mh, marker)) - .map(Object::toString); - if(enumValue.isPresent()) - return enumValue.orElseThrow().equals("CLIENT"); - return false; + String[] enumValue = marker.getValue("value"); + if(enumValue==null) continue; + + return enumValue[1].equals("CLIENT"); } if(debug && unannotatedClasses.add(te.toString())) { messager.printMessage(Diagnostic.Kind.WARNING, diff --git a/buildSrc/src/main/groovy/modernfix.common-conventions.gradle b/buildSrc/src/main/groovy/modernfix.common-conventions.gradle index 126f3b07..ecf68ba0 100644 --- a/buildSrc/src/main/groovy/modernfix.common-conventions.gradle +++ b/buildSrc/src/main/groovy/modernfix.common-conventions.gradle @@ -78,5 +78,4 @@ repositories { url 'https://maven.terraformersmc.com/releases' } maven { url = "https://jitpack.io" } - maven { url "https://maven.neoforged.net/releases" } }