Skip to content

MixinExtras: Add support for @WrapOperations targeting instantiations. #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2023
Merged

MixinExtras: Add support for @WrapOperations targeting instantiations. #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/kotlin/platform/mixin/handlers/mixinextras/MixinExtrasInjectorAnnotationHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package com.demonwav.mcdev.platform.mixin.handlers.mixinextras

import com.demonwav.mcdev.platform.mixin.handlers.InjectorAnnotationHandler
import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.NewInsnInjectionPoint
import com.demonwav.mcdev.platform.mixin.inspection.injector.MethodSignature
import com.demonwav.mcdev.platform.mixin.inspection.injector.ParameterGroup
import com.demonwav.mcdev.platform.mixin.util.FieldTargetMember
Expand Down Expand Up @@ -219,7 +220,7 @@ abstract class MixinExtrasInjectorAnnotationHandler : InjectorAnnotationHandler(
.resolveAsm(annotation.project) as? MethodTargetMember
)?.classAndMethod
val parameters = mutableListOf<Parameter>()
if (insn.opcode != Opcodes.INVOKESTATIC) {
if (insn.opcode != Opcodes.INVOKESTATIC && insn.name != "<init>") {
val receiver = if (insn.opcode == Opcodes.INVOKESPECIAL && !oldSuperBehavior) {
targetClass.name
} else {
Expand Down Expand Up @@ -270,6 +271,10 @@ abstract class MixinExtrasInjectorAnnotationHandler : InjectorAnnotationHandler(
Opcodes.INSTANCEOF ->
listOf(Parameter("object", Type.getType(Any::class.java).toPsiType(elementFactory)))

Opcodes.NEW -> NewInsnInjectionPoint.findInitCall(insn)?.let {
getPsiParameters(it, targetClass, annotation)
}

else -> null
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/platform/mixin/handlers/mixinextras/WrapOperationHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import org.objectweb.asm.tree.MethodNode

class WrapOperationHandler : MixinExtrasInjectorAnnotationHandler() {
override val supportedInstructionTypes = listOf(
InstructionType.METHOD_CALL, InstructionType.FIELD_GET, InstructionType.FIELD_SET, InstructionType.INSTANCEOF
InstructionType.METHOD_CALL, InstructionType.FIELD_GET, InstructionType.FIELD_SET, InstructionType.INSTANCEOF,
InstructionType.INSTANTIATION
)

override fun getAtKey(annotation: PsiAnnotation): String {
Expand Down