feat: initial implementation, created interface and moved stuff from processor

13 files changed, 743 insertions, 0 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..b14394e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# Default to Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = tab
+indent_size = 4
+
+[*.java]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..86151fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+gradle.properties
+
+# other
+eclipse
+run
+
+# Files from Forge MDK
+forge*changelog.txt
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..7c18fc6
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,27 @@
+plugins {
+    id 'java-library'
+    id 'com.palantir.git-version' version '0.13.0'
+}
+
+archivesBaseName = 'lll-mapper'
+version = gitVersion()
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+	withSourcesJar()
+	withJavadocJar()
+}
+
+repositories {
+    mavenCentral()
+	maven { url = 'https://maven.fantabos.co' }
+}
+
+dependencies {
+	implementation 'ftbsc:lll:0.4.1'
+}
+
+jar {
+    archiveFileName = "${jar.archiveBaseName.get()}-${project.version.split('-')[0]}.${jar.archiveExtension.get()}"
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..943f0cb
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f398c33
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..65dcd68
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..93e3f59
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/java/ftbsc/lll/exceptions/AmbiguousMappingException.java b/src/main/java/ftbsc/lll/exceptions/AmbiguousMappingException.java
new file mode 100644
index 0000000..794759a
--- /dev/null
+++ b/src/main/java/ftbsc/lll/exceptions/AmbiguousMappingException.java
@@ -0,0 +1,27 @@
+package ftbsc.lll.exceptions;
+
+import ftbsc.lll.mapper.IMapper;
+
+/**
+ * Thrown when a given {@link IMapper} cannot uniquely identify a mapping with
+ * the given data.
+ */
+public class AmbiguousMappingException extends RuntimeException {
+
+	/**
+	 * Constructs a new ambiguous mapping definition exception with the specified detail message.
+	 * @param message the detail message
+	 */
+	public AmbiguousMappingException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructs a new ambiguous definition exception with the specified detail message and cause.
+	 * @param  message the detail message
+	 * @param  cause the cause, may be null (indicating nonexistent or unknown cause)
+	 */
+	public AmbiguousMappingException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/ftbsc/lll/exceptions/MappingNotFoundException.java b/src/main/java/ftbsc/lll/exceptions/MappingNotFoundException.java
new file mode 100644
index 0000000..6c286fc
--- /dev/null
+++ b/src/main/java/ftbsc/lll/exceptions/MappingNotFoundException.java
@@ -0,0 +1,27 @@
+package ftbsc.lll.exceptions;
+
+import ftbsc.lll.mapper.IMapper;
+
+/**
+ * Thrown upon failure to find the requested mapping within a loaded {@link IMapper}.
+ */
+public class MappingNotFoundException extends RuntimeException {
+
+	/**
+	 * Constructs a new mapping not found exception for the specified mapping.
+	 * @param mapping the relevant mapping
+	 */
+	public MappingNotFoundException(String mapping) {
+		super(String.format("Could not find mapping for %s!", mapping));
+	}
+
+	/**
+	 * Constructs a new mapping not found exception for the specified mapping
+	 * with the specified reason.
+	 * @param mapping the relevant mapping
+	 * @param reason the reason message
+	 */
+	public MappingNotFoundException(String mapping, String reason) {
+		this(mapping + ": " + reason);
+	}
+}
diff --git a/src/main/java/ftbsc/lll/mapper/IMapper.java b/src/main/java/ftbsc/lll/mapper/IMapper.java
new file mode 100644
index 0000000..8adf860
--- /dev/null
+++ b/src/main/java/ftbsc/lll/mapper/IMapper.java
@@ -0,0 +1,56 @@
+package ftbsc.lll.mapper;
+
+import ftbsc.lll.exceptions.MappingNotFoundException;
+
+import java.util.HashSet;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+/**
+ * A generic obfuscation mapper.
+ */
+public interface IMapper {
+
+	/**
+	 * Reads the given lines of text and attempts to interpret them as
+	 * mappings of the given type.
+	 * @param lines the lines to read
+	 */
+	void populate(Iterable<String> lines);
+
+	/**
+	 * Gets the obfuscated name of the class.
+	 * @param name the unobfuscated internal name of the desired class
+	 * @return the obfuscated name of the class
+	 * @throws MappingNotFoundException if no mapping is found
+	 */
+	String obfuscateClass(String name);
+
+	/**
+	 * Gets the obfuscated name of a class member (field or method).
+	 * @param parentName the unobfuscated internal name of the parent class
+	 * @param memberName the field name or method signature
+	 * @param methodDescriptor the descriptor of the member
+	 * @return the obfuscated name of the given member
+	 * @throws MappingNotFoundException if no mapping is found
+	 */
+	String obfuscateMember(String parentName, String memberName, String methodDescriptor);
+
+	/**
+	 * Loads all valid parsers available in the classpath (via the Java Service API),
+	 * attempts to parse the given lines into mappings, and returns all built mappers
+	 * that succeeded without throwing errors or ftbsc.lll.exceptions.
+	 * @param lines the lines of the mapping file
+	 * @return a {@link Set} of mappers that could interpret the given input
+	 */
+	static Set<IMapper> getMappers(Iterable<String> lines) {
+		Set<IMapper> parsed = new HashSet<>();
+		for(IMapper mapper: ServiceLoader.load(IMapper.class)) {
+			try {
+				mapper.populate(lines);
+				parsed.add(mapper);
+			} catch(Throwable ignored) {}
+		}
+		return parsed;
+	}
+}
diff --git a/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java b/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java
new file mode 100644
index 0000000..0fc6489
--- /dev/null
+++ b/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java
@@ -0,0 +1,72 @@
+package ftbsc.lll.mapper.impl;
+
+import ftbsc.lll.exceptions.MappingNotFoundException;
+import ftbsc.lll.mapper.IMapper;
+import ftbsc.lll.mapper.tools.ClassData;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Parses a .tsrg file into a mapper capable of converting from
+ * plain names to obfuscated ones and vice versa.
+ */
+public class TSRGMapper implements IMapper {
+
+	/**
+	 * A Map containing the deobfuscated names as keys and information about
+	 * each class as values.
+	 */
+	private final Map<String, ClassData> mappings = new HashMap<>();
+
+	/**
+	 * Reads the given lines of text and attempts to interpret them as
+	 * mappings of the given type.
+	 * @param lines the lines to read
+	 */
+	@Override
+	public void populate(Iterable<String> lines) {
+		String currentClass = "";
+		for(String l : lines) {
+			if(l == null) continue;
+			if(l.startsWith("\t"))
+				mappings.get(currentClass).addMember(l);
+			else {
+				String[] sp = l.split(" ");
+				ClassData s = new ClassData(sp[0], sp[1]);
+				currentClass = s.unobf;
+				mappings.put(s.unobf, s);
+			}
+		}
+	}
+
+	/**
+	 * Gets the obfuscated name of the class.
+	 * @param name the unobfuscated internal name of the desired class
+	 * @return the obfuscated name of the class
+	 * @throws MappingNotFoundException if no mapping is found
+	 */
+	@Override
+	public String obfuscateClass(String name)  {
+		ClassData data = mappings.get(name.replace('.', '/'));
+		if(data == null)
+			throw new MappingNotFoundException(name);
+		else return data.obf;
+	}
+
+	/**
+	 * Gets the obfuscated name of a class member (field or method).
+	 * @param parentName the unobfuscated internal name of the parent class
+	 * @param memberName the field name or method signature
+	 * @param methodDescriptor the optional descriptor of the member, may be null or partial
+	 * @return the obfuscated name of the given member
+	 * @throws MappingNotFoundException if no mapping is found
+	 */
+	@Override
+	public String obfuscateMember(String parentName, String memberName, String methodDescriptor) {
+		ClassData data = mappings.get(parentName.replace('.', '/'));
+		if(data == null)
+			throw new MappingNotFoundException(parentName + "::" + memberName);
+		return data.get(memberName, methodDescriptor);
+	}
+}
diff --git a/src/main/java/ftbsc/lll/mapper/tools/ClassData.java b/src/main/java/ftbsc/lll/mapper/tools/ClassData.java
new file mode 100644
index 0000000..a9fbcec
--- /dev/null
+++ b/src/main/java/ftbsc/lll/mapper/tools/ClassData.java
@@ -0,0 +1,100 @@
+package ftbsc.lll.mapper.tools;
+
+import ftbsc.lll.exceptions.AmbiguousMappingException;
+import ftbsc.lll.exceptions.MappingNotFoundException;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Container class used to store information about classes.
+ */
+public class ClassData {
+	/**
+	 * The unobfuscated name (FQN with '/' instad of '.') of the class.
+	 */
+	public final String unobf;
+
+	/**
+	 * The obfuscated internal name (FQN with '/' instad of '.') of the class.
+	 */
+	public final String obf;
+
+	/**
+	 * A {@link Map} tying each member's name or signature to its
+	 * obfuscated counterpart.
+	 */
+	public final Map<String, String> members;
+
+	/**
+	 * The constructor. It takes in the names (obfuscated and non-obfuscated)
+	 * of a class.
+	 * @param unobf the unobfuscated name
+	 * @param obf the obfuscated name
+	 */
+	public ClassData(String unobf, String obf) {
+		this.unobf = unobf;
+		this.obf = obf;
+		this.members = new HashMap<>();
+	}
+
+	/**
+	 * Adds a member to the target class.
+	 * For fields only the names are required; for methods,
+	 * this takes in the full signature ({@code name + " " + space}).
+	 * @param s the String representing the declaration line
+	 */
+	public void addMember(String s) {
+		String[] split = s.trim().split(" ");
+		if(split.length == 2) //field
+			members.put(split[0], split[1]);
+		else if (split.length == 3) //method
+			members.put(split[0] + " " + split[1], split[2]);
+	}
+
+	/**
+	 * Gets an obfuscated member given the method name and a method descriptor,
+	 * which may be partial (i.e. not include return type) or null if the member
+	 * is not a method.
+	 * @param memberName member name
+	 * @param methodDescriptor the method descriptor, or null if it's not a method
+	 * @return the requested obfuscated name, or null if nothing was found
+	 * @throws AmbiguousMappingException if not enough data was given to uniquely identify a mapping
+	 */
+	public String get(String memberName, String methodDescriptor) {
+
+		//find all keys that start with the name
+		List<String> candidates = members.keySet().stream().filter(
+			m -> m.split(" ")[0].equals(memberName)
+		).collect(Collectors.toList());
+
+		if(methodDescriptor != null) {
+			String signature = String.format("%s %s", memberName, methodDescriptor);
+			candidates = candidates.stream().filter(
+				m -> m.equals(signature)
+			).collect(Collectors.toList());
+		}
+
+		switch(candidates.size()) {
+			case 0:
+				throw new MappingNotFoundException(String.format(
+					"%s.%s%s",
+					this.unobf,
+					memberName,
+					methodDescriptor == null ? "" : "()"
+				));
+			case 1:
+				return members.get(candidates.get(0));
+			default:
+				throw new AmbiguousMappingException(String.format(
+					"Mapper could not uniquely identify member %s.%s%s, found %d!",
+					this.unobf,
+					memberName,
+					methodDescriptor == null ? "" : "()",
+					candidates.size()
+				));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java b/src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java
new file mode 100644
index 0000000..918052a
--- /dev/null
+++ b/src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java
@@ -0,0 +1,56 @@
+package ftbsc.lll.mapper.tools;
+
+import ftbsc.lll.exceptions.MappingNotFoundException;
+import ftbsc.lll.mapper.IMapper;
+import ftbsc.lll.tools.DescriptorBuilder;
+import org.objectweb.asm.Type;
+
+public class MappingUtils {
+	/**
+	 * Obfuscates a method descriptor, replacing its class references
+	 * with their obfuscated counterparts.
+	 * @param descriptor a {@link String} containing the descriptor
+	 * @return the obfuscated descriptor
+	 */
+	public static String obfuscateMethodDescriptor(String descriptor, IMapper mapper) {
+		Type method = Type.getMethodType(descriptor);
+		Type[] arguments = method.getArgumentTypes();
+		Type returnType = method.getReturnType();
+
+		Type[] obfArguments = new Type[arguments.length];
+		for(int i = 0; i < obfArguments.length; i++)
+			obfArguments[i] = obfuscateType(arguments[i], mapper);
+
+		return Type.getMethodDescriptor(obfuscateType(returnType, mapper), obfArguments);
+	}
+
+	/**
+	 * Given a {@link Type} and a valid {@link IMapper} it returns its obfuscated
+	 * counterpart.
+	 * @param type the type in question
+	 * @return the obfuscated type
+	 */
+	public static Type obfuscateType(Type type, IMapper mapper) {
+		//unwrap arrays
+		Type unwrapped = type;
+		int arrayLevel = 0;
+		while(unwrapped.getSort() == Type.ARRAY) {
+			unwrapped = unwrapped.getElementType();
+			arrayLevel++;
+		}
+
+		//if it's a primitive no operation is needed
+		if(type.getSort() < Type.ARRAY)
+			return type;
+
+		String internalName = type.getInternalName();
+
+		String internalNameObf;
+		try {
+			internalNameObf = mapper.obfuscateClass(internalName);
+			return Type.getType(DescriptorBuilder.nameToDescriptor(internalNameObf, arrayLevel));
+		} catch(MappingNotFoundException e) {
+			return type;
+		}
+	}
+}