Merge remote-tracking branch 'FabricMC/master'

Author: shedaniel

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

@@ -1350,10 +1350,18 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
 		return writer.toByteArray();
 	}
 
-	public synchronized AsmRemapper getRemapper() {
+	public synchronized TrEnvironment getEnvironment() {
 		refresh();
 		mrjRefresh(defaultState);
-		return defaultState.remapper;
+		return defaultState;
+	}
+
+	/**
+	 * @deprecated Use {@link #getEnvironment} and {@link TrEnvironment#getRemapper} instead.
+	 */
+	@Deprecated
+	public AsmRemapper getRemapper() {
+		return (AsmRemapper) getEnvironment().getRemapper();
 	}
 
 	private static void waitForAll(Iterable<Future<?>> futures) {

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

@@ -27,5 +27,17 @@ public interface TrEnvironment {
 	 */
 	TrClass getClass(String internalName);
 
+	default TrField getField(String owner, String name, String desc) {
+		TrClass cls = getClass(owner);
+
+		return cls != null ? cls.getField(name, desc) : null;
+	}
+
+	default TrMethod getMethod(String owner, String name, String desc) {
+		TrClass cls = getClass(owner);
+
+		return cls != null ? cls.getMethod(name, desc) : null;
+	}
+
 	void propagate(TrMember member, String newName);
 }