From d26115cac660a8ae6b076f274a1453288af963a8 Mon Sep 17 00:00:00 2001
From: Lucas <no@thanks.com>
Date: Thu, 4 Jul 2019 22:59:34 +0200
Subject: [PATCH] Fix deob pom and revert updatemappings change

Revert not working updatemappings change
Show log messages in deob
---
 deobfuscator/pom.xml                          |  1 +
 .../runelite/deob/updater/UpdateMappings.java | 40 +------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml
index c711697622..babd26ed24 100644
--- a/deobfuscator/pom.xml
+++ b/deobfuscator/pom.xml
@@ -65,6 +65,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.12</version>
+			<scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
index db6ed0ef1c..0201caabb1 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
@@ -26,24 +26,19 @@ package net.runelite.deob.updater;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Map;
 import net.runelite.asm.ClassGroup;
-import net.runelite.asm.Field;
-import net.runelite.asm.Method;
-import net.runelite.deob.deobfuscators.Renamer;
 import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker;
 import net.runelite.deob.deobfuscators.mapping.AnnotationMapper;
 import net.runelite.deob.deobfuscators.mapping.Mapper;
 import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
 import net.runelite.deob.util.JarUtil;
-import net.runelite.deob.util.NameMappings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class UpdateMappings
 {
 	private static final Logger logger = LoggerFactory.getLogger(UpdateMappings.class);
-	private static boolean renameRL = true;
+
 	private final ClassGroup group1, group2;
 
 	public UpdateMappings(ClassGroup group1, ClassGroup group2)
@@ -79,32 +74,6 @@ public class UpdateMappings
 		pr.run();
 	}
 
-	public void updateRL()
-	{
-		Mapper mapper = new Mapper(group1, group2);
-		mapper.run();
-		ParallelExecutorMapping mapping = mapper.getMapping();
-		NameMappings names = new NameMappings();
-
-		for (Map.Entry<Object, Object> e : mapping.getMap().entrySet())
-		{
-			Object k = e.getKey();
-			Object v = e.getValue();
-
-			if (k instanceof Field)
-			{
-				names.map(((Field) v).getPoolField(), ((Field) k).getName());
-			}
-			else if (k instanceof Method)
-			{
-				names.map(((Method) v).getPoolMethod(), ((Method) k).getName());
-			}
-		}
-
-		Renamer renamer = new Renamer(names);
-		renamer.run(group2);
-	}
-
 	public void save(File out) throws IOException
 	{
 		JarUtil.saveJar(group2, out);
@@ -121,14 +90,7 @@ public class UpdateMappings
 			JarUtil.loadJar(new File(args[0])),
 			JarUtil.loadJar(new File(args[1]))
 		);
-		if (renameRL)
-		{
-			u.updateRL();
-		}
-		else
-		{
 			u.update();
-		}
 		u.save(new File(args[2]));
 	}
 }