From d73bcc926dced0d6585ed1381ba68f5ce3e1a2b6 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sat, 23 Jun 2018 16:03:43 +0200 Subject: [PATCH] Update enigma --- build.gradle | 2 +- .../net/fabricmc/loom/task/MapJarsTask.java | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 1218676..b3245a8 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ dependencies { transitive = false } shade 'org.ow2.asm:asm-debug-all:5.2' - shade 'enigma-asm:enigma:0.12.0.6:lib' + shade 'enigma-asm:enigma:0.12.0.8:lib' shade 'net.fabricmc:tiny-remapper:+' shade 'net.sf.jopt-simple:jopt-simple:5.0.4' shade 'org.apache.logging.log4j:log4j-api:2.11.0' diff --git a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java index 7ab0eea..28ed3c3 100644 --- a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java @@ -35,8 +35,6 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.util.Constants; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.tree.ClassNode; import org.zeroturnaround.zip.ZipUtil; import org.zeroturnaround.zip.commons.FileUtils; @@ -99,21 +97,7 @@ public class MapJarsTask extends DefaultTask { Translator obfuscationTranslator = deobfuscator.getTranslator(TranslationDirection.OBFUSCATING); Translator deobfuscationTranslator = deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING); TranslatingTypeLoader loader = new TranslatingTypeLoader(deobfuscator.getJar(), deobfuscator.getJarIndex(), new ReferencedEntryPool(), obfuscationTranslator, deobfuscationTranslator); - deobfuscator.transformJar(out, progress, new CustomClassTransformer(loader)); - } - - private class CustomClassTransformer implements Deobfuscator.ClassTransformer { - - TranslatingTypeLoader loader; - - public CustomClassTransformer(TranslatingTypeLoader loader) { - this.loader = loader; - } - - @Override - public void write(ClassNode classNode, ClassWriter classWriter) { - loader.createTransformer(classNode, classWriter); - } + deobfuscator.transformJar(out, progress, loader::transformInto); } public static class ProgressListener implements Deobfuscator.ProgressListener {