From 3be71eee946f1f7b13580dee2012831bc5528df9 Mon Sep 17 00:00:00 2001 From: Agaricus Date: Tue, 5 Feb 2013 21:29:57 -0800 Subject: [PATCH] Use tryClimb in ReflectionRemapper --- .../java/net/md_5/specialsource/ReflectionRemapper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/md_5/specialsource/ReflectionRemapper.java b/src/main/java/net/md_5/specialsource/ReflectionRemapper.java index 3ca6976..119e5e6 100644 --- a/src/main/java/net/md_5/specialsource/ReflectionRemapper.java +++ b/src/main/java/net/md_5/specialsource/ReflectionRemapper.java @@ -13,11 +13,9 @@ import java.util.List; public class ReflectionRemapper { private JarMapping jarMapping; - private IInheritanceProvider inheritanceProvider; - public ReflectionRemapper(JarMapping jarMapping, IInheritanceProvider inheritanceProvider) { + public ReflectionRemapper(JarMapping jarMapping) { this.jarMapping = jarMapping; - this.inheritanceProvider = inheritanceProvider; } @SuppressWarnings("unchecked") @@ -80,7 +78,7 @@ public class ReflectionRemapper { 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) { // Change the string literal to the correct name ldcField.cst = newName;