From a95a7394bec09907d463b3ed3a651f701302ee40 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 Jan 2017 14:41:10 +0000 Subject: [PATCH] Fix a bug caused by Forge not remapping some static field references --- .../asm/mixin/transformer/MemberRef.java | 24 ++++++++++++++++++- .../mixin/transformer/MixinTargetContext.java | 6 +++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java index dc438dde..111a0f76 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java @@ -82,6 +82,11 @@ public abstract class MemberRef { public String getName() { return this.insn.name; } + + @Override + public void setName(String name) { + this.insn.name = name; + } @Override public String getDesc() { @@ -137,7 +142,12 @@ public abstract class MemberRef { public String getName() { return this.insn.name; } - + + @Override + public void setName(String name) { + this.insn.name = name; + } + @Override public String getDesc() { return this.insn.desc; @@ -235,6 +245,11 @@ public abstract class MemberRef { return this.handle.getName(); } + @Override + public void setName(String name) { + this.handle = new org.spongepowered.asm.lib.Handle(this.handle.getTag(), this.handle.getOwner(), name, this.handle.getDesc()); + } + @Override public String getDesc() { return this.handle.getDesc(); @@ -280,6 +295,13 @@ public abstract class MemberRef { * @return Name of this member. */ public abstract String getName(); + + /** + * Rename this member. + * + * @param name New name for this member. + */ + public abstract void setName(String name); /** * Descriptor of this member. diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 57a1f9b5..df9f6263 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -470,6 +470,12 @@ public class MixinTargetContext implements IReferenceMapperContext { if (fieldRef.getOwner().equals(this.getClassRef())) { fieldRef.setOwner(this.targetClass.getName()); + + Field field = this.mixin.getClassInfo().findField(fieldRef.getName(), fieldRef.getDesc(), ClassInfo.INCLUDE_ALL); + // Fixes a problem with Forge not remapping static field references properly + if (field != null && field.isRenamed() && field.getOriginalName().equals(fieldRef.getName()) && field.isStatic()) { + fieldRef.setName(field.getName()); + } } else { ClassInfo fieldOwner = ClassInfo.forName(fieldRef.getOwner()); if (fieldOwner.isMixin()) {