Replace fastutil Int2ObjectOpenHashMap with hppc IntObjectHashMap

Closes https://github.com/LMBishop/Quests/issues/497 without significant plugin JAR file size change

2 files changed, 5 insertions, 5 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java
index 2c6a03ae..d7f4c199 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java
@@ -1,5 +1,6 @@
 package com.leonardobishop.quests.bukkit.menu;
 
+import com.google.common.primitives.Ints;
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.config.BukkitQuestsConfig;
 import com.leonardobishop.quests.bukkit.menu.element.*;
@@ -12,7 +13,6 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
 import java.util.List;
 
 public abstract class PaginatedQMenu extends QMenu {
@@ -106,7 +106,7 @@ public abstract class PaginatedQMenu extends QMenu {
         // this won't check if static elements overlap normal ones first but i don't care
         int maxSize = pageSize - (backMenuElement == null ? 0 : 9);
         BukkitQuestsConfig config = (BukkitQuestsConfig) plugin.getQuestsConfig();
-        if ((menuElements.isEmpty() ? 0 : Collections.max(menuElements.keySet())) + 1 > maxSize
+        if ((menuElements.isEmpty() ? 0 : Ints.max(menuElements.keys)) + 1 > maxSize
                 || menuElements.size() + menuElementsToFill.size() + customStaticElements > maxSize) {
             MenuElement pageNextMenuElement = new PageNextMenuElement(config, this);
             MenuElement pagePrevMenuElement = new PagePrevMenuElement(config, this);
@@ -151,7 +151,7 @@ public abstract class PaginatedQMenu extends QMenu {
         }
 
         this.minPage = 1;
-        this.maxPage = (menuElements.isEmpty() ? 0 : Collections.max(menuElements.keySet())) / pageSize + 1;
+        this.maxPage = (menuElements.isEmpty() ? 0 : Ints.max(menuElements.keys)) / pageSize + 1;
     }
 
     private void fillStaticMenuElements(int slot, MenuElement[] staticMenuElements) {
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QMenu.java
index 0c7a389c..4622538a 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QMenu.java
@@ -1,15 +1,15 @@
 package com.leonardobishop.quests.bukkit.menu;
 
+import com.carrotsearch.hppc.IntObjectHashMap;
 import com.leonardobishop.quests.bukkit.menu.element.MenuElement;
 import com.leonardobishop.quests.common.player.QPlayer;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class QMenu {
 
     protected final QPlayer owner;
-    protected final Int2ObjectOpenHashMap<MenuElement> menuElements = new Int2ObjectOpenHashMap<>();
+    protected final IntObjectHashMap<MenuElement> menuElements = new IntObjectHashMap<>();
 
     public QMenu(QPlayer owner) {
         this.owner = owner;