Add conditional mixin application logic

Bawnorton · Jul 8, 2023 · 1fde096 · 1fde096
1 parent 2b2404f
commit 1fde096
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 12 deletions.
diff --git a/common/src/main/java/com/bawnorton/neruina/NeruinaMixinPlugin.java b/common/src/main/java/com/bawnorton/neruina/NeruinaMixinPlugin.java
@@ -1,13 +1,21 @@
 package com.bawnorton.neruina;
 
+import com.bawnorton.neruina.annotation.ConditionalMixin;
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+import org.spongepowered.asm.service.MixinService;
+import org.spongepowered.asm.util.Annotations;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
+import static org.spongepowered.asm.util.Bytecode.getDescriptor;
+
 public class NeruinaMixinPlugin implements IMixinConfigPlugin {
     @Override
     public void onLoad(String mixinPackage) {
@@ -20,9 +28,30 @@ public String getRefMapperConfig() {
     }
 
     @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if(mixinClassName.equals("com.bawnorton.neruina.mixin.WorldMixin")) {
-            return !isModLoaded("noseenotick");
+    public boolean shouldApplyMixin(String targetName, String className) {
+        return testClass(className);
+    }
+
+    public static boolean testClass(String className) {
+        try {
+            List<AnnotationNode> annotationNodes = MixinService.getService().getBytecodeProvider().getClassNode(className).visibleAnnotations;
+            if(annotationNodes == null) return true;
+
+            for(AnnotationNode node: annotationNodes) {
+                if(node.desc.equals(Type.getDescriptor(ConditionalMixin.class))) {
+                    String modid = Annotations.getValue(node, "modid");
+                    boolean applyIfPresent = Annotations.getValue(node, "applyIfPresent", Boolean.TRUE);
+                    if(isModLoaded(modid)) {
+                        Neruina.LOGGER.info("NeruinaMixinPlugin: " + className + " is" + (applyIfPresent ? " " : " not ") + "being applied because " + modid + " is loaded");
+                        return applyIfPresent;
+                    } else {
+                        Neruina.LOGGER.info("NeruinaMixinPlugin: " + className + " is" + (!applyIfPresent ? " " : " not ") + "being applied because " + modid + " is not loaded");
+                        return !applyIfPresent;
+                    }
+                }
+            }
+        } catch (ClassNotFoundException | IOException e) {
+            throw new RuntimeException(e);
         }
         return true;
     }

diff --git a/common/src/main/java/com/bawnorton/neruina/annotation/ConditionalMixin.java b/common/src/main/java/com/bawnorton/neruina/annotation/ConditionalMixin.java
@@ -0,0 +1,13 @@
+package com.bawnorton.neruina.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ConditionalMixin {
+    String modid();
+    boolean applyIfPresent() default true;
+}
diff --git a/common/src/main/java/com/bawnorton/neruina/mixin/WorldMixin.java b/common/src/main/java/com/bawnorton/neruina/mixin/WorldMixin.java
@@ -1,6 +1,7 @@
 package com.bawnorton.neruina.mixin;
 
 import com.bawnorton.neruina.Neruina;
+import com.bawnorton.neruina.annotation.ConditionalMixin;
 import com.bawnorton.neruina.thread.ConditionalRunnable;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -19,6 +20,7 @@
 import java.util.function.Consumer;
 
 @Mixin(World.class)
+@ConditionalMixin(modid = "noseenotick", applyIfPresent = false)
 public abstract class WorldMixin {
     @Inject(method = "shouldUpdatePostDeath", at = @At("HEAD"), cancellable = true)
     public void shouldUpdatePostDeath(Entity entity, CallbackInfoReturnable<Boolean> cir) {

diff --git a/fabric/src/main/java/com/bawnorton/neruina/fabric/NeruinaMixinPluginImpl.java b/fabric/src/main/java/com/bawnorton/neruina/fabric/NeruinaMixinPluginImpl.java
@@ -1,5 +1,7 @@
 package com.bawnorton.neruina.fabric;
 
+import com.bawnorton.neruina.NeruinaMixinPlugin;
+import com.bawnorton.neruina.annotation.ConditionalMixin;
 import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
@@ -20,8 +22,8 @@ public String getRefMapperConfig() {
     }
 
     @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        return true;
+    public boolean shouldApplyMixin(String targetName, String className) {
+        return NeruinaMixinPlugin.testClass(className);
     }
 
     @Override

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 
     implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixin_extras_version}"))
     implementation(include("com.github.llamalad7.mixinextras:mixinextras-forge:${rootProject.mixin_extras_version}"))
-
+    
     implementation forgeRuntimeLibrary("curse.maven:no-see-no-tick-833405:4596138")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }

diff --git a/forge/src/main/java/com/bawnorton/neruina/forge/NeruinaMixinPluginImpl.java b/forge/src/main/java/com/bawnorton/neruina/forge/NeruinaMixinPluginImpl.java
@@ -1,5 +1,6 @@
 package com.bawnorton.neruina.forge;
 
+import com.bawnorton.neruina.NeruinaMixinPlugin;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import org.objectweb.asm.tree.ClassNode;
@@ -22,10 +23,7 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetName, String className) {
-        if(className.contains("noseenotick")) {
-            return isModLoaded("noseenotick");
-        }
-        return true;
+        return NeruinaMixinPlugin.testClass(className);
     }
 
     @Override

diff --git a/forge/src/main/java/com/bawnorton/neruina/mixin/forge/noseenotick/TickOptimizerMixin.java b/forge/src/main/java/com/bawnorton/neruina/mixin/forge/noseenotick/TickOptimizerMixin.java
@@ -1,6 +1,7 @@
 package com.bawnorton.neruina.mixin.forge.noseenotick;
 
 import com.bawnorton.neruina.Neruina;
+import com.bawnorton.neruina.annotation.ConditionalMixin;
 import com.bawnorton.neruina.thread.ConditionalRunnable;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -18,6 +19,7 @@
 
 @Pseudo
 @Mixin(targets = "net.minecraft.entity.TickOptimizer", remap = false)
+@ConditionalMixin(modid = "noseenotick")
 public abstract class TickOptimizerMixin {
     @WrapOperation(method = "handleGuardEntityTick", at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V"))
     private static void catchTickingEntities(Consumer<Entity> consumer, Object param, Operation<Void> original) {

diff --git a/forge/src/main/java/com/bawnorton/neruina/mixin/forge/noseenotick/WorldMixin.java b/forge/src/main/java/com/bawnorton/neruina/mixin/forge/noseenotick/WorldMixin.java
@@ -1,6 +1,7 @@
 package com.bawnorton.neruina.mixin.forge.noseenotick;
 
 import com.bawnorton.neruina.Neruina;
+import com.bawnorton.neruina.annotation.ConditionalMixin;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
@@ -9,6 +10,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(World.class)
+@ConditionalMixin(modid = "noseenotick")
 public abstract class WorldMixin {
     @Inject(method = "shouldUpdatePostDeath", at = @At("HEAD"), cancellable = true)
     public void shouldUpdatePostDeath(Entity entity, CallbackInfoReturnable<Boolean> cir) {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20
 enabled_platforms=fabric,forge
 
 archives_base_name=neruina
-mod_version=1.1.0
+mod_version=1.1.1
 maven_group=com.bawnorton.neruina
 
 architectury_version=9.0.8

diff --git a/settings.gradle b/settings.gradle
@@ -11,4 +11,4 @@ include("common")
 include("fabric")
 include("forge")
 
-rootProject.name = "architectury-neruina"
+rootProject.name = "Neruina"