diff options
| author | 2023-10-09 12:29:35 +0200 | |
|---|---|---|
| committer | 2023-10-09 12:29:35 +0200 | |
| commit | 4681411ca1f9fcbe5eba5c4009175033e76c865c (patch) | |
| tree | 0c4bc2f4b469288d56b1a9452644d2b7f348b6e3 /enigma-swing | |
| parent | Update to latest Mapping-IO release (diff) | |
| download | enigma-4681411ca1f9fcbe5eba5c4009175033e76c865c.tar.gz enigma-4681411ca1f9fcbe5eba5c4009175033e76c865c.tar.xz enigma-4681411ca1f9fcbe5eba5c4009175033e76c865c.zip | |
Use `VisitableMappingTree` where possible
Diffstat (limited to 'enigma-swing')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java index 0eecc7ba..2c153050 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java | |||
| @@ -33,6 +33,7 @@ import net.fabricmc.mappingio.MappingReader; | |||
| 33 | import net.fabricmc.mappingio.MappingWriter; | 33 | import net.fabricmc.mappingio.MappingWriter; |
| 34 | import net.fabricmc.mappingio.tree.MemoryMappingTree; | 34 | import net.fabricmc.mappingio.tree.MemoryMappingTree; |
| 35 | import net.fabricmc.mappingio.tree.VisitOrder; | 35 | import net.fabricmc.mappingio.tree.VisitOrder; |
| 36 | import net.fabricmc.mappingio.tree.VisitableMappingTree; | ||
| 36 | 37 | ||
| 37 | import cuchaz.enigma.Enigma; | 38 | import cuchaz.enigma.Enigma; |
| 38 | import cuchaz.enigma.EnigmaProfile; | 39 | import cuchaz.enigma.EnigmaProfile; |
| @@ -167,7 +168,7 @@ public class GuiController implements ClientPacketHandler { | |||
| 167 | } | 168 | } |
| 168 | 169 | ||
| 169 | progress.init(1, loadingMessage); | 170 | progress.init(1, loadingMessage); |
| 170 | MemoryMappingTree mappingTree = new MemoryMappingTree(); | 171 | VisitableMappingTree mappingTree = new MemoryMappingTree(); |
| 171 | MappingReader.read(path, format.getMappingIoCounterpart(), mappingTree); | 172 | MappingReader.read(path, format.getMappingIoCounterpart(), mappingTree); |
| 172 | mappings = MappingIoConverter.fromMappingIo(mappingTree, progress); | 173 | mappings = MappingIoConverter.fromMappingIo(mappingTree, progress); |
| 173 | } else { | 174 | } else { |
| @@ -229,7 +230,7 @@ public class GuiController implements ClientPacketHandler { | |||
| 229 | loadedMappingPath = path; | 230 | loadedMappingPath = path; |
| 230 | 231 | ||
| 231 | if (useMappingIo) { | 232 | if (useMappingIo) { |
| 232 | MemoryMappingTree mappingTree = MappingIoConverter.toMappingIo(mapper.getObfToDeobf(), progress); | 233 | VisitableMappingTree mappingTree = MappingIoConverter.toMappingIo(mapper.getObfToDeobf(), progress); |
| 233 | 234 | ||
| 234 | progress.init(1, I18n.translate("progress.mappings.writing")); | 235 | progress.init(1, I18n.translate("progress.mappings.writing")); |
| 235 | MappingWriter writer = MappingWriter.create(path, format.getMappingIoCounterpart()); | 236 | MappingWriter writer = MappingWriter.create(path, format.getMappingIoCounterpart()); |