Stub intermediaries

Signed-off-by: shedaniel <daniel@shedaniel.me>
2026-03-28 04:07:01 -05:00 · 2021-07-20 17:30:02 +08:00
parent 2bdf2b3230
commit 53db9b3c25
5 changed files with 244 additions and 61 deletions
--- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
+++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
@@ -270,4 +270,6 @@ public interface LoomGradleExtensionAPI {
 	ForgeExtensionAPI getForge();

 	void forge(Action<ForgeExtensionAPI> action);
+
+	Property<Boolean> getStubIntermediaries();
 }
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
@@ -37,6 +37,7 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -63,6 +64,7 @@ import net.fabricmc.loom.configuration.accesswidener.AccessWidenerJarProcessor;
 import net.fabricmc.loom.configuration.accesswidener.TransitiveAccessWidenerJarProcessor;
 import net.fabricmc.loom.configuration.processors.JarProcessorManager;
 import net.fabricmc.loom.configuration.processors.MinecraftProcessedProvider;
+import net.fabricmc.loom.configuration.providers.MinecraftProvider;
 import net.fabricmc.loom.configuration.providers.MinecraftProviderImpl;
 import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider;
 import net.fabricmc.loom.configuration.providers.forge.SrgProvider;
@@ -74,6 +76,7 @@ import net.fabricmc.loom.util.ZipUtils;
 import net.fabricmc.loom.util.srg.MCPReader;
 import net.fabricmc.loom.util.srg.SrgMerger;
 import net.fabricmc.loom.util.srg.SrgNamedWriter;
+import net.fabricmc.mappingio.MappedElementKind;
 import net.fabricmc.mappingio.MappingReader;
 import net.fabricmc.mappingio.adapter.MappingNsCompleter;
 import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch;
@@ -86,6 +89,11 @@ import net.fabricmc.stitch.Command;
 import net.fabricmc.stitch.commands.CommandProposeFieldNames;
 import net.fabricmc.stitch.commands.tinyv2.TinyFile;
 import net.fabricmc.stitch.commands.tinyv2.TinyV2Writer;
