Redstoner/ModuleLoader
Archived
0
Fork 0
Code Pull Requests Activity

Fixed bug where module name would have a $# at the end. Made getCaller

Browse Source 
slightly more efficient.
This commit is contained in:
minenash 2018-03-11 17:29:31 -04:00
parent 6c4b9f3573
commit 6179b901b6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/redstoner/misc/Utils.java
View File

@ -23,6 +23,8 @@ public final class Utils
/** The Pattern for a UUID*/ /** The Pattern for a UUID*/
private static final Pattern UUID_pattern = Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"); private static final Pattern UUID_pattern = Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
private static final Pattern Class_pattern = Pattern.compile(".*\\.");
private static final Pattern NoDolarSign_pattern = Pattern.compile("\\$\\d*");
/** Hidden constructor. Do not instantiate UTILS classes! :) */ /** Hidden constructor. Do not instantiate UTILS classes! :) */
private Utils() private Utils()
@ -76,7 +78,7 @@ public final class Utils
String classname = "Utils"; String classname = "Utils";
for (int i = 0; classname.equals("Utils"); i++) for (int i = 0; classname.equals("Utils"); i++)
{ {
classname = stackTrace[i].getClassName().replaceAll(".*\\.", ""); classname = Class_pattern.matcher(stackTrace[i].getClassName()).replaceAll("");
} }
return classname; return classname;
} }
@ -94,8 +96,9 @@ public final class Utils
List<String> callers = Arrays.asList(directCaller); List<String> callers = Arrays.asList(directCaller);
for (int i = 0; callers.contains(classname) || classname.equals("Utils"); i++) for (int i = 0; callers.contains(classname) || classname.equals("Utils"); i++)
{ {
classname = stackTrace[i].getClassName().replaceAll(".*\\.", ""); classname = Class_pattern.matcher(stackTrace[i].getClassName()).replaceAll("");
} }
classname = NoDolarSign_pattern.matcher(classname).replaceAll("");
return classname; return classname;
} }