Merge branch 'master' into master+arith

Conflicts:
	src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java

src/main/java/net/runelite/deob/ClassFile.java

@@ -237,11 +237,6 @@ public class ClassFile
 		}
 	}
 	
-	public void buildInstructionGraph()
-	{
-		methods.buildInstructionGraph();
-	}
-	
 	public boolean instanceOf(ClassFile other)
 	{
 		return this == other || interfaces.instanceOf(other) || (getParent() != null && getParent().instanceOf(other));

src/main/java/net/runelite/deob/ClassGroup.java

@@ -47,10 +47,4 @@ public class ClassGroup
 		for (ClassFile c : classes)
 			c.buildClassGraph();
 	}
-
-	public void buildInstructionGraph()
-	{
-		for (ClassFile c : classes)
-			c.buildInstructionGraph();
-	}
 }

src/main/java/net/runelite/deob/Field.java

@@ -28,8 +28,6 @@ public class Field
 	private Type type;
 	private Attributes attributes;
 
-	private ArrayList<Instruction> instructions = new ArrayList<Instruction>(); // instructions which reference this field
-
 	Field(Fields fields) throws IOException
 	{
 		this.fields = fields;
@@ -97,9 +95,4 @@ public class Field
 	{
 		return attributes;
 	}
-
-	public void addReference(Instruction ins)
-	{
-		instructions.add(ins);
-	}
 }

src/main/java/net/runelite/deob/Method.java

@@ -116,14 +116,6 @@ public class Method
 		return (Code) attributes.findType(AttributeType.CODE);
 	}
 	
-	public void buildInstructionGraph()
-	{
-		Code code = getCode();
-
-		if (code != null)
-			code.buildInstructionGraph();
-	}
-	
 	@SuppressWarnings("unchecked")
 	public <T extends Instruction & LVTInstruction> List<T> findLVTInstructionsForVariable(int index)
 	{

src/main/java/net/runelite/deob/Methods.java

@@ -72,10 +72,4 @@ public class Methods
 				return m;
 		return null;
 	}
-
-	public void buildInstructionGraph()
-	{
-		for (Method m : methods)
-			m.buildInstructionGraph();
-	}
 }

src/main/java/net/runelite/deob/attributes/Code.java

@@ -111,9 +111,4 @@ public class Code extends Attribute
 	{
 		this.instructions = instructions;
 	}
-
-	public void buildInstructionGraph()
-	{
-		instructions.buildInstructionGraph();
-	}
 }

src/main/java/net/runelite/deob/attributes/code/Instruction.java

@@ -202,10 +202,6 @@ public abstract class Instruction
 		to.from.add(this);
 	}
 
-	public void buildInstructionGraph()
-	{
-	}
-	
 	public abstract void execute(Frame e);
 	
 	/* does this terminate a block? */

src/main/java/net/runelite/deob/attributes/code/Instructions.java

@@ -211,12 +211,6 @@ public class Instructions
 				((JumpingInstruction) i).buildJumpGraph();
 	}
 	
-	public void buildInstructionGraph()
-	{
-		for (Instruction i : instructions)
-			i.buildInstructionGraph();
-	}
-
 	public Code getCode()
 	{
 		return code;

src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java

@@ -66,14 +66,6 @@ public class GetStatic extends Instruction implements GetFieldInstruction
 		frame.addInstructionContext(ins);
 	}
 
-	@Override
-	public void buildInstructionGraph()
-	{
-		net.runelite.deob.Field f = getMyField();
-		if (f != null)
-			f.addReference(this);
-	}
-
 	@Override
 	public Field getField()
 	{

src/main/java/net/runelite/deob/deobfuscators/FieldMover.java

@@ -253,7 +253,7 @@ public class FieldMover implements Deobfuscator
 		}
 		
 		to.getCode().getInstructions().buildJumpGraph();
-		frame.getMethod().getCode().getInstructions().buildInstructionGraph();
+		frame.getMethod().getCode().getInstructions().buildJumpGraph();
 		
 		for (Instruction i : orderedIns.values())
 		{