Skip to content

Commit fa5980a

Browse files
committed
Expose TrEnvironment directly
1 parent 082bf52 commit fa5980a

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

src/main/java/net/fabricmc/tinyremapper/TinyRemapper.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,10 +1119,18 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
11191119
return writer.toByteArray();
11201120
}
11211121

1122-
public synchronized AsmRemapper getRemapper() {
1122+
public synchronized TrEnvironment getEnvironment() {
11231123
refresh();
11241124
mrjRefresh(defaultState);
1125-
return defaultState.remapper;
1125+
return defaultState;
1126+
}
1127+
1128+
/**
1129+
* @deprecated Use {@link #getEnvironment} and {@link TrEnvironment#getRemapper} instead.
1130+
*/
1131+
@Deprecated
1132+
public AsmRemapper getRemapper() {
1133+
return (AsmRemapper) getEnvironment().getRemapper();
11261134
}
11271135

11281136
private static void waitForAll(Iterable<Future<?>> futures) {

src/main/java/net/fabricmc/tinyremapper/api/TrEnvironment.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,17 @@ public interface TrEnvironment {
2727
*/
2828
TrClass getClass(String internalName);
2929

30+
default TrField getField(String owner, String name, String desc) {
31+
TrClass cls = getClass(owner);
32+
33+
return cls != null ? cls.getField(name, desc) : null;
34+
}
35+
36+
default TrMethod getMethod(String owner, String name, String desc) {
37+
TrClass cls = getClass(owner);
38+
39+
return cls != null ? cls.getMethod(name, desc) : null;
40+
}
41+
3042
void propagate(TrMember member, String newName);
3143
}

0 commit comments

Comments
 (0)