Several bugfixes & improvements to stats (#1461)

Signed-off-by: Pablo Herrera <[email protected]>
PGMDev · Dec 23, 2024 · 8808c28 · 8808c28
1 parent e50d824
commit 8808c28
Show file tree

Hide file tree

Showing 9 changed files with 193 additions and 284 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/ffa/Tribute.java b/core/src/main/java/tc/oc/pgm/ffa/Tribute.java
@@ -148,6 +148,11 @@ public Collection<MatchPlayer> getPlayers() {
     return this.players;
   }
 
+  @Nullable
+  public MatchPlayer getPlayer() {
+    return this.player;
+  }
+
   @Override
   public @Nullable MatchPlayer getPlayer(final UUID playerId) {
     return player != null && player.getId().equals(playerId) ? player : null;

diff --git a/core/src/main/java/tc/oc/pgm/menu/InventoryMenu.java b/core/src/main/java/tc/oc/pgm/menu/InventoryMenu.java
@@ -40,12 +40,11 @@ public InventoryMenu(
       Component title, int rows, MatchPlayer viewer, @Nullable SmartInventory parent) {
     this.viewer = viewer;
 
-    SmartInventory.Builder builder =
-        SmartInventory.builder()
-            .manager(PGM.get().getInventoryManager())
-            .title(translateLegacy(title, getBukkit()))
-            .size(rows, 9)
-            .provider(this);
+    SmartInventory.Builder builder = SmartInventory.builder()
+        .manager(PGM.get().getInventoryManager())
+        .title(translateLegacy(title, getBukkit()))
+        .size(rows, 9)
+        .provider(this);
 
     if (parent != null) {
       builder.parent(parent);
@@ -70,6 +69,10 @@ public SmartInventory getInventory() {
     return inventory;
   }
 
+  public int lastRow() {
+    return inventory.getRows() - 1;
+  }
+
   public void addBackButton(
       InventoryContents contents, Component parentMenuTitle, int row, int col) {
     Component back = translatable("menu.page.return", NamedTextColor.GRAY, parentMenuTitle);
@@ -78,18 +81,8 @@ public void addBackButton(
         row,
         col,
         ClickableItem.of(
-            new ItemBuilder()
-                .material(Material.BARRIER)
-                .name(translateLegacy(back, getBukkit()))
-                .build(),
-            c -> {
-              getInventory()
-                  .getParent()
-                  .ifPresent(
-                      parent -> {
-                        parent.open(getBukkit());
-                      });
-            }));
+            new ItemBuilder().material(Material.BARRIER).name(getBukkit(), back).build(),
+            c -> getInventory().getParent().ifPresent(parent -> parent.open(getBukkit()))));
   }
 
   @Override

diff --git a/core/src/main/java/tc/oc/pgm/menu/PagedInventoryMenu.java b/core/src/main/java/tc/oc/pgm/menu/PagedInventoryMenu.java
@@ -84,14 +84,18 @@ public void setupPageContents(Player player, InventoryContents contents) {
    *
    * @return a {@link SlotPos} where previous page button will be located.
    */
-  public abstract SlotPos getPreviousPageSlot();
+  public SlotPos getPreviousPageSlot() {
+    return SlotPos.of(lastRow(), 0);
+  }
 
   /**
    * The position of the next page button.
    *
    * @return a {@link SlotPos} where next page button will be located.
    */
-  public abstract SlotPos getNextPageSlot();
+  public SlotPos getNextPageSlot() {
+    return SlotPos.of(lastRow(), 8);
+  }
 
   /**
    * The position of the no page contents button, only displayed when page contents is empty or
@@ -112,8 +116,10 @@ public void setupPageContents(Player player, InventoryContents contents) {
 
   protected ClickableItem getEmptyContentsButton(Player viewer) {
     Component name = translatable("menu.page.empty", NamedTextColor.DARK_RED, TextDecoration.BOLD);
-    return ClickableItem.empty(
-        new ItemBuilder().material(Material.BARRIER).name(translateLegacy(name, viewer)).build());
+    return ClickableItem.empty(new ItemBuilder()
+        .material(Material.BARRIER)
+        .name(translateLegacy(name, viewer))
+        .build());
   }
 
   protected ClickableItem getPageItem(Player player, int page, String key) {