Support @WrapWithCondition v2.

unimined · Feb 3, 2024 · 3faf542 · 3faf542
1 parent dd225b3
commit 3faf542
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...pping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/mixinextra/MixinExtra.kt b/...pping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/mixinextra/MixinExtra.kt
@@ -11,6 +11,7 @@ object MixinExtra {
         const val MODIFY_RECIEVER = "Lcom/llamalad7/mixinextras/injector/ModifyReciever;"
         const val MODIFY_RETURN_VALUE = "Lcom/llamalad7/mixinextras/injector/ModifyReturnValue;"
         const val WRAP_WITH_CONDITION = "Lcom/llamalad7/mixinextras/injector/WrapWithCondition;"
+        const val WRAP_WITH_CONDITION_V2 = "Lcom/llamalad7/mixinextras/injector/v2/WrapWithCondition;"
         const val WRAP_OPERATION = "Lcom/llamalad7/mixinextras/injector/wrapoperation/WrapOperation;"
 
 

diff --git a/...nal/mapping/extension/mixinextra/annotations/method/WrapWithConditionAnnotationVisitor.kt b/...nal/mapping/extension/mixinextra/annotations/method/WrapWithConditionAnnotationVisitor.kt
@@ -42,7 +42,7 @@ class WrapWithConditionAnnotationVisitor(
             methodExceptions: Array<out String>?,
             refmapBuilder: RefmapBuilderClassVisitor
         ): Boolean {
-            return descriptor == MixinExtra.Annotation.WRAP_WITH_CONDITION
+            return descriptor == MixinExtra.Annotation.WRAP_WITH_CONDITION || descriptor == MixinExtra.Annotation.WRAP_WITH_CONDITION_V2
         }
 
     }