+import net.fabricmc.stitch.representation.JarClassEntry;
+import net.fabricmc.stitch.representation.JarFieldEntry;
+import net.fabricmc.stitch.representation.JarMethodEntry;
+import net.fabricmc.stitch.representation.JarReader;
+import net.fabricmc.stitch.representation.JarRootEntry;

 public class MappingsProviderImpl extends DependencyProvider implements MappingsProvider {
 	public MinecraftMappedProvider mappedProvider;
@@ -573,6 +581,22 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings
 		if (intermediaryTiny == null) {
 			intermediaryTiny = getMinecraftProvider().file("intermediary-v2.tiny").toPath();

+			if (getExtension().getStubIntermediaries().get()) {
+				intermediaryTiny = getMinecraftProvider().file("stub-intermediary-v2.tiny").toPath();
+
+				if (isRefreshDeps() && !hasRefreshed) {
+					Files.deleteIfExists(intermediaryTiny);
+				}
+
+				if (Files.exists(intermediaryTiny)) {
+					return intermediaryTiny;
+				}
+
+				hasRefreshed = true;
+				generateIntermediary(intermediaryTiny);
+				return intermediaryTiny;
+			}
+
 			if (!Files.exists(intermediaryTiny) || (isRefreshDeps() && !hasRefreshed)) {
 				hasRefreshed = true;

@@ -588,6 +612,55 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings
 		return intermediaryTiny;
 	}

+	private void generateIntermediary(Path output) throws IOException {
+		MinecraftProviderImpl provider = getExtension().getMinecraftProvider();
+		JarRootEntry entry = new JarRootEntry(provider.getMergedJar());
+		MemoryMappingTree tree = new MemoryMappingTree();
+
+		MappingNsCompleter visitor = new MappingNsCompleter(tree, Collections.singletonMap(MappingsNamespace.INTERMEDIARY.toString(), MappingsNamespace.OFFICIAL.toString()), true);
+
+		if (visitor.visitHeader()) {
+			visitor.visitNamespaces(MappingsNamespace.OFFICIAL.toString(), Collections.emptyList());
+		}
+
+		if (visitor.visitContent()) {
+			try {
+				JarReader reader = new JarReader(entry);
+				reader.apply();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			for (JarClassEntry classEntry : entry.getAllClasses()) {
+				if (visitor.visitClass(classEntry.getFullyQualifiedName())) {
+					if (!visitor.visitElementContent(MappedElementKind.CLASS)) return;
+
+					for (JarFieldEntry field : classEntry.getFields()) {
+						if (visitor.visitField(field.getName(), field.getDescriptor())) {
+							if (!visitor.visitElementContent(MappedElementKind.FIELD)) return;
+						}
+					}
+
+					for (JarMethodEntry method : classEntry.getMethods()) {
+						if (method.getName().startsWith("<")) continue;
+
+						if (visitor.visitMethod(method.getName(), method.getDescriptor())) {
+							if (!visitor.visitElementContent(MappedElementKind.METHOD)) return;
+						}
+					}
+				}
+			}
+		}
+
+		visitor.visitEnd();
+
+		try (Tiny2Writer writer = new Tiny2Writer(Files.newBufferedWriter(output, StandardOpenOption.CREATE), false)) {
+			tree.accept(writer);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 	@Override
 	public Path mappingsWorkingDir() {
 		return mappingsWorkingDir;
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
@@ -94,6 +94,7 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
 	private final List<String> tasksBeforeRun = Collections.synchronizedList(new ArrayList<>());
 	public final List<Consumer<RunConfig>> settingsPostEdit = new ArrayList<>();
 	private NamedDomainObjectContainer<LaunchProviderSettings> launchConfigs;
+	private final Property<Boolean> stubIntermediaries;

 	protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) {
 		this.runConfigs = project.container(RunConfigSettings.class,
@@ -140,6 +141,8 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
 				baseName -> new LaunchProviderSettings(project, baseName));
 		this.archDecompilers = project.getObjects().listProperty(ArchitecturyLoomDecompiler.class)
 				.empty();
+		this.stubIntermediaries = project.getObjects().property(Boolean.class)
+				.convention(false);
 	}

 	@Override
@@ -295,6 +298,11 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
 		return archDecompilers;
 	}

+	@Override
+	public Property<Boolean> getStubIntermediaries() {
+		return stubIntermediaries;
+	}
+
 	// This is here to ensure that LoomGradleExtensionApiImpl compiles without any unimplemented methods
 	private final class EnsureCompile extends LoomGradleExtensionApiImpl {
 		private EnsureCompile() {
--- a/src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
+++ b/src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
@@ -243,4 +243,10 @@ public class MinecraftGradleExtension implements LoomGradleExtensionAPI {
 		reportDeprecation();
 		parent.forge(action);
 	}
+
+	@Override
+	public Property<Boolean> getStubIntermediaries() {
+		reportDeprecation();
+		return parent.getStubIntermediaries();
+	}
 }
--- a/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java
+++ b/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java
@@ -37,11 +37,14 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiConsumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import com.opencsv.CSVReader;
 import com.opencsv.exceptions.CsvValidationException;
+import dev.architectury.refmapremapper.utils.DescriptorRemapper;
 import org.apache.commons.io.IOUtils;
 import org.cadixdev.lorenz.MappingSet;
 import org.cadixdev.lorenz.io.srg.tsrg.TSrgReader;
@@ -72,11 +75,11 @@ public class MCPReader {
 	}

 	public TinyFile read(Path mcpJar) throws IOException {
-		Map<MemberToken, String> srgTokens = readSrg();
+		Map<MemberToken<?>, String> srgTokens = readSrg();
 		TinyFile intermediaryTiny = TinyV2Reader.read(intermediaryTinyPath);
-		Map<String, String> intermediaryToMCPMap = createIntermediaryToMCPMap(intermediaryTiny, srgTokens);
-		Map<String, String[]> intermediaryToDocsMap = new HashMap<>();
-		Map<String, Map<Integer, String>> intermediaryToParamsMap = new HashMap<>();
+		Map<MemberToken<?>, String> intermediaryToMCPMap = createIntermediaryToMCPMap(intermediaryTiny, srgTokens);
+		Map<MemberToken<?>, String[]> intermediaryToDocsMap = new HashMap<>();
+		Map<MemberToken<?>, Map<Integer, String>> intermediaryToParamsMap = new HashMap<>();

 		try {
 			injectMcp(mcpJar, intermediaryToMCPMap, intermediaryToDocsMap, intermediaryToParamsMap);
@@ -88,43 +91,54 @@ public class MCPReader {
 		return intermediaryTiny;
 	}

-	private Map<String, String> createIntermediaryToMCPMap(TinyFile tiny, Map<MemberToken, String> officialToMCP) {
-		Map<String, String> map = new HashMap<>();
+	private Map<MemberToken<?>, String> createIntermediaryToMCPMap(TinyFile tiny, Map<MemberToken<?>, String> officialToMCP) {
+		Map<MemberToken<?>, String> map = new HashMap<>();
+		BiConsumer<MemberToken<?>, MemberToken<?>> adder = (intermediary, obf) -> {
+			String mcp = officialToMCP.get(obf);
+
+			if (mcp != null && !intermediary.name.equals(mcp)) {
+				map.put(intermediary, mcp);
+			}
+		};

 		for (TinyClass tinyClass : tiny.getClassEntries()) {
 			String classObf = tinyClass.getMapping().get(0);
 			String classIntermediary = tinyClass.getMapping().get(1);
-			MemberToken classTokenObf = MemberToken.ofClass(classObf);
+			MemberToken<TokenType.Class> classTokenIntermediary = MemberToken.ofClass(classIntermediary);
+			MemberToken<TokenType.Class> classTokenObf = MemberToken.ofClass(classObf);

-			if (officialToMCP.containsKey(classTokenObf)) {
-				map.put(classIntermediary, officialToMCP.get(classTokenObf));
-			}
+			adder.accept(classTokenIntermediary, classTokenObf);

 			for (TinyField tinyField : tinyClass.getFields()) {
 				String fieldObf = tinyField.getMapping().get(0);
 				String fieldIntermediary = tinyField.getMapping().get(1);
-				MemberToken fieldTokenObf = MemberToken.ofField(classTokenObf, fieldObf);
+				MemberToken<TokenType.Field> fieldTokenObf = MemberToken.ofField(classTokenObf, fieldObf);

-				if (officialToMCP.containsKey(fieldTokenObf)) {
-					map.put(fieldIntermediary, officialToMCP.get(fieldTokenObf));
-				}
+				adder.accept(MemberToken.ofField(classTokenIntermediary, fieldIntermediary), fieldTokenObf);
 			}

 			for (TinyMethod tinyMethod : tinyClass.getMethods()) {
 				String methodObf = tinyMethod.getMapping().get(0);
 				String methodIntermediary = tinyMethod.getMapping().get(1);
-				MemberToken methodTokenObf = MemberToken.ofMethod(classTokenObf, methodObf, tinyMethod.getMethodDescriptorInFirstNamespace());
+				String methodDescIntermediary = remapDescriptor(tinyMethod.getMethodDescriptorInFirstNamespace(), tiny);
+				MemberToken<TokenType.Method> methodTokenObf = MemberToken.ofMethod(classTokenObf, methodObf, tinyMethod.getMethodDescriptorInFirstNamespace());

-				if (officialToMCP.containsKey(methodTokenObf)) {
-					map.put(methodIntermediary, officialToMCP.get(methodTokenObf));
-				}
+				adder.accept(MemberToken.ofMethod(classTokenIntermediary, methodIntermediary, methodDescIntermediary), methodTokenObf);
 			}
 		}

 		return map;
 	}

-	private void mergeTokensIntoIntermediary(TinyFile tiny, Map<String, String> intermediaryToMCPMap, Map<String, String[]> intermediaryToDocsMap, Map<String, Map<Integer, String>> intermediaryToParamsMap) {
+	private String remapDescriptor(String descriptor, TinyFile file) {
+		return DescriptorRemapper.remapDescriptor(descriptor, s -> {
+			TinyClass tinyClass = file.mapClassesByFirstNamespace().get(s);
+			return tinyClass == null ? s : tinyClass.getMapping().get(1);
+		});
+	}
+
+	private void mergeTokensIntoIntermediary(TinyFile tiny, Map<MemberToken<?>, String> intermediaryToMCPMap, Map<MemberToken<?>, String[]> intermediaryToDocsMap,
+			Map<MemberToken<?>, Map<Integer, String>> intermediaryToParamsMap) {
 		stripTinyWithParametersAndLocal(tiny);

 		// We will be adding the "named" namespace with MCP
@@ -132,12 +146,14 @@ public class MCPReader {

 		for (TinyClass tinyClass : tiny.getClassEntries()) {
 			String classIntermediary = tinyClass.getMapping().get(1);
-			tinyClass.getMapping().add(intermediaryToMCPMap.getOrDefault(classIntermediary, classIntermediary));
+			MemberToken<TokenType.Class> classMemberToken = MemberToken.ofClass(classIntermediary);
+			tinyClass.getMapping().add(intermediaryToMCPMap.getOrDefault(classMemberToken, classIntermediary));

 			for (TinyField tinyField : tinyClass.getFields()) {
 				String fieldIntermediary = tinyField.getMapping().get(1);
-				String[] docs = intermediaryToDocsMap.get(fieldIntermediary);
-				tinyField.getMapping().add(intermediaryToMCPMap.getOrDefault(fieldIntermediary, fieldIntermediary));
+				MemberToken<TokenType.Field> fieldMemberToken = MemberToken.ofField(classMemberToken, fieldIntermediary);
+				String[] docs = intermediaryToDocsMap.get(fieldMemberToken);
+				tinyField.getMapping().add(intermediaryToMCPMap.getOrDefault(fieldMemberToken, fieldIntermediary));

 				if (docs != null) {
 					tinyField.getComments().clear();
@@ -147,15 +163,17 @@ public class MCPReader {

 			for (TinyMethod tinyMethod : tinyClass.getMethods()) {
 				String methodIntermediary = tinyMethod.getMapping().get(1);
-				String[] docs = intermediaryToDocsMap.get(methodIntermediary);
-				tinyMethod.getMapping().add(intermediaryToMCPMap.getOrDefault(methodIntermediary, methodIntermediary));
+				String methodDescIntermediary = remapDescriptor(tinyMethod.getMethodDescriptorInFirstNamespace(), tiny);
+				MemberToken<TokenType.Method> methodMemberToken = MemberToken.ofMethod(classMemberToken, methodIntermediary, methodDescIntermediary);
+				String[] docs = intermediaryToDocsMap.get(methodMemberToken);
+				tinyMethod.getMapping().add(intermediaryToMCPMap.getOrDefault(methodMemberToken, methodIntermediary));

 				if (docs != null) {
 					tinyMethod.getComments().clear();
 					tinyMethod.getComments().addAll(Arrays.asList(docs));
 				}

-				Map<Integer, String> params = intermediaryToParamsMap.get(methodIntermediary);
+				Map<Integer, String> params = intermediaryToParamsMap.get(methodMemberToken);

 				if (params != null) {
 					for (Map.Entry<Integer, String> entry : params.entrySet()) {
@@ -182,8 +200,8 @@ public class MCPReader {
 		}
 	}

-	private Map<MemberToken, String> readSrg() throws IOException {
-		Map<MemberToken, String> tokens = new HashMap<>();
+	private Map<MemberToken<?>, String> readSrg() throws IOException {
+		Map<MemberToken<?>, String> tokens = new HashMap<>();

 		try (BufferedReader reader = Files.newBufferedReader(srgTsrgPath, StandardCharsets.UTF_8)) {
 			String content = IOUtils.toString(reader);
@@ -202,14 +220,14 @@ public class MCPReader {
 		return tokens;
 	}

-	private void readTsrg2(Map<MemberToken, String> tokens, String content) throws IOException {
+	private void readTsrg2(Map<MemberToken<?>, String> tokens, String content) throws IOException {
 		MemoryMappingTree tree = new MemoryMappingTree();
 		MappingReader.read(new StringReader(content), tree);
 		int obfIndex = tree.getNamespaceId("obf");
 		int srgIndex = tree.getNamespaceId("srg");

 		for (MappingTree.ClassMapping classDef : tree.getClasses()) {
-			MemberToken ofClass = MemberToken.ofClass(classDef.getName(obfIndex));
+			MemberToken<TokenType.Class> ofClass = MemberToken.ofClass(classDef.getName(obfIndex));
 			tokens.put(ofClass, classDef.getName(srgIndex));

 			for (MappingTree.FieldMapping fieldDef : classDef.getFields()) {
@@ -223,17 +241,19 @@ public class MCPReader {
 		}
 	}

-	private void injectMcp(Path mcpJar, Map<String, String> intermediaryToSrgMap, Map<String, String[]> intermediaryToDocsMap, Map<String, Map<Integer, String>> intermediaryToParamsMap)
+	private void injectMcp(Path mcpJar, Map<MemberToken<?>, String> intermediaryToSrgMap, Map<MemberToken<?>, String[]> intermediaryToDocsMap,
+			Map<MemberToken<?>, Map<Integer, String>> intermediaryToParamsMap)
 			throws IOException, CsvValidationException {
-		Map<String, List<String>> srgToIntermediary = inverseMap(intermediaryToSrgMap);
-		Map<String, List<String>> simpleSrgToIntermediary = new HashMap<>();
+		Map<String, List<MemberToken<?>>> srgToIntermediary = inverseMap(intermediaryToSrgMap);
+		Map<String, List<MemberToken<TokenType.Method>>> simpleSrgToIntermediary = new HashMap<>();
 		Pattern methodPattern = Pattern.compile("(func_\\d*)_.*");

-		for (Map.Entry<String, List<String>> entry : srgToIntermediary.entrySet()) {
+		for (Map.Entry<String, List<MemberToken<?>>> entry : srgToIntermediary.entrySet()) {
 			Matcher matcher = methodPattern.matcher(entry.getKey());

 			if (matcher.matches()) {
-				simpleSrgToIntermediary.put(matcher.group(1), entry.getValue());
+				simpleSrgToIntermediary.put(matcher.group(1),
+						(List<MemberToken<TokenType.Method>>) (List<? extends MemberToken<?>>) entry.getValue());
 			}
 		}

@@ -248,11 +268,11 @@ public class MCPReader {
 				String[] line;

 				while ((line = reader.readNext()) != null) {
-					List<String> intermediaryField = srgToIntermediary.get(line[0]);
+					List<MemberToken<TokenType.Field>> intermediaryField = (List<MemberToken<TokenType.Field>>) (List<? extends MemberToken<?>>) srgToIntermediary.get(line[0]);
 					String[] docs = line[3].split("\n");

 					if (intermediaryField != null) {
-						for (String s : intermediaryField) {
+						for (MemberToken<TokenType.Field> s : intermediaryField) {
 							intermediaryToSrgMap.put(s, line[1]);

 							if (!line[3].trim().isEmpty() && docs.length > 0) {
@@ -268,11 +288,11 @@ public class MCPReader {
 				String[] line;

 				while ((line = reader.readNext()) != null) {
-					List<String> intermediaryMethod = srgToIntermediary.get(line[0]);
+					List<MemberToken<TokenType.Method>> intermediaryMethod = (List<MemberToken<TokenType.Method>>) (List<? extends MemberToken<?>>) srgToIntermediary.get(line[0]);
 					String[] docs = line[3].split("\n");

 					if (intermediaryMethod != null) {
-						for (String s : intermediaryMethod) {
+						for (MemberToken<TokenType.Method> s : intermediaryMethod) {
 							intermediaryToSrgMap.put(s, line[1]);

 							if (!line[3].trim().isEmpty() && docs.length > 0) {
@@ -295,10 +315,10 @@ public class MCPReader {
 							String named = line[1];
 							String srgMethodStartWith = "func_" + param.group(1);
 							int lvIndex = Integer.parseInt(param.group(2));
-							List<String> intermediaryMethod = simpleSrgToIntermediary.get(srgMethodStartWith);
+							List<MemberToken<TokenType.Method>> intermediaryMethod = simpleSrgToIntermediary.get(srgMethodStartWith);

 							if (intermediaryMethod != null) {
-								for (String s : intermediaryMethod) {
+								for (MemberToken<TokenType.Method> s : intermediaryMethod) {
 									intermediaryToParamsMap.computeIfAbsent(s, s1 -> new HashMap<>()).put(lvIndex, named);
 								}
 							}
@@ -309,18 +329,18 @@ public class MCPReader {
 		}
 	}

-	private Map<String, List<String>> inverseMap(Map<String, String> intermediaryToMCPMap) {
-		Map<String, List<String>> map = new HashMap<>();
+	private <T, A> Map<A, List<T>> inverseMap(Map<T, A> intermediaryToMCPMap) {
+		Map<A, List<T>> map = new HashMap<>();

-		for (Map.Entry<String, String> token : intermediaryToMCPMap.entrySet()) {
+		for (Map.Entry<T, A> token : intermediaryToMCPMap.entrySet()) {
 			map.computeIfAbsent(token.getValue(), s -> new ArrayList<>()).add(token.getKey());
 		}

 		return map;
 	}

-	private void appendClass(Map<MemberToken, String> tokens, ClassMapping<?, ?> classMapping) {
-		MemberToken ofClass = MemberToken.ofClass(classMapping.getFullObfuscatedName());
+	private void appendClass(Map<MemberToken<?>, String> tokens, ClassMapping<?, ?> classMapping) {
+		MemberToken<TokenType.Class> ofClass = MemberToken.ofClass(classMapping.getFullObfuscatedName());
 		tokens.put(ofClass, classMapping.getFullDeobfuscatedName());

 		for (FieldMapping fieldMapping : classMapping.getFieldMappings()) {
@@ -336,28 +356,102 @@ public class MCPReader {
 		}
 	}

-	private record MemberToken(
-			TokenType type,
-			@Nullable MCPReader.MemberToken owner,
-			String name,
-			@Nullable String descriptor
-	) {
-		static MemberToken ofClass(String name) {
-			return new MemberToken(TokenType.CLASS, null, name, null);
+	private interface TokenType {
+		enum Class implements TokenType {
 		}

-		static MemberToken ofField(MemberToken owner, String name) {
-			return new MemberToken(TokenType.FIELD, owner, name, null);
+		enum Method implements TokenType {
 		}

-		static MemberToken ofMethod(MemberToken owner, String name, String descriptor) {
-			return new MemberToken(TokenType.METHOD, owner, name, descriptor);
+		enum Field implements TokenType {
 		}
 	}

-	private enum TokenType {
-		CLASS,
-		METHOD,
-		FIELD
+	private static class MemberToken<T extends TokenType> {
+		@Nullable
+		private MemberToken<TokenType.Class> owner;
+		private String name;
+		@Nullable private String descriptor;
+
+		public MemberToken(@Nullable MemberToken<TokenType.Class> owner, String name, @Nullable String descriptor) {
+			this.owner = owner;
+			this.name = name;
+			this.descriptor = descriptor;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof MemberToken<?> that)) return false;
+			return Objects.equals(owner, that.owner) && Objects.equals(name, that.name) && Objects.equals(descriptor, that.descriptor);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(owner, name, descriptor);
+		}
+
+		static class ClassToken extends MemberToken<TokenType.Class> {
+			ClassToken(String name) {
+				super(null, name, null);
+			}
+
+			@Override
+			public boolean equals(Object o) {
+				if (!(o instanceof ClassToken)) return false;
+				return super.equals(o);
+			}
+
+			@Override
+			public int hashCode() {
+				return (1 + super.hashCode()) * 31 + 1;
+			}
+		}
+
+		static class FieldToken extends MemberToken<TokenType.Field> {
+			FieldToken(@Nullable MemberToken<TokenType.Class> owner, String name) {
+				super(owner, name, null);
+			}
+
+			@Override
+			public boolean equals(Object o) {
+				if (!(o instanceof FieldToken)) return false;
+				return super.equals(o);
+			}
+
+			@Override
+			public int hashCode() {
+				return (1 + super.hashCode()) * 31 + 2;
+			}
+		}
+
+		static class MethodToken extends MemberToken<TokenType.Method> {
+			MethodToken(@Nullable MemberToken<TokenType.Class> owner, String name, @Nullable String descriptor) {
+				super(owner, name, descriptor);
+			}
+
+			@Override
+			public boolean equals(Object o) {
+				if (!(o instanceof MethodToken)) return false;
+				return super.equals(o);
+			}
+
+			@Override
+			public int hashCode() {
+				return (1 + super.hashCode()) * 31 + 3;
+			}
+		}
+
+		static MemberToken<TokenType.Class> ofClass(String name) {
+			return new MemberToken.ClassToken(name);
+		}
+
+		static MemberToken<TokenType.Field> ofField(MemberToken<TokenType.Class> owner, String name) {
+			return new MemberToken.FieldToken(owner, name);
+		}
+
+		static MemberToken<TokenType.Method> ofMethod(MemberToken<TokenType.Class> owner, String name, String descriptor) {
+			return new MemberToken.MethodToken(owner, name, descriptor);
+		}
 	}
 }