From 4a40b215d5e92393e022a82e6fdb0e17f902af8f Mon Sep 17 00:00:00 2001
From: Chicken-Bomes <mehvids@gmail.com>
Date: Fri, 7 Nov 2014 01:03:01 +1000
Subject: [PATCH] Update tool ASM to 5.0.3 Add set(TileEntity) method to
 BlockCoord Remove unused imports

---
 src/codechicken/lib/asm/ASMHelper.java      | 10 ++++++++--
 src/codechicken/lib/tool/LibDownloader.java |  2 +-
 src/codechicken/lib/vec/BlockCoord.java     |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/codechicken/lib/asm/ASMHelper.java b/src/codechicken/lib/asm/ASMHelper.java
index 6c53a96..85526db 100644
--- a/src/codechicken/lib/asm/ASMHelper.java
+++ b/src/codechicken/lib/asm/ASMHelper.java
@@ -8,6 +8,8 @@ import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.*;
+import org.objectweb.asm.util.ASMifier;
+import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceClassVisitor;
 
 import java.io.File;
@@ -145,7 +147,7 @@ public class ASMHelper
         replacement.accept(original);
     }
 
-    public static void dump(Acceptor acceptor, File file, boolean filterImportant, boolean sortLocals) {
+    public static void dump(Acceptor acceptor, File file, boolean filterImportant, boolean sortLocals, boolean textify) {
         try {
             if(!file.getParentFile().exists())
                 file.getParentFile().mkdirs();
@@ -153,7 +155,7 @@ public class ASMHelper
                 file.createNewFile();
 
             PrintWriter pout = new PrintWriter(file);
-            ClassVisitor cv = new TraceClassVisitor(pout);
+            ClassVisitor cv = new TraceClassVisitor(null, textify ? new Textifier() : new ASMifier(), pout);
             if(filterImportant) cv = new ImportantInsnVisitor(cv);
             if(sortLocals) cv = new LocalVariablesSorterVisitor(cv);
             acceptor.accept(cv);
@@ -163,6 +165,10 @@ public class ASMHelper
         }
     }
 
+    public static void dump(Acceptor acceptor, File file, boolean filterImportant, boolean sortLocals) {
+        dump(acceptor, file, filterImportant, sortLocals, config.getTag("textify").getBooleanValue(true));
+    }
+
     public static void dump(final byte[] bytes, File file, boolean filterImportant, boolean sortLocals) {
         dump(new Acceptor()
         {
diff --git a/src/codechicken/lib/tool/LibDownloader.java b/src/codechicken/lib/tool/LibDownloader.java
index c4107be..dc77c10 100644
--- a/src/codechicken/lib/tool/LibDownloader.java
+++ b/src/codechicken/lib/tool/LibDownloader.java
@@ -14,7 +14,7 @@ import java.util.List;
 public class LibDownloader
 {
     private static String[] libs = new String[] {
-            "org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar",
+            "org/ow2/asm/asm-debug-all/5.0.3/asm-debug-all-5.0.3.jar",
             "com/google/guava/guava/14.0/guava-14.0.jar",
             "net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar",
             "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
diff --git a/src/codechicken/lib/vec/BlockCoord.java b/src/codechicken/lib/vec/BlockCoord.java
index b506eaf..4299400 100644
--- a/src/codechicken/lib/vec/BlockCoord.java
+++ b/src/codechicken/lib/vec/BlockCoord.java
@@ -219,6 +219,10 @@ public class BlockCoord implements Comparable<BlockCoord>, Copyable<BlockCoord>
         return set(ia[0], ia[1], ia[2]);
     }
 
+    public BlockCoord set(TileEntity tile) {
+        return set(tile.xCoord, tile.yCoord, tile.zCoord);
+    }
+
     public int toSide()
     {
         if(!isAxial()) return -1;