From 320b74c2d4bd513f7e58c8e36a718660cd746a80 Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Thu, 11 Apr 2024 13:52:14 +0100 Subject: [PATCH] Fix: Reset Unique field counters on Mixin application. (#136) They previously caused hotswaps to fail due to the number increasing on each application. --- .../spongepowered/asm/mixin/transformer/MethodMapper.java | 8 ++++++++ .../asm/mixin/transformer/TargetClassContext.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MethodMapper.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MethodMapper.java index 369dcff8..88454531 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MethodMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MethodMapper.java @@ -76,6 +76,14 @@ class MethodMapper { public ClassInfo getClassInfo() { return this.info; } + + /** + * Resets the counters to prepare for application, which can happen multiple times due to hotswap. + */ + public void reset() { + this.nextUniqueMethodIndex = 0; + this.nextUniqueFieldIndex = 0; + } /** * Conforms an injector handler method diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 1e3b32ff..8f4a33f6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -407,9 +407,10 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte } /** - * Run extensions before apply + * Run extensions before apply and clean up any global state in case this is a hotswap */ private void preApply() { + this.getClassInfo().getMethodMapper().reset(); this.extensions.preApply(this); }