Merge 1.16 into 1.18
This commit is contained in:
commit
ab4ded89e3
|
|
@ -248,7 +248,6 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
|
||||||
|
|
||||||
// We now know all methods that have been injected into initCache, and their callers. See what fields they write to
|
// We now know all methods that have been injected into initCache, and their callers. See what fields they write to
|
||||||
writingMethods.forEach((name, method) -> {
|
writingMethods.forEach((name, method) -> {
|
||||||
if(cacheCalledInjectors.contains(name)) {
|
|
||||||
for(AbstractInsnNode n : method.instructions) {
|
for(AbstractInsnNode n : method.instructions) {
|
||||||
if(n instanceof FieldInsnNode) {
|
if(n instanceof FieldInsnNode) {
|
||||||
FieldInsnNode fieldAcc = (FieldInsnNode)n;
|
FieldInsnNode fieldAcc = (FieldInsnNode)n;
|
||||||
|
|
@ -257,7 +256,6 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
// Lastly, scan all injected methods and see if they retrieve from the field. If so, inject a generateCache
|
// Lastly, scan all injected methods and see if they retrieve from the field. If so, inject a generateCache
|
||||||
// call at the start.
|
// call at the start.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user