Simplified nested annotation usage (#76)

* Make Dependencies Repeatable via CompositeDependencies * Simplified CompositeDependencies usage in Mixin * Apply CompositeDependencies changes for malilib-extra * Merge common logic --------- Signed-off-by: Hendrix-Shen <HendrixShen@hendrixshen.top>
Hendrix-Shen · Jun 9, 2024 · 16d035d · 16d035d
1 parent 2fb2bd6
commit 16d035d
Show file tree

Hide file tree

Showing 35 changed files with 282 additions and 268 deletions.
diff --git a/...clib-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/auth/MinecraftMixin.java b/...clib-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/auth/MinecraftMixin.java
@@ -28,22 +28,14 @@
 import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
 
 /**
  * Reference to <a href="https://github.com/Fallen-Breath/tweakermore/blob/10e1a937aadcefb1f2d9d9bab8badc873d4a5b3d/versions/1.16.5/src/main/java/me/fallenbreath/tweakermore/mixins/util/qol/MinecraftClientMixin.java">TweakerMore<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.AuthVerifyPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.AuthVerifyPredicate.class))
 @Environment(EnvType.CLIENT)
 @Mixin(Minecraft.class)
 public class MinecraftMixin {

diff --git a/...tter-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/chunk/MinecraftServerMixin.java b/...tter-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/chunk/MinecraftServerMixin.java
@@ -26,22 +26,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
 
 /**
  * Reference to <a href="https://github.com/magistermaks/mod-fungible/blob/9cd81f1d8ebcef43cff3df279aaef9bb68950e7c/src/main/java/net/darktree/fungible/mixin/chunk_loading/MinecraftServerMixin.java">Fungible<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.ChunkPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.ChunkPredicate.class))
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
     @Inject(

diff --git a/...dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/destroy/DataFixerUpperMixin.java b/...dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/destroy/DataFixerUpperMixin.java
@@ -27,22 +27,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
 
 /**
  * Reference to <a href="https://github.com/magistermaks/mod-fungible/blob/9cd81f1d8ebcef43cff3df279aaef9bb68950e7c/src/main/java/net/darktree/fungible/mixin/dfu/DatafixTypesMixin.java">Fungible<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.DestroyDFUPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.DestroyDFUPredicate.class))
 @Mixin(value = DataFixerUpper.class, remap = false)
 public class DataFixerUpperMixin {
     @Inject(

diff --git a/...-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/destroy/SchemaMixin.java b/...-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/destroy/SchemaMixin.java
@@ -9,19 +9,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
 
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.DestroyDFUPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.DestroyDFUPredicate.class))
 @Mixin(value = Schema.class, remap = false)
 public class SchemaMixin {
     @Inject(

diff --git a/...better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/lazy/DataFixersMixin.java b/...better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/lazy/DataFixersMixin.java
@@ -31,7 +31,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -40,14 +39,7 @@
 /**
  * Reference to <a href="https://github.com/astei/lazydfu/blob/385764a6fb4cf57b7a39e0ff367a704f74f12497/src/main/java/me/steinborn/lazydfu/mixin/SchemasMixin.java">LazyDFU</a>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.LazyDFUPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.LazyDFUPredicate.class))
 @Mixin(value = DataFixers.class, remap = false)
 public class DataFixersMixin {
     @Redirect(

diff --git a/...ter-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/ClientMainMixin.java b/...ter-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/ClientMainMixin.java
@@ -32,7 +32,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -41,14 +40,7 @@
 /**
  * Reference to <a href="https://github.com/UltimateBoomer/mc-smoothboot/blob/9a519ade89af24aa8b337dfed7d8eb8c0b62ec81/src/main/java/io/github/ultimateboomer/smoothboot/mixin/client/MainMixin.java">SmoothBoot<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.TheadTweakPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.TheadTweakPredicate.class))
 @Environment(EnvType.CLIENT)
 @Mixin(Main.class)
 public class ClientMainMixin {

diff --git a/...v/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/IntegratedServerMixin.java b/...v/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/IntegratedServerMixin.java
@@ -34,7 +34,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -66,14 +65,7 @@
 /**
  * Reference to <a href="https://github.com/UltimateBoomer/mc-smoothboot/blob/9a519ade89af24aa8b337dfed7d8eb8c0b62ec81/src/main/java/io/github/ultimateboomer/smoothboot/mixin/client/IntegratedServerMixin.java">SmoothBoot<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.TheadTweakPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.TheadTweakPredicate.class))
 @Environment(EnvType.CLIENT)
 @Mixin(IntegratedServer.class)
 public class IntegratedServerMixin {

diff --git a/...ev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/MinecraftServerMixin.java b/...ev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/MinecraftServerMixin.java
@@ -29,7 +29,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -44,14 +43,7 @@
 /**
  * Reference to <a href="https://github.com/UltimateBoomer/mc-smoothboot/blob/9a519ade89af24aa8b337dfed7d8eb8c0b62ec81/src/main/java/io/github/ultimateboomer/smoothboot/mixin/server/MainMixin.java">SmoothBoot<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.TheadTweakPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.TheadTweakPredicate.class))
 @Mixin(
         //#if MC > 11502
         Main.class

diff --git a/...ib-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/UtilMixin.java b/...ib-better-dev/src/main/java/top/hendrixshen/magiclib/mixin/dev/threadtweak/UtilMixin.java
@@ -31,7 +31,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.hendrixshen.magiclib.MagicLib;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -43,14 +42,7 @@
 /**
  * Reference to <a href="https://github.com/UltimateBoomer/mc-smoothboot/blob/9a519ade89af24aa8b337dfed7d8eb8c0b62ec81/src/main/java/io/github/ultimateboomer/smoothboot/mixin/UtilMixin.java">SmoothBoot<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.TheadTweakPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.TheadTweakPredicate.class))
 @Mixin(Util.class)
 public class UtilMixin {
     //#if MC > 11502

diff --git a/...abric/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/lazy/SharedConstantsMixin.java b/...abric/src/main/java/top/hendrixshen/magiclib/mixin/dev/dfu/lazy/SharedConstantsMixin.java
@@ -31,22 +31,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
 
 /**
  * Reference to <a href="https://github.com/astei/lazydfu/blob/a83ce2f3e7deb429d48134700424b4454f3bee8b/src/main/java/me/steinborn/lazydfu/mixin/SharedConstantsMixin.java">LazyDFU<a/>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.LazyDFUPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.LazyDFUPredicate.class))
 @Mixin(SharedConstants.class)
 public class SharedConstantsMixin {
     @Inject(

diff --git a/.../main/java/top/hendrixshen/magiclib/mixin/dev/auth/AccountProfileKeyPairManagerMixin.java b/.../main/java/top/hendrixshen/magiclib/mixin/dev/auth/AccountProfileKeyPairManagerMixin.java
@@ -28,7 +28,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.hendrixshen.magiclib.api.dependency.DependencyType;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.impl.dev.MixinPredicates;
@@ -39,14 +38,7 @@
 /**
  * Reference to <a href="https://github.com/magistermaks/mod-fungible/blob/9cd81f1d8ebcef43cff3df279aaef9bb68950e7c/src/main/java/net/darktree/fungible/mixin/auth/ProfileKeysImplMixin.java">mod-fungible</a>
  */
-@CompositeDependencies(
-        @Dependencies(
-                require = @Dependency(
-                        dependencyType = DependencyType.PREDICATE,
-                        predicate = MixinPredicates.AuthEmptyKeyPredicate.class
-                )
-        )
-)
+@Dependencies(require = @Dependency(dependencyType = DependencyType.PREDICATE, predicate = MixinPredicates.AuthEmptyKeyPredicate.class))
 @Environment(EnvType.CLIENT)
 @Mixin(AccountProfileKeyPairManager.class)
 public class AccountProfileKeyPairManagerMixin {

diff --git a/...c/main/java/top/hendrixshen/magiclib/api/dependency/annotation/CompositeDependencies.java b/...c/main/java/top/hendrixshen/magiclib/api/dependency/annotation/CompositeDependencies.java
@@ -8,7 +8,7 @@
 /**
  * CompositeDependencies annotation.
  */
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CompositeDependencies {
     /**

diff --git a/...common/src/main/java/top/hendrixshen/magiclib/api/dependency/annotation/Dependencies.java b/...common/src/main/java/top/hendrixshen/magiclib/api/dependency/annotation/Dependencies.java
@@ -1,13 +1,12 @@
 package top.hendrixshen.magiclib.api.dependency.annotation;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Dependencies annotation.
  */
-@Target({ /* No targets allowed */})
+@Repeatable(CompositeDependencies.class)
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Dependencies {
     /**

diff --git a/...e/common/src/main/java/top/hendrixshen/magiclib/impl/dependency/EntryPointDependency.java b/...e/common/src/main/java/top/hendrixshen/magiclib/impl/dependency/EntryPointDependency.java
@@ -1,42 +1,38 @@
 package top.hendrixshen.magiclib.impl.dependency;
 
 import com.google.common.collect.Lists;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
-import org.spongepowered.asm.util.Annotations;
 import top.hendrixshen.magiclib.MagicLib;
 import top.hendrixshen.magiclib.api.dependency.DependencyCheckException;
-import top.hendrixshen.magiclib.api.dependency.annotation.CompositeDependencies;
 import top.hendrixshen.magiclib.api.i18n.I18n;
 import top.hendrixshen.magiclib.api.platform.DistType;
 import top.hendrixshen.magiclib.api.platform.adapter.ModContainerAdapter;
 import top.hendrixshen.magiclib.api.platform.adapter.ModMetaDataAdapter;
 import top.hendrixshen.magiclib.impl.gui.fabric.FabricGuiEntry;
-import top.hendrixshen.magiclib.util.ASMUtil;
+import top.hendrixshen.magiclib.util.DependencyUtil;
 import top.hendrixshen.magiclib.util.MiscUtil;
 import top.hendrixshen.magiclib.util.collect.InfoNode;
-import top.hendrixshen.magiclib.util.collect.ValueContainer;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 @ApiStatus.Internal
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class EntryPointDependency {
     @Getter(lazy = true)
     private static final EntryPointDependency instance = new EntryPointDependency();
 
     private final AtomicBoolean isChecked = new AtomicBoolean();
 
-    private EntryPointDependency() {
-    }
-
     public void check() {
         if (this.isChecked.get()) {
             throw new IllegalStateException("Re-trigger EntryPointDependency check.");
@@ -61,7 +57,7 @@ public void check() {
     }
 
     private @Nullable DependencyCheckException check(ModMetaDataAdapter modMetaDataAdapter, ClassNode entryPoint) {
-        List<DependenciesContainer<?>> dependencies = Lists.newArrayList();
+        List<DependenciesContainer<Object>> dependencies = Lists.newArrayList();
 
         if (MagicLib.getInstance().getCurrentPlatform().getCurrentDistType()
                 .matches(DistType.CLIENT)) {
@@ -89,19 +85,9 @@ public void check() {
                 continue;
             }
 
-            ValueContainer<AnnotationNode> annotation = ASMUtil.getVisibleAnnotations(method,
-                    CompositeDependencies.class);
-
-            if (!annotation.isPresent()) {
-                continue;
-            }
-
-            return Annotations.<AnnotationNode>getValue(annotation.get(), "value", true)
-                    .stream()
-                    .map(node -> DependenciesContainer.of(node, null))
-                    .collect(Collectors.toList());
+            return DependencyUtil.parseDependencies(method, null);
         }
 
-        return Lists.newArrayList();
+        return Collections.emptyList();
     }
 }