Let DynamicInjectorOrdinalPatch handle ModifyReturnValue

Sinytra · Jul 26, 2024 · df49049 · df49049
1 parent 6fa7e5a
commit df49049
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/definition/src/main/java/org/sinytra/adapter/patch/analysis/MethodLabelComparator.java b/definition/src/main/java/org/sinytra/adapter/patch/analysis/MethodLabelComparator.java
@@ -57,8 +57,18 @@ public static ComparisonResult findPatchedLabels(AbstractInsnNode cleanInjection
             return null;
         }
 
+        List<List<AbstractInsnNode>> patchedLabels;
         int to = dirtyLabelsOriginal.indexOf(patchRange.getSecond());
-        List<List<AbstractInsnNode>> patchedLabels = patchRange.getFirst() == null ? dirtyLabelsOriginal.subList(0, to) : dirtyLabelsOriginal.subList(dirtyLabelsOriginal.indexOf(patchRange.getFirst()) + 1, to);
+        if (patchRange.getFirst() == null) {
+            patchedLabels = dirtyLabelsOriginal.subList(0, to);
+        } else {
+            int from = dirtyLabelsOriginal.indexOf(patchRange.getFirst()) + 1;
+            if (from < to) {
+                patchedLabels = dirtyLabelsOriginal.subList(dirtyLabelsOriginal.indexOf(patchRange.getFirst()) + 1, to);
+            } else {
+                return null;
+            }
+        }
         return new ComparisonResult(patchedLabels, cleanLabel);
     }
 

diff --git a/.../main/java/org/sinytra/adapter/patch/transformer/dynamic/DynamicInjectorOrdinalPatch.java b/.../main/java/org/sinytra/adapter/patch/transformer/dynamic/DynamicInjectorOrdinalPatch.java
@@ -27,7 +27,7 @@ public class DynamicInjectorOrdinalPatch implements MethodTransform {
 
     @Override
     public Collection<String> getAcceptedAnnotations() {
-        return Set.of(MixinConstants.INJECT, MixinConstants.MODIFY_VAR);
+        return Set.of(MixinConstants.INJECT, MixinConstants.MODIFY_VAR, MixinConstants.MODIFY_RETURN_VAL);
     }
 
     @Override