Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-06 16:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Update JobsCommands.java

Browse Source
This commit is contained in:
montlikadani 2018-08-16 17:39:26 +02:00 committed by GitHub
parent 1ae362031e
commit e6b32bace2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
View File

@ -42,8 +42,8 @@ import com.gamingmesh.jobs.stuff.RawMessage;
public class JobsCommands implements CommandExecutor { public class JobsCommands implements CommandExecutor {
private static final String label = "jobs"; private static final String label = "jobs";
private static final String packagePath = "com.gamingmesh.jobs.commands.list"; private static final String packagePath = "com.gamingmesh.jobs.commands.list";
private static final List<String> hidenCommands = new ArrayList<String>(); private static final List<String> hidenCommands = new ArrayList<>();
Map<String, Integer> CommandList = new HashMap<String, Integer>(); Map<String, Integer> CommandList = new HashMap<>();
protected Jobs plugin; protected Jobs plugin;
@ -109,10 +109,6 @@ public class JobsCommands implements CommandExecutor {
} }
} }
// if (cmdClass == null) {
// return help(sender, 1);
// }
boolean back = cmdClass.perform(plugin, sender, myArgs); boolean back = cmdClass.perform(plugin, sender, myArgs);
if (back) if (back)
return true; return true;
@ -184,7 +180,7 @@ public class JobsCommands implements CommandExecutor {
} }
private static List<String> getClassesFromPackage(String pckgname) throws ClassNotFoundException { private static List<String> getClassesFromPackage(String pckgname) throws ClassNotFoundException {
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<>();
try { try {
for (URL jarURL : ((URLClassLoader) Jobs.class.getClassLoader()).getURLs()) { for (URL jarURL : ((URLClassLoader) Jobs.class.getClassLoader()).getURLs()) {
try { try {
@ -201,7 +197,7 @@ public class JobsCommands implements CommandExecutor {
private static List<String> getClassesInSamePackageFromJar(String packageName, String jarPath) { private static List<String> getClassesInSamePackageFromJar(String packageName, String jarPath) {
JarFile jarFile = null; JarFile jarFile = null;
List<String> listOfCommands = new ArrayList<String>(); List<String> listOfCommands = new ArrayList<>();
try { try {
jarFile = new JarFile(jarPath); jarFile = new JarFile(jarPath);
Enumeration<JarEntry> en = jarFile.entries(); Enumeration<JarEntry> en = jarFile.entries();
@ -228,7 +224,7 @@ public class JobsCommands implements CommandExecutor {
} }
public Map<String, Integer> GetCommands(CommandSender sender) { public Map<String, Integer> GetCommands(CommandSender sender) {
Map<String, Integer> temp = new HashMap<String, Integer>(); Map<String, Integer> temp = new HashMap<>();
for (Entry<String, Integer> cmd : CommandList.entrySet()) { for (Entry<String, Integer> cmd : CommandList.entrySet()) {
if (!hasCommandPermission(sender, cmd.getKey())) if (!hasCommandPermission(sender, cmd.getKey()))
continue; continue;
@ -239,7 +235,7 @@ public class JobsCommands implements CommandExecutor {
public void fillCommands() { public void fillCommands() {
List<String> lm = new ArrayList<String>(); List<String> lm = new ArrayList<String>();
HashMap<String, Class<?>> classes = new HashMap<String, Class<?>>(); HashMap<String, Class<?>> classes = new HashMap<>();
try { try {
lm = getClassesFromPackage(packagePath); lm = getClassesFromPackage(packagePath);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
@ -289,14 +285,14 @@ public class JobsCommands implements CommandExecutor {
} }
private static Map<String, Integer> sort(Map<String, Integer> unsortMap) { private static Map<String, Integer> sort(Map<String, Integer> unsortMap) {
List<Map.Entry<String, Integer>> list = new LinkedList<Map.Entry<String, Integer>>(unsortMap.entrySet()); List<Map.Entry<String, Integer>> list = new LinkedList<>(unsortMap.entrySet());
Collections.sort(list, new Comparator<Map.Entry<String, Integer>>() { Collections.sort(list, new Comparator<Map.Entry<String, Integer>>() {
@Override @Override
public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) { public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
return (o1.getValue()).compareTo(o2.getValue()); return (o1.getValue()).compareTo(o2.getValue());
} }
}); });
Map<String, Integer> sortedMap = new LinkedHashMap<String, Integer>(); Map<String, Integer> sortedMap = new LinkedHashMap<>();
for (Iterator<Map.Entry<String, Integer>> it = list.iterator(); it.hasNext();) { for (Iterator<Map.Entry<String, Integer>> it = list.iterator(); it.hasNext();) {
Map.Entry<String, Integer> entry = it.next(); Map.Entry<String, Integer> entry = it.next();
sortedMap.put(entry.getKey(), entry.getValue()); sortedMap.put(entry.getKey(), entry.getValue());
@ -351,7 +347,7 @@ public class JobsCommands implements CommandExecutor {
type = type.toLowerCase(); type = type.toLowerCase();
} }
List<String> message = new ArrayList<String>(); List<String> message = new ArrayList<>();
int showAllTypes = 1; int showAllTypes = 1;
for (ActionType actionType : ActionType.values()) { for (ActionType actionType : ActionType.values()) {