move generateDescriptor methods to ByteCodeUtilities

Mumfrey
1 parent 9959697d
Showing 3 changed files with 73 additions and 75 deletions
java/common/com/mumfrey/liteloader/transformers/ByteCodeUtilities.java
java/common/com/mumfrey/liteloader/transformers/Callback.java
java/common/com/mumfrey/liteloader/transformers/event/MethodInfo.java
@@ -677,4 +677,74 @@ public abstract class ByteCodeUtilities
 		}
 		return null;
 	}
+	
+	/**
+	 * @param returnType
+	 * @param args
+	 */
+	public static String generateDescriptor(Type returnType, Object... args)
+	{
+		return ByteCodeUtilities.generateDescriptor(Obf.MCP, returnType, args);
+	}
+	
+	/**
+	 * @param returnType
+	 * @param args
+	 */
+	public static String generateDescriptor(Obf returnType, Object... args)
+	{
+		return ByteCodeUtilities.generateDescriptor(Obf.MCP, returnType, args);
+	}
+	
+	/**
+	 * @param returnType
+	 * @param args
+	 */
+	public static String generateDescriptor(String returnType, Object... args)
+	{
+		return ByteCodeUtilities.generateDescriptor(Obf.MCP, returnType, args);
+	}
+	
+	/**
+	 * @param obfType
+	 * @param returnType
+	 * @param args
+	 */
+	public static String generateDescriptor(int obfType, Object returnType, Object... args)
+	{
+		StringBuilder sb = new StringBuilder().append('(');;
+
+		for (Object arg : args)
+		{
+			sb.append(ByteCodeUtilities.toDescriptor(obfType, arg));
+		}
+		
+		return sb.append(')').append(returnType != null ? ByteCodeUtilities.toDescriptor(obfType, returnType) : "V").toString();
+	}
+
+	/**
+	 * @param obfType
+	 * @param arg
+	 */
+	private static String toDescriptor(int obfType, Object arg)
+	{
+		if (arg instanceof Obf)
+		{
+			return ((Obf)arg).getDescriptor(obfType);
+		}
+		else if (arg instanceof String)
+		{
+			return (String)arg;
+		}
+		else if (arg instanceof Type)
+		{
+			return arg.toString();
+		}
+		else if (arg instanceof Class)
+		{
+			return Type.getDescriptor((Class<?>)arg).toString();
+		}
+		
+		return arg == null ? "" : arg.toString();
+	}
 }
@@ -3,8 +3,6 @@ package com.mumfrey.liteloader.transformers;
 import java.util.ArrayList;
 import java.util.List;
-import org.objectweb.asm.Type;
-
 import com.mumfrey.liteloader.core.runtime.Obf;
 /**
@@ -273,74 +271,4 @@ public class Callback
 	{
 		return super.hashCode();
 	}
-	
-	/**
-	 * @param returnType
-	 * @param args
-	 */
-	public static String generateDescriptor(Type returnType, Object... args)
-	{
-		return Callback.generateDescriptor(Obf.MCP, returnType, args);
-	}
-	
-	/**
-	 * @param returnType
-	 * @param args
-	 */
-	public static String generateDescriptor(Obf returnType, Object... args)
-	{
-		return Callback.generateDescriptor(Obf.MCP, returnType, args);
-	}
-	
-	/**
-	 * @param returnType
-	 * @param args
-	 */
-	public static String generateDescriptor(String returnType, Object... args)
-	{
-		return Callback.generateDescriptor(Obf.MCP, returnType, args);
-	}
-	
-	/**
-	 * @param obfType
-	 * @param returnType
-	 * @param args
-	 */
-	public static String generateDescriptor(int obfType, Object returnType, Object... args)
-	{
-		StringBuilder sb = new StringBuilder().append('(');;
-
-		for (Object arg : args)
-		{
-			sb.append(Callback.toDescriptor(obfType, arg));
-		}
-		
-		return sb.append(')').append(returnType != null ? Callback.toDescriptor(obfType, returnType) : "V").toString();
-	}
-
-	/**
-	 * @param obfType
-	 * @param arg
-	 */
-	private static String toDescriptor(int obfType, Object arg)
-	{
-		if (arg instanceof Obf)
-		{
-			return ((Obf)arg).getDescriptor(obfType);
-		}
-		else if (arg instanceof String)
-		{
-			return (String)arg;
-		}
-		else if (arg instanceof Type)
-		{
-			return arg.toString();
-		}
-		else if (arg instanceof Class)
-		{
-			return Type.getDescriptor((Class<?>)arg).toString();
-		}
-		
-		return arg == null ? "" : arg.toString();
-	}
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@ package com.mumfrey.liteloader.transformers.event;
 import joptsimple.internal.Strings;
 import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.Callback;
+import com.mumfrey.liteloader.transformers.ByteCodeUtilities;
 /**
  * Encapsulates a method descriptor with varying degrees of accuracy from a simpler owner/method mapping up to
@@ -139,7 +139,7 @@ public class MethodInfo
 	 */
 	public MethodInfo(Obf owner, String method, Object returnType, Object... args)
 	{
-		this(owner.name, owner.obf, method, method, method, Callback.generateDescriptor(Obf.MCP, returnType, args), Callback.generateDescriptor(Obf.OBF, returnType, args));
+		this(owner.name, owner.obf, method, method, method, ByteCodeUtilities.generateDescriptor(Obf.MCP, returnType, args), ByteCodeUtilities.generateDescriptor(Obf.OBF, returnType, args));
 	}
 	/**
@@ -158,7 +158,7 @@ public class MethodInfo
 	 */
 	public MethodInfo(Obf owner, Obf method, Object returnType, Object... args)
 	{
-		this(owner.name, owner.obf, method.name, method.srg, method.obf, Callback.generateDescriptor(Obf.MCP, returnType, args), Callback.generateDescriptor(Obf.OBF, returnType, args));
+		this(owner.name, owner.obf, method.name, method.srg, method.obf, ByteCodeUtilities.generateDescriptor(Obf.MCP, returnType, args), ByteCodeUtilities.generateDescriptor(Obf.OBF, returnType, args));
 	}
 	/**