summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Julian Burner2025-01-13 14:39:39 +0100
committerGravatar GitHub2025-01-13 13:39:39 +0000
commit509142d36768d8997a3661299598f61de3440045 (patch)
tree4687e635f0b8bd9cc9cbd6ed9f3fb08e27d94dc6
parentUpdate to Mapping-IO 0.6 (#547) (diff)
downloadenigma-509142d36768d8997a3661299598f61de3440045.tar.gz
enigma-509142d36768d8997a3661299598f61de3440045.tar.xz
enigma-509142d36768d8997a3661299598f61de3440045.zip
Update to Mapping-IO 0.7 (#550)
-rw-r--r--build.gradle2
-rw-r--r--enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java4
-rw-r--r--enigma/src/main/resources/lang/en_us.json1
3 files changed, 5 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index ae68c867..6fe7bd36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ subprojects {
17 dependencies { 17 dependencies {
18 implementation 'com.google.guava:guava:32.1.2-jre' 18 implementation 'com.google.guava:guava:32.1.2-jre'
19 implementation 'com.google.code.gson:gson:2.10.1' 19 implementation 'com.google.code.gson:gson:2.10.1'
20 implementation 'net.fabricmc:mapping-io:0.6.1' 20 implementation 'net.fabricmc:mapping-io:0.7.1'
21 21
22 compileOnly 'org.jetbrains:annotations:24.0.1' 22 compileOnly 'org.jetbrains:annotations:24.0.1'
23 23
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
index bb70c04e..197abce1 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
@@ -47,7 +47,8 @@ public enum MappingFormat {
47 TSRG_2_FILE(null, null, FileType.TSRG, net.fabricmc.mappingio.format.MappingFormat.TSRG_2_FILE), 47 TSRG_2_FILE(null, null, FileType.TSRG, net.fabricmc.mappingio.format.MappingFormat.TSRG_2_FILE),
48 PROGUARD(null, ProguardMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.PROGUARD_FILE), 48 PROGUARD(null, ProguardMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.PROGUARD_FILE),
49 RECAF(RecafMappingsWriter.INSTANCE, RecafMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.RECAF_SIMPLE_FILE), 49 RECAF(RecafMappingsWriter.INSTANCE, RecafMappingsReader.INSTANCE, FileType.TXT, net.fabricmc.mappingio.format.MappingFormat.RECAF_SIMPLE_FILE),
50 JOBF_FILE(null, null, FileType.JOBF, net.fabricmc.mappingio.format.MappingFormat.JOBF_FILE); 50 JOBF_FILE(null, null, FileType.JOBF, net.fabricmc.mappingio.format.MappingFormat.JOBF_FILE),
51 INTELLIJ_MIGRATION_MAP_FILE(null, null, FileType.XML, net.fabricmc.mappingio.format.MappingFormat.INTELLIJ_MIGRATION_MAP_FILE);
51 52
52 private final MappingsWriter writer; 53 private final MappingsWriter writer;
53 private final MappingsReader reader; 54 private final MappingsReader reader;
@@ -209,6 +210,7 @@ public enum MappingFormat {
209 public static final FileType TSRG = new FileType(".tsrg"); 210 public static final FileType TSRG = new FileType(".tsrg");
210 public static final FileType TXT = new FileType(".txt"); 211 public static final FileType TXT = new FileType(".txt");
211 public static final FileType JOBF = new FileType(".jobf"); 212 public static final FileType JOBF = new FileType(".jobf");
213 public static final FileType XML = new FileType(".xml");
212 214
213 public FileType(String... extensions) { 215 public FileType(String... extensions) {
214 this(List.of(extensions)); 216 this(List.of(extensions));
diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index b939e551..e0882b9a 100644
--- a/enigma/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
@@ -15,6 +15,7 @@
15 "mapping_format.proguard": "ProGuard File", 15 "mapping_format.proguard": "ProGuard File",
16 "mapping_format.recaf": "Recaf Simple File", 16 "mapping_format.recaf": "Recaf Simple File",
17 "mapping_format.jobf_file": "JOBF File", 17 "mapping_format.jobf_file": "JOBF File",
18 "mapping_format.intellij_migration_map_file": "IntelliJ Migration Map File",
18 "legacy": "legacy", 19 "legacy": "legacy",
19 20
20 "type.methods": "Methods", 21 "type.methods": "Methods",