From 747e9c1d3a028befe9894f01a03a91106e3bd91f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 8 Jan 2015 10:00:38 +0100 Subject: [PATCH] Use Pager and Asynchronous execution for the f list command. --- .../factions/cmd/CmdFactionsList.java | 80 ++++++++++--------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java index 3643e555..df984f81 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java @@ -1,17 +1,22 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; import java.util.List; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; + import com.massivecraft.factions.FactionListComparator; +import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.pager.PagerSimple; +import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.util.Txt; - public class CmdFactionsList extends FactionsCommand { // -------------------------------------------- // @@ -37,46 +42,49 @@ public class CmdFactionsList extends FactionsCommand @Override public void perform() { - Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); + // Args + final Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); if (pageHumanBased == null) return; - // Create Messages - List lines = new ArrayList(); + // Create Pager + final List timings = FactionColl.get().getAll(null, FactionListComparator.get()); + final PagerSimple pager = new PagerSimple(timings, sender); - ArrayList factionList = new ArrayList(FactionColl.get().getAll(null, FactionListComparator.get())); - - final int pageheight = 9; - - int pagecount = (factionList.size() / pageheight) + 1; - if (pageHumanBased > pagecount) - pageHumanBased = pagecount; - else if (pageHumanBased < 1) - pageHumanBased = 1; - int start = (pageHumanBased - 1) * pageheight; - int end = start + pageheight; - if (end > factionList.size()) - end = factionList.size(); - - lines.add(Txt.titleize("Faction List "+pageHumanBased+"/"+pagecount)); - - for (Faction faction : factionList.subList(start, end)) + // NOTE: The faction list is quite slow and mostly thread safe. + // We run it asynchronously to spare the primary server thread. + final CommandSender sender = this.sender; + Bukkit.getScheduler().runTaskAsynchronously(Factions.get(), new Runnable() { - if (faction.isNone()) + @Override + public void run() { - lines.add(Txt.parse("Factionless %d online", FactionColl.get().getNone().getMPlayersWhereOnline(true).size())); - continue; + // Use Pager + List messages = pager.getPageTxt(pageHumanBased, "Faction List", new Stringifier() { + @Override + public String toString(Faction faction) + { + if (faction.isNone()) + { + return Txt.parse("Factionless %d online", FactionColl.get().getNone().getMPlayersWhereOnline(true).size()); + } + else + { + return Txt.parse("%s %d/%d online, %d/%d/%d", + faction.getName(msender), + faction.getMPlayersWhereOnline(true).size(), + faction.getMPlayers().size(), + faction.getLandCount(), + faction.getPowerRounded(), + faction.getPowerMaxRounded() + ); + } + } + }); + + // Send Messages + Mixin.messageOne(sender, messages); } - lines.add(Txt.parse("%s %d/%d online, %d/%d/%d", - faction.getName(msender), - faction.getMPlayersWhereOnline(true).size(), - faction.getMPlayers().size(), - faction.getLandCount(), - faction.getPowerRounded(), - faction.getPowerMaxRounded()) - ); - } - - sendMessage(lines); + }); } }