More refactoring (tm)

deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java

@@ -37,6 +37,7 @@ 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.deobfuscators.transformers.ScriptOpcodesTransformer;
 import net.runelite.deob.util.JarUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -87,6 +88,19 @@ public class UpdateMappingsTest
 		check(group1, group2);
 	}
 
+	@Test
+	@Ignore
+	public void testScriptopcodes() throws Exception
+	{
+		File client = new File("C:\\Users\\Lucas\\IdeaProjects\\runelitexxx\\client.jar");
+
+		ClassGroup group = JarUtil.loadJar(client);
+
+		new ScriptOpcodesTransformer().transform(group);
+
+		JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar"));
+	}
+
 	private void unannotate(ClassGroup group)
 	{
 		for (ClassFile cf : group.getClasses())

deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java

@@ -187,7 +187,7 @@ public class HookImporter
 					for (int i = 0; i < hm.parameters.size(); i++)
 					{
 						String name = hm.parameters.get(i);
-						if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y'))
+						if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' && name.charAt(0) != 'y'))
 						{
 							continue;
 						}