Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move comparators to own file and clean up listing code. #4122

Merged
merged 1 commit into from
Jun 29, 2020
Merged

Move comparators to own file and clean up listing code. #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 11 additions & 42 deletions src/com/palmergames/bukkit/towny/command/TownCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownBlockOwner;
import com.palmergames.bukkit.towny.object.TownBlockType;
import com.palmergames.bukkit.towny.object.TownComparators;
import com.palmergames.bukkit.towny.object.TownyObject;
import com.palmergames.bukkit.towny.object.TownyPermission;
import com.palmergames.bukkit.towny.object.TownyPermissionChange;
import com.palmergames.bukkit.towny.object.TownyWorld;
Expand Down Expand Up @@ -186,21 +188,6 @@ public class TownCommand extends BaseCommand implements CommandExecutor, TabComp
"deny"
);

private static final Comparator<Town> BY_NUM_RESIDENTS = (t1, t2) -> t2.getNumResidents() - t1.getNumResidents();
private static final Comparator<Town> BY_OPEN = (t1, t2) -> t2.getNumResidents() - t1.getNumResidents();
private static final Comparator<Town> BY_NAME = (t1, t2) -> t1.getName().compareTo(t2.getName());
private static final Comparator<Town> BY_BANK_BALANCE = (t1, t2) -> {
try {
return Double.compare(t2.getAccount().getHoldingBalance(), t1.getAccount().getHoldingBalance());
} catch (EconomyException e) {
throw new RuntimeException("Failed to get balance. Aborting.");
}
};
private static final Comparator<Town> BY_TOWNBLOCKS_CLAIMED = (t1, t2) -> {
return Double.compare(t2.getTownBlocks().size(), t1.getTownBlocks().size());
};
private static final Comparator<Town> BY_NUM_ONLINE = (t1, t2) -> TownyAPI.getInstance().getOnlinePlayers(t2).size() - TownyAPI.getInstance().getOnlinePlayers(t1).size();

static {
output.add(ChatTools.formatTitle("/town"));
output.add(ChatTools.formatCommand("", "/town", "", TownySettings.getLangString("town_help_1")));
Expand Down Expand Up @@ -1267,7 +1254,7 @@ public void listTowns(CommandSender sender, String[] split) throws TownyExceptio
int page = 1;
boolean pageSet = false;
boolean comparatorSet = false;
Comparator<Town> comparator = BY_NUM_RESIDENTS;
Comparator<Town> comparator = TownComparators.BY_NUM_RESIDENTS;
int total = (int) Math.ceil(((double) townsToSort.size()) / ((double) 10));
for (int i = 1; i < split.length; i++) {
if (split[i].equalsIgnoreCase("by")) {
Expand All @@ -1277,32 +1264,31 @@ public void listTowns(CommandSender sender, String[] split) throws TownyExceptio
}
i++;
if (i < split.length) {
comparatorSet = true;

if (split[i].equalsIgnoreCase("residents") || split[i].equalsIgnoreCase("resident")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_RESIDENTS.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_NUM_RESIDENTS;
comparator = TownComparators.BY_NUM_RESIDENTS;
} else if (split[i].equalsIgnoreCase("balance")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_BALANCE.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_BANK_BALANCE;
comparator = TownComparators.BY_BANK_BALANCE;
} else if (split[i].equalsIgnoreCase("name")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_NAME.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_NAME;
comparator = TownComparators.BY_NAME;
} else if (split[i].equalsIgnoreCase("townblocks")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_TOWNBLOCKS.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_TOWNBLOCKS_CLAIMED;
comparator = TownComparators.BY_TOWNBLOCKS_CLAIMED;
} else if (split[i].equalsIgnoreCase("online")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_ONLINE.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_NUM_ONLINE;
comparator = TownComparators.BY_NUM_ONLINE;
} else if (split[i].equalsIgnoreCase("open")) {
if (!console && !townyUniverse.getPermissionSource().testPermission(player, PermissionNodes.TOWNY_COMMAND_TOWN_LIST_OPEN.getNode()))
throw new TownyException(TownySettings.getLangString("msg_err_command_disable"));
comparator = BY_OPEN;
comparator = TownComparators.BY_OPEN;
} else {
TownyMessaging.sendErrorMsg(sender, TownySettings.getLangString("msg_error_invalid_comparator_town"));
return;
Expand Down Expand Up @@ -1336,45 +1322,28 @@ public void listTowns(CommandSender sender, String[] split) throws TownyExceptio
}
}
}
if (comparator == BY_OPEN) {
List<Town> townsList = TownyUniverse.getInstance().getDataSource().getTowns();
List<Town> openTownsList = new ArrayList<>();
for (Town town : townsList) {
if (town.isOpen())
openTownsList.add(town);
}
if (!openTownsList.isEmpty()) {
townsToSort = openTownsList;
total = (int) Math.ceil(((double) townsToSort.size()) / ((double) 10));
} else {
TownyMessaging.sendErrorMsg(sender, TownySettings.getLangString("no_open_towns"));
return;
}
}

if (page > total) {
TownyMessaging.sendErrorMsg(sender, TownySettings.getListNotEnoughPagesMsg(total));
return;
}

final List<Town> towns = townsToSort;
final Comparator comp = comparator;
final Comparator<Town> comp = comparator;
final int pageNumber = page;
final int totalNumber = total;
try {
if (!TownySettings.isTownListRandom()) {
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
Collections.sort(towns, comp);
towns.sort(comp);
sendList(sender, towns, pageNumber, totalNumber);
return;
});
} else {
Collections.shuffle(towns);
sendList(sender, towns, pageNumber, totalNumber);
}
} catch (RuntimeException e) {
TownyMessaging.sendErrorMsg(sender, TownySettings.getLangString("msg_error_comparator_failed"));
return;
}
}

Expand Down
37 changes: 37 additions & 0 deletions src/com/palmergames/bukkit/towny/object/TownComparators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.palmergames.bukkit.towny.object;

import com.palmergames.bukkit.towny.TownyAPI;
import com.palmergames.bukkit.towny.exceptions.EconomyException;

import java.util.Comparator;

public class TownComparators {
public static final Comparator<Town> BY_NUM_RESIDENTS = (t1, t2) -> t2.getNumResidents() - t1.getNumResidents();
public static final Comparator<Town> BY_OPEN = (t1, t2) -> {

// Both are open, fallback to population comparison.
if (t1.isOpen() && t2.isOpen()) {
return t2.getNumResidents() - t1.getNumResidents();
}

// Less than.
if (t2.isOpen()) {
return 1;
} else {
// Greater than.
return -1;
}
};
public static final Comparator<Town> BY_NAME = Comparator.comparing(TownyObject::getName);
public static final Comparator<Town> BY_BANK_BALANCE = (t1, t2) -> {
try {
return Double.compare(t2.getAccount().getHoldingBalance(), t1.getAccount().getHoldingBalance());
} catch (EconomyException e) {
throw new RuntimeException("Failed to get balance. Aborting.");
}
};

public static final Comparator<Town> BY_TOWNBLOCKS_CLAIMED = (t1, t2) -> Double.compare(t2.getTownBlocks().size(), t1.getTownBlocks().size());
public static final Comparator<Town> BY_NUM_ONLINE = (t1, t2) -> TownyAPI.getInstance().getOnlinePlayers(t2).size() - TownyAPI.getInstance().getOnlinePlayers(t1).size();

}