Use tryClimb in ReflectionRemapper
This commit is contained in:
parent
20dfec9ce3
commit
3be71eee94
@ -13,11 +13,9 @@ import java.util.List;
|
|||||||
public class ReflectionRemapper {
|
public class ReflectionRemapper {
|
||||||
|
|
||||||
private JarMapping jarMapping;
|
private JarMapping jarMapping;
|
||||||
private IInheritanceProvider inheritanceProvider;
|
|
||||||
|
|
||||||
public ReflectionRemapper(JarMapping jarMapping, IInheritanceProvider inheritanceProvider) {
|
public ReflectionRemapper(JarMapping jarMapping) {
|
||||||
this.jarMapping = jarMapping;
|
this.jarMapping = jarMapping;
|
||||||
this.inheritanceProvider = inheritanceProvider;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@ -80,7 +78,7 @@ public class ReflectionRemapper {
|
|||||||
|
|
||||||
System.out.println("Remapping "+className+"/"+fieldName);
|
System.out.println("Remapping "+className+"/"+fieldName);
|
||||||
|
|
||||||
String newName = jarMapping.fields.get(className + "/" + fieldName); // TODO: tryClimb etc
|
String newName = jarMapping.tryClimb(jarMapping.fields, NodeType.FIELD, className, fieldName);
|
||||||
if (newName != null) {
|
if (newName != null) {
|
||||||
// Change the string literal to the correct name
|
// Change the string literal to the correct name
|
||||||
ldcField.cst = newName;
|
ldcField.cst = newName;
|
||||||
|
Loading…
Reference in New Issue
Block a user