Skip to content

Update to Mapping-IO 0.7 #550

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

Merged
modmuss50 merged 1 commit into from
Jan 13, 2025
Merged

Update to Mapping-IO 0.7 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ subprojects {
dependencies {
implementation 'com.google.guava:guava:32.1.2-jre'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'net.fabricmc:mapping-io:0.6.1'
implementation 'net.fabricmc:mapping-io:0.7.1'

compileOnly 'org.jetbrains:annotations:24.0.1'

Expand Down
4 changes: 3 additions & 1 deletion enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public enum MappingFormat {
TSRG_2_FILE(null, null, FileType.TSRG, net.fabricmc.mappingio.format.MappingFormat.TSRG_2_FILE),
PROGUARD(null, ProguardMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.PROGUARD_FILE),
RECAF(RecafMappingsWriter.INSTANCE, RecafMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.RECAF_SIMPLE_FILE),
JOBF_FILE(null, null, FileType.JOBF, net.fabricmc.mappingio.format.MappingFormat.JOBF_FILE);
JOBF_FILE(null, null, FileType.JOBF, net.fabricmc.mappingio.format.MappingFormat.JOBF_FILE),
INTELLIJ_MIGRATION_MAP_FILE(null, null, FileType.XML, net.fabricmc.mappingio.format.MappingFormat.INTELLIJ_MIGRATION_MAP_FILE);

private final MappingsWriter writer;
private final MappingsReader reader;
Expand Down Expand Up @@ -209,6 +210,7 @@ public record FileType(List<String> extensions) {
public static final FileType TSRG = new FileType(".tsrg");
public static final FileType TXT = new FileType(".txt");
public static final FileType JOBF = new FileType(".jobf");
public static final FileType XML = new FileType(".xml");

public FileType(String... extensions) {
this(List.of(extensions));
Expand Down
1 change: 1 addition & 0 deletions enigma/src/main/resources/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"mapping_format.proguard": "ProGuard File",
"mapping_format.recaf": "Recaf Simple File",
"mapping_format.jobf_file": "JOBF File",
"mapping_format.intellij_migration_map_file": "IntelliJ Migration Map File",
"legacy": "legacy",

"type.methods": "Methods",
Expand Down