Skip to content

Fix NPE when ModifyExpressionValue uses "CONSTANT" as a target #6

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

Open
wants to merge 3 commits into
base: 1.21.x
Choose a base branch
from
Open

Fix NPE when ModifyExpressionValue uses "CONSTANT" as a target #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa231f
Fix Combatify
Alexandra-Myers Oct 5, 2025
93c71c4
Fix NPE when ModifyExpressionValue does not use value "INVOKE" for it…
Alexandra-Myers Oct 5, 2025
b474494
Merge remote-tracking branch 'origin/1.21.x' into 1.21.x
Alexandra-Myers Oct 5, 2025
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
3 changes: 2 additions & 1 deletion ...main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixArbitraryInjectionPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.sinytra.adapter.patch.transformer.operation.unit.ModifyInjectionPoint;
import org.sinytra.adapter.patch.transformer.operation.unit.ModifyInjectionTarget;
import org.sinytra.adapter.patch.util.AdapterUtil;
import org.sinytra.adapter.patch.util.MethodQualifier;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -110,7 +111,7 @@ private static AbstractInsnNode findCandidates(InstructionMatcher cleanMatcher,
private static MethodInsnNode findReplacementInjectionPoint(AbstractInsnNode lastInsn, UnaryOperator<AbstractInsnNode> flow, MethodContext methodContext) {
// Require matching return types for ModifyExpressionValue mixins
if (methodContext.methodAnnotation().matchesDesc(MixinConstants.MODIFY_EXPR_VAL)) {
Type desiredReturnType = Type.getReturnType(methodContext.getInjectionPointMethodQualifier().desc());
Type desiredReturnType = Type.getReturnType(methodContext.getMixinMethod().desc);
return (MethodInsnNode) AdapterUtil.iterateInsns(lastInsn, flow, v -> v instanceof MethodInsnNode minsn && Type.getReturnType(minsn.desc).equals(desiredReturnType));
} else {
return (MethodInsnNode) AdapterUtil.iterateInsns(lastInsn, flow, v -> v instanceof MethodInsnNode);
Expand Down
5 changes: 5 additions & 0 deletions test/src/test/java/org/sinytra/adapter/patch/test/mixin/DynamicMixinPatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ void testUpdatedInjectionPointModifyExprVal() throws Exception {
"isFarmlandNearWater",
assertInjectionPoint()
);
assertSameCode(
"org/sinytra/adapter/test/mixin/LivingEntityMixin",
"changeIFrames",
assertInjectionPoint()
);
}

@Test
Expand Down
14 changes: 14 additions & 0 deletions test/src/testClasses/java/org/sinytra/adapter/test/mixin/LivingEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.sinytra.adapter.test.mixin;

import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
Expand All @@ -11,6 +14,17 @@

@Mixin(LivingEntity.class)
public class LivingEntityMixin {
// https://github.com/Alexandra-Myers/Combatify/blob/1.21.1/src/main/java/net/atlas/combatify/mixin/InvulnerabilityMixin.java#L16
@ModifyExpressionValue(method = "hurt", at = @At(value = "CONSTANT", args = "intValue=20", ordinal = 0))
public int changeIFrames(int original, @Local(ordinal = 0, argsOnly = true) final DamageSource source, @Local(ordinal = 0, argsOnly = true) final float amount) {
return original;
}

@ModifyExpressionValue(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/common/damagesource/DamageContainer;getPostAttackInvulnerabilityTicks()I"))
public int changeIFramesExpected(int original, @Local(ordinal = 0, argsOnly = true) final DamageSource source, @Local(ordinal = 0, argsOnly = true) final float amount) {
return original;
}

// https://github.com/TheDeathlyCow/frostiful/blob/5f0a696400de2ae49b21ff42af5116f058cf13ae/src/main/java/com/github/thedeathlycow/frostiful/mixins/entity/ice_skating/LivingEntityMovementMixin.java#L141
@ModifyVariable(
method = "travel",
Expand Down