SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort flagwatchers with a more reliable method

Browse Source
This commit is contained in:
libraryaddict 2020-02-25 23:56:34 +13:00
parent 3db1f06402
commit 8506fc087a
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java
View File

@ -13,10 +13,7 @@ import org.bukkit.Sound;
import java.io.File; import java.io.File;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Random;
/** /**
* Created by libraryaddict on 13/02/2020. * Created by libraryaddict on 13/02/2020.
@ -64,15 +61,37 @@ public class CompileMethods {
} }
} }
private static void addClass(ArrayList<Class> classes, Class c) {
if (classes.contains(c)) {
return;
}
System.out.println("Now processing " + c.getName());
if (c != FlagWatcher.class) {
addClass(classes, c.getSuperclass());
int ind = classes.indexOf(c.getSuperclass());
classes.add(ind + 1, c);
} else {
classes.add(0, c);
}
}
private static void doMethods() { private static void doMethods() {
ArrayList<Class<?>> classes = ClassGetter ArrayList<Class<?>> classes = ClassGetter
.getClassesForPackage(FlagWatcher.class, "me.libraryaddict.disguise.disguisetypes.watchers"); .getClassesForPackage(FlagWatcher.class, "me.libraryaddict.disguise.disguisetypes.watchers");
classes.add(FlagWatcher.class); classes.add(FlagWatcher.class);
classes.sort((c1, c2) -> c1.isAssignableFrom(c2) ? -1 : 1);
ArrayList<Class> sorted = new ArrayList<>();
for (Class c : classes) {
addClass(sorted, c);
}
ArrayList<String> methods = new ArrayList<>(); ArrayList<String> methods = new ArrayList<>();
for (Class c : classes) { for (Class c : sorted) {
for (Method method : c.getMethods()) { for (Method method : c.getMethods()) {
if (!FlagWatcher.class.isAssignableFrom(method.getDeclaringClass())) { if (!FlagWatcher.class.isAssignableFrom(method.getDeclaringClass())) {
continue; continue;