Skip to content

Commit 3399495

Browse files
BenCodezBenCodez
committed
Code cleanup
1 parent 6fddd73 commit 3399495

27 files changed

+579
-583
lines changed

‎SimpleAPI/src/main/java/com/bencodez/simpleapi/array/ArrayUtils.java‎

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static String[] colorize(String[] list) {
8181
* @return the array list
8282
*/
8383
public static ArrayList<String> comptoString(ArrayList<TextComponent> comps) {
84-
ArrayList<String> txt = new ArrayList<String>();
84+
ArrayList<String> txt = new ArrayList<>();
8585
for (TextComponent comp : comps) {
8686
txt.add(MessageAPI.compToString(comp));
8787
}
@@ -146,41 +146,15 @@ public static String[] convert(ArrayList<String> list) {
146146

147147
}
148148

149-
public static ItemStack[] convertItems(List<Item> list) {
150-
if (list == null) {
151-
return null;
152-
}
153-
ItemStack[] string = new ItemStack[list.size()];
154-
for (int i = 0; i < list.size(); i++) {
155-
string[i] = list.get(i).getItemStack();
156-
}
157-
return string;
158-
159-
}
160-
161-
public static ItemStack[] convertItems(Collection<ItemStack> list) {
162-
if (list == null) {
163-
return null;
164-
}
165-
ItemStack[] string = new ItemStack[list.size()];
166-
int i = 0;
167-
for (ItemStack item : list) {
168-
string[i] = item;
169-
i++;
170-
}
171-
return string;
172-
173-
}
174-
175149
/**
176150
* Convert.
177151
*
178152
* @param set1 the set
179153
* @return the array list
180154
*/
181155
public static ArrayList<String> convert(Set<String> set1) {
182-
Set<String> set = new HashSet<String>(set1);
183-
ArrayList<String> list = new ArrayList<String>();
156+
Set<String> set = new HashSet<>(set1);
157+
ArrayList<String> list = new ArrayList<>();
184158
for (String st : set) {
185159
list.add(st);
186160
}
@@ -198,15 +172,14 @@ public static ArrayList<String> convert(String[] list) {
198172
if (list == null) {
199173
return null;
200174
}
201-
ArrayList<String> newlist = new ArrayList<String>();
175+
ArrayList<String> newlist = new ArrayList<>();
202176
for (String element : list) {
203177
newlist.add(element);
204178
}
205179
if (newlist == null) {
206180
return null;
207-
} else {
208-
return newlist;
209181
}
182+
return newlist;
210183
}
211184

212185
public static BaseComponent[] convertBaseComponent(ArrayList<BaseComponent> list) {
@@ -224,13 +197,39 @@ public static ArrayList<BaseComponent> convertBaseComponent(BaseComponent[] list
224197
if (list == null) {
225198
return null;
226199
}
227-
ArrayList<BaseComponent> newlist = new ArrayList<BaseComponent>();
200+
ArrayList<BaseComponent> newlist = new ArrayList<>();
228201
for (BaseComponent element : list) {
229202
newlist.add(element);
230203
}
231204
return newlist;
232205
}
233206

207+
public static ItemStack[] convertItems(Collection<ItemStack> list) {
208+
if (list == null) {
209+
return null;
210+
}
211+
ItemStack[] string = new ItemStack[list.size()];
212+
int i = 0;
213+
for (ItemStack item : list) {
214+
string[i] = item;
215+
i++;
216+
}
217+
return string;
218+
219+
}
220+
221+
public static ItemStack[] convertItems(List<Item> list) {
222+
if (list == null) {
223+
return null;
224+
}
225+
ItemStack[] string = new ItemStack[list.size()];
226+
for (int i = 0; i < list.size(); i++) {
227+
string[i] = list.get(i).getItemStack();
228+
}
229+
return string;
230+
231+
}
232+
234233
/**
235234
* Sets the to array.
236235
*
@@ -247,9 +246,23 @@ public static String[] convertSet(Set<String> set) {
247246
}
248247
if (array == null) {
249248
return null;
250-
} else {
251-
return array;
252249
}
250+
return array;
251+
}
252+
253+
public static HashMap<String, String> fromString(String str) {
254+
HashMap<String, String> map = new HashMap<>();
255+
if (!str.equals("")) {
256+
for (String entry : str.split("%entry%")) {
257+
String[] values = entry.split("%pair%");
258+
if (values.length > 1) {
259+
String key = values[0];
260+
String value = values[1];
261+
map.put(key, value);
262+
}
263+
}
264+
}
265+
return map;
253266
}
254267

255268
public static String makeString(HashMap<String, String> placeholders) {
@@ -267,21 +280,6 @@ public static String makeString(HashMap<String, String> placeholders) {
267280
return str;
268281
}
269282

270-
public static HashMap<String, String> fromString(String str) {
271-
HashMap<String, String> map = new HashMap<String, String>();
272-
if (!str.equals("")) {
273-
for (String entry : str.split("%entry%")) {
274-
String[] values = entry.split("%pair%");
275-
if (values.length > 1) {
276-
String key = values[0];
277-
String value = values[1];
278-
map.put(key, value);
279-
}
280-
}
281-
}
282-
return map;
283-
}
284-
285283
/**
286284
* Make string.
287285
*
@@ -341,7 +339,7 @@ public static String pickRandom(ArrayList<String> list) {
341339
* @return the array list
342340
*/
343341
public static ArrayList<String> removeDuplicates(ArrayList<String> list) {
344-
Set<String> set = new HashSet<String>();
342+
Set<String> set = new HashSet<>();
345343
set.addAll(list);
346344
list.clear();
347345
list.addAll(set);
@@ -378,7 +376,7 @@ public static List<String> replace(List<String> list, String toReplace, String r
378376
* @return the array list
379377
*/
380378
public static ArrayList<String> replaceIgnoreCase(ArrayList<String> list, String toReplace, String replaceWith) {
381-
ArrayList<String> newList = new ArrayList<String>();
379+
ArrayList<String> newList = new ArrayList<>();
382380
for (String msg : list) {
383381
newList.add(MessageAPI.replaceIgnoreCase(msg, toReplace, replaceWith));
384382
}
@@ -392,23 +390,21 @@ public static ArrayList<String> sort(ArrayList<String> list) {
392390

393391
public static HashMap<String, Integer> sortByValuesStr(HashMap<String, Integer> unsortMap, final boolean order) {
394392

395-
List<Entry<String, Integer>> list = new LinkedList<Entry<String, Integer>>(unsortMap.entrySet());
393+
List<Entry<String, Integer>> list = new LinkedList<>(unsortMap.entrySet());
396394

397395
// Sorting the list based on values
398396
Collections.sort(list, new Comparator<Entry<String, Integer>>() {
399397
@Override
400398
public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
401399
if (order) {
402400
return o1.getValue().compareTo(o2.getValue());
403-
} else {
404-
return o2.getValue().compareTo(o1.getValue());
405-
406401
}
402+
return o2.getValue().compareTo(o1.getValue());
407403
}
408404
});
409405

410406
// Maintaining insertion order with the help of LinkedList
411-
HashMap<String, Integer> sortedMap = new LinkedHashMap<String, Integer>();
407+
HashMap<String, Integer> sortedMap = new LinkedHashMap<>();
412408
for (Entry<String, Integer> entry : list) {
413409
sortedMap.put(entry.getKey(), entry.getValue());
414410
}
@@ -418,10 +414,10 @@ public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
418414

419415
public static LinkedHashMap<String, ItemStack> sortByValuesStrItem(HashMap<String, ItemStack> unsortMap) {
420416

421-
ArrayList<String> sortedKeys = sort(new ArrayList<String>(unsortMap.keySet()));
417+
ArrayList<String> sortedKeys = sort(new ArrayList<>(unsortMap.keySet()));
422418

423419
// Maintaining insertion order with the help of LinkedList
424-
LinkedHashMap<String, ItemStack> sortedMap = new LinkedHashMap<String, ItemStack>();
420+
LinkedHashMap<String, ItemStack> sortedMap = new LinkedHashMap<>();
425421
for (String key : sortedKeys) {
426422
sortedMap.put(key, unsortMap.get(key));
427423
}

‎SimpleAPI/src/main/java/com/bencodez/simpleapi/command/CommandHandler.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,15 @@ public boolean argsMatch(String arg, int i) {
191191
}
192192
}
193193
return false;
194-
} else if (args[args.length - 1].equalsIgnoreCase("(list)")) {
194+
}
195+
if (args[args.length - 1].equalsIgnoreCase("(list)")) {
195196
return true;
196197
}
197198
return false;
198199
}
199200

201+
public abstract void debug(String debug);
202+
200203
/**
201204
* Execute.
202205
*
@@ -205,6 +208,12 @@ public boolean argsMatch(String arg, int i) {
205208
*/
206209
public abstract void execute(CommandSender sender, String[] args);
207210

211+
public abstract String formatNoPerms();
212+
213+
public abstract String formatNotNumber();
214+
215+
public abstract BukkitScheduler getBukkitScheduler();
216+
208217
public abstract String getHelpLine();
209218

210219
/**
@@ -258,24 +267,6 @@ public TextComponent getHelpLine(String command, String line, ChatColor hoverCol
258267
return txt;
259268
}
260269

261-
public void sendMessageJson(CommandSender sender, ArrayList<TextComponent> comp) {
262-
if (isPlayer(sender)) {
263-
Player player = (Player) sender;
264-
MessageAPI.sendJson(player, comp);
265-
} else {
266-
sender.sendMessage(ArrayUtils.convert(ArrayUtils.comptoString(comp)));
267-
}
268-
}
269-
270-
public void sendMessageJson(CommandSender sender, TextComponent comp) {
271-
if (isPlayer(sender)) {
272-
Player player = (Player) sender;
273-
MessageAPI.sendJson(player, comp);
274-
} else {
275-
sender.sendMessage(MessageAPI.compToString(comp));
276-
}
277-
}
278-
279270
/**
280271
* Gets the help line command.
281272
*
@@ -309,7 +300,7 @@ public String getHelpLineCommand(String command) {
309300

310301
public ArrayList<String> getTabCompleteOptions(CommandSender sender, String[] args, int argNum,
311302
ConcurrentHashMap<String, ArrayList<String>> tabCompleteOptions) {
312-
Set<String> cmds = new HashSet<String>();
303+
Set<String> cmds = new HashSet<>();
313304
if (hasPerm(sender)) {
314305
CommandHandler commandHandler = this;
315306

@@ -368,9 +359,8 @@ public boolean hasPerm(CommandSender sender) {
368359
}
369360
if (allowMultiplePermissions) {
370361
return PlayerUtils.hasEitherPermission(sender, getPerm());
371-
} else {
372-
return sender.hasPermission(getPerm().split(Pattern.quote("|"))[0]);
373362
}
363+
return sender.hasPermission(getPerm().split(Pattern.quote("|"))[0]);
374364
}
375365

376366
public CommandHandler ignoreNumberCheck() {
@@ -405,12 +395,6 @@ public int parseInt(String arg) {
405395
return Integer.parseInt(arg);
406396
}
407397

408-
public abstract void debug(String debug);
409-
410-
public abstract String formatNotNumber();
411-
412-
public abstract String formatNoPerms();
413-
414398
/**
415399
* Run command.
416400
*
@@ -497,8 +481,6 @@ public void run() {
497481
return false;
498482
}
499483

500-
public abstract BukkitScheduler getBukkitScheduler();
501-
502484
public void sendMessage(CommandSender sender, ArrayList<String> msg) {
503485
sender.sendMessage(ArrayUtils.convert(ArrayUtils.colorize(msg)));
504486
}
@@ -507,6 +489,24 @@ public void sendMessage(CommandSender sender, String msg) {
507489
sender.sendMessage(MessageAPI.colorize(msg));
508490
}
509491

492+
public void sendMessageJson(CommandSender sender, ArrayList<TextComponent> comp) {
493+
if (isPlayer(sender)) {
494+
Player player = (Player) sender;
495+
MessageAPI.sendJson(player, comp);
496+
} else {
497+
sender.sendMessage(ArrayUtils.convert(ArrayUtils.comptoString(comp)));
498+
}
499+
}
500+
501+
public void sendMessageJson(CommandSender sender, TextComponent comp) {
502+
if (isPlayer(sender)) {
503+
Player player = (Player) sender;
504+
MessageAPI.sendJson(player, comp);
505+
} else {
506+
sender.sendMessage(MessageAPI.compToString(comp));
507+
}
508+
}
509+
510510
public CommandHandler withArgs(String... args) {
511511
this.args = args;
512512
return this;

‎SimpleAPI/src/main/java/com/bencodez/simpleapi/command/PlayerCommandHandler.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
public abstract class PlayerCommandHandler extends CommandHandler {
77

8+
private int playerArg = -1;
9+
810
public PlayerCommandHandler(JavaPlugin plugin) {
911
super(plugin);
1012
figureOutPlayerArg();
@@ -26,24 +28,12 @@ public PlayerCommandHandler(JavaPlugin plugin, String[] args, String perm, Strin
2628
figureOutPlayerArg();
2729
}
2830

29-
public PlayerCommandHandler(JavaPlugin plugin, String[] args, String perm, String helpMessage,
30-
boolean allowConsole, boolean forceConsole) {
31+
public PlayerCommandHandler(JavaPlugin plugin, String[] args, String perm, String helpMessage, boolean allowConsole,
32+
boolean forceConsole) {
3133
super(plugin, args, perm, helpMessage, allowConsole);
3234
figureOutPlayerArg();
3335
}
3436

35-
private int playerArg = -1;
36-
37-
private void figureOutPlayerArg() {
38-
for (int i = 0; i < getArgs().length; i++) {
39-
if (getArgs()[i].equalsIgnoreCase("(player)")) {
40-
playerArg = i;
41-
return;
42-
}
43-
}
44-
debug("Failed to figure out player arg number for: " + getArgs());
45-
}
46-
4737
@Override
4838
public void execute(CommandSender sender, String[] args) {
4939
if (playerArg >= 0) {
@@ -54,10 +44,20 @@ public void execute(CommandSender sender, String[] args) {
5444
executeSinglePlayer(sender, args);
5545
}
5646

57-
public abstract void executeSinglePlayer(CommandSender sender, String[] args);
58-
5947
public abstract void executeAll(CommandSender sender, String[] args);
6048

49+
public abstract void executeSinglePlayer(CommandSender sender, String[] args);
50+
51+
private void figureOutPlayerArg() {
52+
for (int i = 0; i < getArgs().length; i++) {
53+
if (getArgs()[i].equalsIgnoreCase("(player)")) {
54+
playerArg = i;
55+
return;
56+
}
57+
}
58+
debug("Failed to figure out player arg number for: " + getArgs());
59+
}
60+
6161
@Override
6262
public void setArgs(String[] args) {
6363
super.setArgs(args);

0 commit comments

Comments
 (0)