Skip to content

Internal proposers #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: develop/2.7
Choose a base branch
from
Draft

Internal proposers #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88383bf
add ParameterConnections test input
supersaiyansubtlety Nov 9, 2025
f41ae92
disable user renaming of enum constants
supersaiyansubtlety Nov 9, 2025
9288418
extract EnigmaProjectImpl
supersaiyansubtlety Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion enigma/src/main/java/org/quiltmc/enigma/api/Enigma.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public EnigmaProject openJar(Path path, ClassProvider libraryClassProvider, Prog
MappingsIndex mappingsIndex = MappingsIndex.empty();
mappingsIndex.indexMappings(proposedNames, progress);

return new EnigmaProject(this, path, mainProjectProvider, jarIndex, libIndex, comboIndex, mappingsIndex, proposedNames, Utils.zipSha1(path));
return EnigmaProject.of(this, path, mainProjectProvider, jarIndex, libIndex, comboIndex, mappingsIndex, proposedNames, Utils.zipSha1(path));
}

private Predicate<String> createMainReferencedPredicate(AbstractJarIndex mainIndex, ProjectClassProvider classProvider) {
Expand Down
469 changes: 45 additions & 424 deletions enigma/src/main/java/org/quiltmc/enigma/api/EnigmaProject.java
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions enigma/src/main/java/org/quiltmc/enigma/api/analysis/tree/StructureTreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.quiltmc.enigma.api.translation.representation.entry.MethodDefEntry;
import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.api.translation.representation.entry.ParentedEntry;
import org.quiltmc.enigma.impl.EnigmaProjectImpl;

import javax.swing.tree.DefaultMutableTreeNode;
import java.util.ArrayList;
Expand All @@ -38,17 +39,21 @@ public ParentedEntry<?> getEntry() {
}

public void load(EnigmaProject project, StructureTreeOptions options) {
this.loadImpl((EnigmaProjectImpl) project, options);
}

private void loadImpl(EnigmaProjectImpl project, StructureTreeOptions options) {
Stream<ParentedEntry<?>> children = project.getJarIndex().getChildrenByClass().get(this.parentEntry).stream();

children = switch (options.obfuscationVisibility()) {
case ALL -> children;
case OBFUSCATED -> children
// remove deobfuscated members if only obfuscated, unless it's an inner class
.filter(e -> (e instanceof ClassEntry) || (project.isObfuscated(e) && project.isRenamable(e)))
.filter(e -> (e instanceof ClassEntry) || (project.isObfuscated(e) && project.isInternallyRenamable(e)))
// keep constructor methods if the class is obfuscated
.filter(e -> !(e instanceof MethodEntry m && m.isConstructor()) || project.isObfuscated(e.getParent()));
case DEOBFUSCATED -> children.filter(e -> (e instanceof ClassEntry)
|| (!project.isObfuscated(e) && project.isRenamable(e))
|| (!project.isObfuscated(e) && project.isInternallyRenamable(e))
// keep constructor methods if the class is deobfuscated
|| (e instanceof MethodEntry m && m.isConstructor()) && !project.isObfuscated(e.getParent()));
};
Expand Down
9 changes: 7 additions & 2 deletions enigma/src/main/java/org/quiltmc/enigma/api/source/DecompiledClassSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.LocalVariableDefEntry;
import org.quiltmc.enigma.impl.EnigmaProjectImpl;
import org.quiltmc.enigma.impl.translation.LocalNameGenerator;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -46,12 +47,12 @@ public DecompiledClassSource remapSource(EnigmaProject project, Translator trans
SourceRemapper remapper = new SourceRemapper(this.obfuscatedIndex.getSource(), this.obfuscatedIndex.referenceTokens());

TokenStore tokenStore = TokenStore.create(this.obfuscatedIndex);
SourceRemapper.Result remapResult = remapper.remap((token, movedToken) -> this.remapToken(tokenStore, project, token, movedToken, translator));
SourceRemapper.Result remapResult = remapper.remap((token, movedToken) -> this.remapToken(tokenStore, ((EnigmaProjectImpl) project), token, movedToken, translator));
SourceIndex remappedIndex = this.obfuscatedIndex.remapTo(remapResult);
return new DecompiledClassSource(this.classEntry, this.obfuscatedIndex, remappedIndex, tokenStore);
}

private String remapToken(TokenStore target, EnigmaProject project, Token token, Token movedToken, Translator translator) {
private String remapToken(TokenStore target, EnigmaProjectImpl project, Token token, Token movedToken, Translator translator) {
EntryReference<Entry<?>, Entry<?>> reference = this.obfuscatedIndex.getReference(token);

Entry<?> entry = this.obfuscatedIndex.remapToNameable ? reference.getNameableEntry() : reference.entry;
Expand All @@ -64,6 +65,10 @@ private String remapToken(TokenStore target, EnigmaProject project, Token token,
} else {
target.add(project, EntryMapping.OBFUSCATED, movedToken);
}
} else if (project.isInternallyRenamable(reference)) {
if (translatedEntry != null && !translatedEntry.isObfuscated()) {
return translatedEntry.getValue().getSourceRemapName();
}
} else if (DEBUG_TOKEN_HIGHLIGHTS) {
target.add(project, new EntryMapping(null, null, TokenType.DEBUG, null), movedToken);
}
Expand Down
Loading