From 6b72ec67635bb2b2ac7757bafb85e63a0e945640 Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Sat, 16 Dec 2023 22:06:33 -0800 Subject: [PATCH] Tidy up --- .../mixinAp/annotation/ClientMixinValidator.java | 6 +++--- .../org/fury_phoenix/mixinAp/annotation/MixinProcessor.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 e21b4b791..22e72ecff 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 @@ -126,8 +126,8 @@ private boolean warn(Object o) { return false; } - public SimpleImmutableEntry - getEntry(TypeElement annotatedMixinClass) { + public Map.Entry + getClientMixinEntry(TypeElement annotatedMixinClass) { return new SimpleImmutableEntry<>( annotatedMixinClass.getQualifiedName(), getTargets(annotatedMixinClass) @@ -167,7 +167,7 @@ private Collection getTargets(TypeElement mixinAnnotatedClass) { } return Stream.of(clzsses, imaginaries) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .collect(Collectors.toSet()); } public static String toSourceString(String bytecodeName) { diff --git a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java index 307016244..a1ea79839 100644 --- a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java +++ b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java @@ -99,7 +99,7 @@ private void validateCommonMixins(TypeElement annotation, Stream mi // The implementation may throw a CME mixins.sequential() .filter(validator::validateMixin) - .map(validator::getEntry) + .map(validator::getClientMixinEntry) .forEach(this::logClientClassTarget); }