Merge pull request #463 from NebelNidas/mapping-io

Initial Mapping-IO support

4 files changed, 20 insertions, 36 deletions

diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index 421620e..2a3cfb2 100644
--- a/enigma/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
@@ -137,6 +137,7 @@
         "log_panel.messages": "Messages",
         "log_panel.users": "Users",
 
+        "progress.done": "Done!",
         "progress.operation": "%s - Operation in progress",
         "progress.jar.indexing": "Indexing jar",
         "progress.jar.indexing.entries": "Entries...",
@@ -147,15 +148,12 @@
         "progress.sources.writing": "Writing sources...",
         "progress.classes.deobfuscating": "Deobfuscating classes...",
         "progress.classes.decompiling": "Decompiling classes...",
-        "progress.mappings.enigma_file.loading": "Loading mapping file",
-        "progress.mappings.enigma_file.done": "Done!",
-        "progress.mappings.enigma_file.writing": "Writing classes",
-        "progress.mappings.enigma_directory.loading": "Loading mapping files",
-        "progress.mappings.enigma_directory.writing": "Writing classes",
-        "progress.mappings.tiny_file.loading": "Loading mapping file",
-        "progress.mappings.tiny_v2.loading": "Loading mapping file",
-        "progress.mappings.srg_file.generating": "Generating mappings",
-        "progress.mappings.srg_file.writing": "Writing mappings",
+        "progress.mappings.loading_file": "Loading mapping file",
+        "progress.mappings.loading_directory": "Loading mapping files",
+        "progress.mappings.writing": "Writing classes",
+        "progress.mappings.converting": "Converting mappings",
+        "progress.mappings.converting.to_mappingio": "Converting to Mapping-IO",
+        "progress.mappings.converting.from_mappingio": "Converting from Mapping-IO",
         "progress.stats": "Generating stats",
         "progress.stats.data": "Generating data",
 
diff --git a/enigma/src/main/resources/lang/fr_fr.json b/enigma/src/main/resources/lang/fr_fr.json
index d3d0c29..520dd32 100644
--- a/enigma/src/main/resources/lang/fr_fr.json
+++ b/enigma/src/main/resources/lang/fr_fr.json
@@ -131,6 +131,7 @@
         "log_panel.messages": "Messages",
         "log_panel.users": "Utilisateurs",
 
+        "progress.done": "Terminé !",
         "progress.operation": "%s - Opération en cours",
         "progress.jar.indexing": "Indexation du jar",
         "progress.jar.indexing.entries": "Entrées...",
@@ -141,15 +142,10 @@
         "progress.sources.writing": "Écriture des sources...",
         "progress.classes.deobfuscating": "Déobfuscation des classes...",
         "progress.classes.decompiling": "Décompilation des classes...",
-        "progress.mappings.enigma_file.loading": "Chargement du fichier de mappings",
-        "progress.mappings.enigma_file.done": "Terminé !",
-        "progress.mappings.enigma_file.writing": "Écriture des classes",
-        "progress.mappings.enigma_directory.loading": "Chargement des fichiers de mappings",
-        "progress.mappings.enigma_directory.writing": "Écriture des classes",
-        "progress.mappings.tiny_file.loading": "Chargement du fichier de mappings",
-        "progress.mappings.tiny_v2.loading": "Chargement du fichier de mappings",
-        "progress.mappings.srg_file.generating": "Génération des mappings",
-        "progress.mappings.srg_file.writing": "Écriture des mappings",
+        "progress.mappings.loading_file": "Chargement du fichier de mappings",
+        "progress.mappings.loading_directory": "Chargement des fichiers de mappings",
+        "progress.mappings.writing": "Écriture des mappings",
+        "progress.mappings.converting": "Conversion des mappings",
         "progress.stats": "Génération des statistiques",
         "progress.stats.data": "Génération des données",
 
diff --git a/enigma/src/main/resources/lang/ja_jp.json b/enigma/src/main/resources/lang/ja_jp.json
index 09e7ee0..b4d5199 100644
--- a/enigma/src/main/resources/lang/ja_jp.json
+++ b/enigma/src/main/resources/lang/ja_jp.json
@@ -132,6 +132,7 @@
         "log_panel.messages": "メッセージ",
         "log_panel.users": "ユーザー",
 
+        "progress.done": "完了しました!",
         "progress.operation": "%s - 処理中",
         "progress.jar.indexing": "jarのインデックス中",
         "progress.jar.indexing.entries": "エントリー...",
@@ -142,15 +143,9 @@
         "progress.sources.writing": "ソースコードを書き出し中...",
         "progress.classes.deobfuscating": "クラスを難読化解除中...",
         "progress.classes.decompiling": "クラスのデコンパイル中...",
-        "progress.mappings.enigma_file.loading": "マッピングファイルをロード",
-        "progress.mappings.enigma_file.done": "完了しました!",
-        "progress.mappings.enigma_file.writing": "クラスの書き出し中",
-        "progress.mappings.enigma_directory.loading": "マッピングファイルの読込中",
-        "progress.mappings.enigma_directory.writing": "クラスの書き出し中",
-        "progress.mappings.tiny_file.loading": "マッピングファイルの読込中",
-        "progress.mappings.tiny_v2.loading": "マッピングファイルの読込中",
-        "progress.mappings.srg_file.generating": "マッピングの作成中",
-        "progress.mappings.srg_file.writing": "マッピングの書き出し中",
+        "progress.mappings.loading_file": "マッピングファイルをロード",
+        "progress.mappings.loading_directory": "マッピングファイルの読込中",
+        "progress.mappings.writing": "マッピングの書き出し中",
         "progress.stats": "統計情報を作成中",
         "progress.stats.data": "データの作成中",
 
diff --git a/enigma/src/main/resources/lang/zh_cn.json b/enigma/src/main/resources/lang/zh_cn.json
index fe806fb..dbc6dd3 100644
--- a/enigma/src/main/resources/lang/zh_cn.json
+++ b/enigma/src/main/resources/lang/zh_cn.json
@@ -75,6 +75,7 @@
         "info_panel.tree.implementations": "实现",
         "info_panel.tree.calls": "调用图",
 
+        "progress.done": "完成！",
         "progress.operation": "%s - 进行中",
         "progress.jar.indexing": "索引 Jar",
         "progress.jar.indexing.entries": "条目...",
@@ -85,15 +86,9 @@
         "progress.sources.writing": "写出源码中...",
         "progress.classes.deobfuscating": "反混淆类中...",
         "progress.classes.decompiling": "反编译类中...",
-        "progress.mappings.enigma_file.loading": "加载映射文件",
-        "progress.mappings.enigma_file.done": "完成！",
-        "progress.mappings.enigma_file.writing": "写入类",
-        "progress.mappings.enigma_directory.loading": "加载映射文件",
-        "progress.mappings.enigma_directory.writing": "写入类",
-        "progress.mappings.tiny_file.loading": "加载映射文件",
-        "progress.mappings.tiny_v2.loading": "加载映射文件",
-        "progress.mappings.srg_file.generating": "生成映射",
-        "progress.mappings.srg_file.writing": "写出映射",
+        "progress.mappings.loading_file": "加载映射文件",
+        "progress.mappings.loading_directory": "加载映射文件",
+        "progress.mappings.writing": "写出映射",
         "progress.stats": "生成统计范围",
         "progress.stats.data": "生成数据",