mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-20 12:19:52 +00:00
Fix a bug caused by Forge not remapping some static field references
This commit is contained in:
1 parent
ea4f8aea8e
commit
a95a7394be
2 files changed
+29
-1
No files matched your search
@@ -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.
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
Reference in new issue
Block a user