Upstream/UltimateModeration
1
0
Fork 0
mirror of https://github.com/songoda/UltimateModeration.git synced 2025-02-07 07:01:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix Pagination in Template GUI [SD-8499]

Browse Source
This commit is contained in:
Christian Koop 2021-09-25 13:51:38 +02:00
parent be8d660cb0
commit ae418a7a73
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
3 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1 +1 @@
ultimatemoderation # UltimateModeration

70
src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java
View File

@ -23,6 +23,8 @@ public class TemplateManagerGui extends Gui {
private PunishmentType punishmentType = PunishmentType.ALL; private PunishmentType punishmentType = PunishmentType.ALL;
private final Player player; private final Player player;
private int page = 1;
public TemplateManagerGui(UltimateModeration plugin, Player player) { public TemplateManagerGui(UltimateModeration plugin, Player player) {
super(6); super(6);
setDefaultItem(null); setDefaultItem(null);
@ -30,24 +32,35 @@ public class TemplateManagerGui extends Gui {
this.player = player; this.player = player;
setTitle(plugin.getLocale().getMessage("gui.templatemanager.title").getMessage()); setTitle(plugin.getLocale().getMessage("gui.templatemanager.title").getMessage());
showPage(); toCurrentPage();
} }
protected void showPage() { private void toPrevPage() {
if (inventory != null) if (this.page <= 1) {
return;
}
--this.page;
toCurrentPage();
}
private void toNextPage() {
if (findTemplates(this.page + 1, this.punishmentType).size() > 0) {
++this.page;
toCurrentPage();
}
}
private void toCurrentPage() {
if (inventory != null) {
inventory.clear(); inventory.clear();
}
setActionForRange(0, 53, null); setActionForRange(0, 53, null);
int numTemplates = plugin.getTemplateManager().getTemplates().size(); int numTemplates = plugin.getTemplateManager().getTemplates().size();
this.pages = (int) Math.floor(numTemplates / 28.0); this.pages = (int) Math.floor(numTemplates / 28.0);
List<Template> templates = plugin.getTemplateManager().getTemplates().stream().skip((page - 1) * 28).limit(28)
.collect(Collectors.toList());
setNextPage(0, 5, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage()));
setPrevPage(0, 1, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.back").getMessage()));
setOnPage((event) -> showPage());
// decorate the edges // decorate the edges
ItemStack glass2 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_2.getMaterial(CompatibleMaterial.BLUE_STAINED_GLASS_PANE)); ItemStack glass2 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_2.getMaterial(CompatibleMaterial.BLUE_STAINED_GLASS_PANE));
ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE));
@ -65,27 +78,30 @@ public class TemplateManagerGui extends Gui {
(event) -> { (event) -> {
this.punishmentType = punishmentType.nextFilter(); this.punishmentType = punishmentType.nextFilter();
this.page = 1; this.page = 1;
showPage(); toCurrentPage();
}); });
setButton(5, 4, GuiUtils.createButtonItem(CompatibleMaterial.OAK_DOOR, setButton(5, 4, GuiUtils.createButtonItem(CompatibleMaterial.OAK_DOOR,
plugin.getLocale().getMessage("gui.general.back").getMessage()), plugin.getLocale().getMessage("gui.general.back").getMessage()),
(event) -> guiManager.showGUI(event.player, new MainGui(plugin, event.player))); (event) -> guiManager.showGUI(event.player, new MainGui(plugin, event.player)));
if (player.hasPermission("um.templates.create")) if (player.hasPermission("um.templates.create")) {
setButton(5, 5, GuiUtils.createButtonItem(CompatibleMaterial.REDSTONE, setButton(5, 5, GuiUtils.createButtonItem(CompatibleMaterial.REDSTONE,
plugin.getLocale().getMessage("gui.templatemanager.create").getMessage()), plugin.getLocale().getMessage("gui.templatemanager.create").getMessage()),
(event) -> guiManager.showGUI(event.player, new PunishGui(plugin, null, null, player))); (event) -> guiManager.showGUI(event.player, new PunishGui(plugin, null, null, player)));
}
List<Template> templates = findTemplates(this.page, this.punishmentType);
if (punishmentType != PunishmentType.ALL)
templates.removeIf(template -> template.getPunishmentType() != punishmentType);
int num = 11; int num = 11;
for (Template template : templates) { for (Template template : templates) {
if (num == 16 || num == 36) if (num == 16 || num == 36) {
num = num + 2; num = num + 2;
}
setButton(num, GuiUtils.createButtonItem(CompatibleMaterial.MAP, TextUtils.formatText("&6&l" + template.getName()), setButton(num, GuiUtils.createButtonItem(CompatibleMaterial.MAP, TextUtils.formatText("&6&l" + template.getName()),
plugin.getLocale().getMessage("gui.templatemanager.leftclick").getMessage(), plugin.getLocale().getMessage("gui.templatemanager.leftclick").getMessage(),
plugin.getLocale().getMessage("gui.templatemanager.rightclick").getMessage()), plugin.getLocale().getMessage("gui.templatemanager.rightclick").getMessage()),
(event) -> { (event) -> {
if (event.clickType == ClickType.LEFT) { if (event.clickType == ClickType.LEFT) {
if (player.hasPermission("um.templates.edit")) if (player.hasPermission("um.templates.edit"))
@ -95,11 +111,23 @@ public class TemplateManagerGui extends Gui {
plugin.getTemplateManager().removeTemplate(template); plugin.getTemplateManager().removeTemplate(template);
plugin.getDataManager().deleteTemplate(template); plugin.getDataManager().deleteTemplate(template);
} }
showPage();
toCurrentPage();
} }
}); });
num++;
++num;
} }
setButton(0, 3, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.back").getMessage()), (event) -> toPrevPage());
setButton(0, 5, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage()), (event) -> toNextPage());
} }
private List<Template> findTemplates(int page, PunishmentType punishmentType) {
return plugin.getTemplateManager().getTemplates().stream()
.filter(template -> punishmentType == PunishmentType.ALL || template.getPunishmentType() == punishmentType)
.skip((page - 1) * 28L)
.limit(28)
.collect(Collectors.toList());
}
} }

2
src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java
View File

@ -20,6 +20,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
// FIXME: Pagination not working (probably in other GUIs too) (copy own one from TemplateManagerGui)
public class TicketManagerGui extends Gui { public class TicketManagerGui extends Gui {
private final UltimateModeration plugin; private final UltimateModeration plugin;
@ -142,7 +143,6 @@ public class TicketManagerGui extends Gui {
(event) -> guiManager.showGUI(player, new TicketGui(plugin, ticket, toModerate, player))); (event) -> guiManager.showGUI(player, new TicketGui(plugin, ticket, toModerate, player)));
num++; num++;
} }
} }
public static void createNew(Player player, OfflinePlayer toModerate) { public static void createNew(Player player, OfflinePlayer toModerate) {