Fix indexing of private methods in call hierarchy walker

Earthcomputer · Earthcomputer · commit bc4008cc4a75 · 2025-03-21T20:20:24.000Z
diff --git a/regressionTests/playerRandomHierarchy.regressiontest b/regressionTests/playerRandomHierarchy.regressiontest
@@ -30,7 +30,12 @@ net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Ln
 net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/item/enchantment/Enchantment.modifyDamageFilteredValue (Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyDamageFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
-net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue (Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyFishingLuckBonus (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyFishingTimeReduction (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyMobExperience (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyProjectileCount (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyProjectileSpread (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/item/enchantment/Enchantment.modifyTridentReturnToOwnerAcceleration (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/item/enchantment/Enchantment.modifyDamageProtection (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/ExperienceOrb.repairPlayerItems (Lnet/minecraft/server/level/ServerPlayer;I)I <- net/minecraft/world/item/enchantment/EnchantmentHelper.getRandomItemWith <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/item/enchantment/EnchantmentHelper.getTridentSpinAttackStrength (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)F <- net/minecraft/world/item/enchantment/EnchantmentHelper.lambda$getTridentSpinAttackStrength$36 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
@@ -78,9 +83,7 @@ net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/
 net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
-net/minecraft/world/entity/LivingEntity.makeDrownParticles ()V <- net/minecraft/world/entity/Entity.random
-net/minecraft/world/entity/LivingEntity.makeDrownParticles ()V <- net/minecraft/world/entity/Entity.random
-net/minecraft/world/entity/LivingEntity.makeDrownParticles ()V <- net/minecraft/world/entity/Entity.random
+net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/LivingEntity.makeDrownParticles <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/LivingEntity.makePoofParticles ()V <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/LivingEntity.makePoofParticles ()V <- net/minecraft/world/entity/Entity.random
 net/minecraft/world/entity/LivingEntity.makePoofParticles ()V <- net/minecraft/world/entity/Entity.random
diff --git a/src/test/java/net/earthcomputer/clientcommands/test/ReferencesFinder.java b/src/test/java/net/earthcomputer/clientcommands/test/ReferencesFinder.java
@@ -210,8 +210,10 @@ private static ReferencesSet resolveNonVirtualMethod(@Nullable ClassInfo owner,
         return null;
     }
 
-    // finds the most abstract versions of the method as if referenced by a virtual method instruction, of which there could
-    // be multiple in the case of multiple interface inheritance
+    // Finds the most abstract versions of the method as if referenced by a virtual method instruction, of which there could
+    // be multiple in the case of multiple interface inheritance.
+    // Does not resolve private methods, for that, call resolveNonVirtualMethod after calling this method if this method
+    // returns nothing while indexing.
     private static List<ReferencesSet> resolveVirtualMethod(String accessorClass, ClassInfo owner, NameAndDesc nameAndDesc, ClassResolver resolver) {
         ReferencesSet resolvedInClass = null;
         List<ReferencesSet> resolvedInInterfaces = new ArrayList<>();
@@ -511,9 +513,16 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
             } else {
                 ClassInfo ownerInfo = getOrCreateClassInfo(interner, owner);
                 if (ownerInfo != null) {
-                    for (ReferencesSet references : resolveVirtualMethod(methodOwnerNameAndDesc.owner, ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className))) {
+                    List<ReferencesSet> resolved = resolveVirtualMethod(methodOwnerNameAndDesc.owner, ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className));
+                    for (ReferencesSet references : resolved) {
                         references.add(methodOwnerNameAndDesc);
                     }
+                    if (resolved.isEmpty()) {
+                        ReferencesSet resolvedNonVirtual = resolveNonVirtualMethod(ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className));
+                        if (resolvedNonVirtual != null) {
+                            resolvedNonVirtual.add(methodOwnerNameAndDesc);
+                        }
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,10 @@ private static ReferencesSet resolveNonVirtualMethod(@Nullable ClassInfo owner,`
`210`	`210`	`return null;`
`211`	`211`	`}`
`212`	`212`
`213`		`- // finds the most abstract versions of the method as if referenced by a virtual method instruction, of which there could`
`214`		`- // be multiple in the case of multiple interface inheritance`
	`213`	`+ // Finds the most abstract versions of the method as if referenced by a virtual method instruction, of which there could`
	`214`	`+ // be multiple in the case of multiple interface inheritance.`
	`215`	`+ // Does not resolve private methods, for that, call resolveNonVirtualMethod after calling this method if this method`
	`216`	`+ // returns nothing while indexing.`
`215`	`217`	`private static List<ReferencesSet> resolveVirtualMethod(String accessorClass, ClassInfo owner, NameAndDesc nameAndDesc, ClassResolver resolver) {`
`216`	`218`	`ReferencesSet resolvedInClass = null;`
`217`	`219`	`List<ReferencesSet> resolvedInInterfaces = new ArrayList<>();`
`@@ -511,9 +513,16 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri`
`511`	`513`	`} else {`
`512`	`514`	`ClassInfo ownerInfo = getOrCreateClassInfo(interner, owner);`
`513`	`515`	`if (ownerInfo != null) {`
`514`		`- for (ReferencesSet references : resolveVirtualMethod(methodOwnerNameAndDesc.owner, ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className))) {`
	`516`	`+ List<ReferencesSet> resolved = resolveVirtualMethod(methodOwnerNameAndDesc.owner, ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className));`
	`517`	`+ for (ReferencesSet references : resolved) {`
`515`	`518`	`references.add(methodOwnerNameAndDesc);`
`516`	`519`	`}`
	`520`	`+ if (resolved.isEmpty()) {`
	`521`	`+ ReferencesSet resolvedNonVirtual = resolveNonVirtualMethod(ownerInfo, new NameAndDesc(name, descriptor), className -> getOrCreateClassInfo(interner, className));`
	`522`	`+ if (resolvedNonVirtual != null) {`
	`523`	`+ resolvedNonVirtual.add(methodOwnerNameAndDesc);`
	`524`	`+ }`
	`525`	`+ }`
`517`	`526`	`}`
`518`	`527`	`}`
`519`	`528`	`}`