Added missing access modifiers.
Fixed a bug in PagedGUI that could result in showing an empty page.
This commit is contained in:
NichtStudioCode 2021-01-20 22:48:41 +01:00
parent 1d08e06d5c
commit b5ccbd6f4d
3 changed files with 17 additions and 10 deletions

@ -63,12 +63,19 @@ public abstract class PagedGUI extends BaseGUI {
} }
private void updatePageContent() { private void updatePageContent() {
if (getCurrentPage() < getPageAmount()) {
List<SlotElement> slotElements = getPageItems(currentPage); List<SlotElement> slotElements = getPageItems(currentPage);
for (int i = 0; i < itemListSlots.length; i++) { for (int i = 0; i < itemListSlots.length; i++) {
if (slotElements.size() > i) setSlotElement(itemListSlots[i], slotElements.get(i)); if (slotElements.size() > i) setSlotElement(itemListSlots[i], slotElements.get(i));
else remove(itemListSlots[i]); else remove(itemListSlots[i]);
} }
} else setCurrentPage(getPageAmount() - 1);
}
private void setCurrentPage(int page) {
currentPage = page;
update();
} }
public int getCurrentPage() { public int getCurrentPage() {
@ -91,7 +98,7 @@ public abstract class PagedGUI extends BaseGUI {
return itemListSlots; return itemListSlots;
} }
abstract int getPageAmount(); protected abstract int getPageAmount();
abstract List<SlotElement> getPageItems(int page); abstract List<SlotElement> getPageItems(int page);

@ -23,12 +23,12 @@ public class SimplePagedGUIs extends PagedGUI {
} }
@Override @Override
int getPageAmount() { protected int getPageAmount() {
return guis.size(); return guis.size();
} }
@Override @Override
List<SlotElement> getPageItems(int page) { protected List<SlotElement> getPageItems(int page) {
return Arrays.asList(guis.get(page).getSlotElements()); return Arrays.asList(guis.get(page).getSlotElements());
} }

@ -27,7 +27,7 @@ public class SimplePagedItemsGUI extends PagedGUI {
} }
@Override @Override
List<SlotElement> getPageItems(int page) { protected List<SlotElement> getPageItems(int page) {
int length = getItemListSlots().length; int length = getItemListSlots().length;
int from = page * length; int from = page * length;
int to = Math.min(from + length, items.size()); int to = Math.min(from + length, items.size());