revamp MultiPageGui, fix KitItemListener & BountyHuntersHook

Realizedd · Realizedd · commit f3f77ba89778 · 2018-09-02T00:17:14.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
     group 'me.realized'
-    version '3.2.0'
+    version '3.2.1-SNAPSHOT'
 }
 
 subprojects {
diff --git a/duels-api/build.gradle b/duels-api/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     compile 'com.google.code.findbugs:jsr305:3.0.2'
-    compile 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT'
+    compile 'org.spigotmc:spigot-api:1.13.1-R0.1-SNAPSHOT'
 }
 
 shadowJar {
diff --git a/duels-plugin/src/main/java/me/realized/duels/extra/KitItemListener.java b/duels-plugin/src/main/java/me/realized/duels/extra/KitItemListener.java
@@ -9,6 +9,7 @@
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -29,7 +30,7 @@ public KitItemListener(final DuelsPlugin plugin) {
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void on(final InventoryClickEvent event) {
         final Player player = (Player) event.getWhoClicked();
 
@@ -39,7 +40,7 @@ public void on(final InventoryClickEvent event) {
 
         final Inventory clicked = event.getClickedInventory();
 
-        if (clicked == null || !(clicked instanceof PlayerInventory)) {
+        if (!(clicked instanceof PlayerInventory)) {
             return;
         }
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/hook/hooks/BountyHuntersHook.java b/duels-plugin/src/main/java/me/realized/duels/hook/hooks/BountyHuntersHook.java
@@ -2,29 +2,38 @@
 
 import me.realized.duels.DuelsPlugin;
 import me.realized.duels.arena.ArenaManager;
+import me.realized.duels.config.Config;
 import me.realized.duels.util.hook.PluginHook;
-import net.Indyuce.bh.api.BountyClaimEvent;
-import net.Indyuce.bh.api.BountyCreateEvent;
-import net.Indyuce.bh.resource.BountyCause;
+import net.Indyuce.bountyhunters.api.BountyCause;
+import net.Indyuce.bountyhunters.api.event.BountyClaimEvent;
+import net.Indyuce.bountyhunters.api.event.BountyCreateEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 public class BountyHuntersHook extends PluginHook<DuelsPlugin> implements Listener {
 
+    private final Config config;
     private final ArenaManager arenaManager;
 
     public BountyHuntersHook(final DuelsPlugin plugin) {
         super(plugin, "BountyHunters");
+        this.config = plugin.getConfiguration();
         this.arenaManager = plugin.getArenaManager();
 
-        if (plugin.getConfiguration().isPreventBountyLoss()) {
-            plugin.getServer().getPluginManager().registerEvents(this, plugin);
+        try {
+            Class.forName("net.Indyuce.bountyhunters.api.event.BountyClaimEvent");
+            Class.forName("net.Indyuce.bountyhunters.api.event.BountyCreateEvent");
+            Class.forName("net.Indyuce.bountyhunters.api.BountyCause");
+        } catch (ClassNotFoundException ex) {
+            throw new RuntimeException("This version of " + getName() + " is not supported. Please try upgrading to the latest version.");
         }
+
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler(ignoreCancelled = true)
     public void on(final BountyClaimEvent event) {
-        if (!arenaManager.isInMatch(event.getClaimer())) {
+        if (!config.isPreventBountyLoss() || !arenaManager.isInMatch(event.getClaimer())) {
             return;
         }
 
@@ -33,7 +42,7 @@ public void on(final BountyClaimEvent event) {
 
     @EventHandler(ignoreCancelled = true)
     public void on(final BountyCreateEvent event) {
-        if (event.getCause() != BountyCause.AUTO_BOUNTY || !arenaManager.isInMatch(event.getBounty().getTarget().getPlayer())) {
+        if (!config.isPreventBountyLoss() || event.getCause() != BountyCause.AUTO_BOUNTY || !arenaManager.isInMatch(event.getBounty().getTarget().getPlayer())) {
             return;
         }
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/queue/Queue.java b/duels-plugin/src/main/java/me/realized/duels/queue/Queue.java
@@ -67,9 +67,8 @@ boolean removePlayer(final Player player) {
         return false;
     }
 
-    void removeAll(final Set<QueueEntry> players) {
-        this.players.removeAll(players);
-        update();
+    boolean removeAll(final Set<QueueEntry> players) {
+        return this.players.removeAll(players);
     }
 
     private void update() {
diff --git a/duels-plugin/src/main/java/me/realized/duels/queue/QueueManager.java b/duels-plugin/src/main/java/me/realized/duels/queue/QueueManager.java
@@ -155,7 +155,13 @@ public void handleLoad() throws Exception {
                     }
                 }
 
-                queue.removeAll(remove);
+                if (queue.removeAll(remove) && !update) {
+                    update = true;
+                }
+            }
+
+            if (update) {
+                gui.calculatePages();
             }
         }, 20L, 40L).getTaskId();
     }
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatBase.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatBase.java
@@ -39,6 +39,9 @@ class CompatBase {
     static Class<?> TITLE_ACTIONS;
     static final Class<?> CHAT_SERIALIZER;
 
+    static final Field CB_INVENTORY;
+    static final Field CB_INVENTORY_TITLE;
+
     static {
         final Class<?> CB_ITEMSTACK = ReflectionUtil.getCBClass("inventory.CraftItemStack");
         final Class<?> NMS_ITEMSTACK = ReflectionUtil.getNMSClass("ItemStack");
@@ -85,5 +88,8 @@ class CompatBase {
         }
 
         CHAT_SERIALIZER = !pre1_8 ? ReflectionUtil.getNMSClass("ChatComponentText") : null;
+
+        CB_INVENTORY = ReflectionUtil.getDeclaredField(ReflectionUtil.getCBClass("inventory.CraftInventory"), "inventory");
+        CB_INVENTORY_TITLE = ReflectionUtil.getDeclaredField(ReflectionUtil.getCBClass("inventory.CraftInventoryCustom$MinecraftInventory"), "title");
     }
 }
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/Inventories.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/Inventories.java
@@ -0,0 +1,16 @@
+package me.realized.duels.util.compat;
+
+import org.bukkit.inventory.Inventory;
+
+public final class Inventories extends CompatBase {
+
+    public static void setTitle(final Inventory inventory, final String title) {
+        try {
+            CB_INVENTORY_TITLE.set(CB_INVENTORY.get(inventory), title);
+        } catch (IllegalAccessException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    private Inventories() {}
+}
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/ReflectionUtil.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/ReflectionUtil.java
@@ -65,4 +65,15 @@ public static Field getField(final Class<?> clazz, final String name) {
             return null;
         }
     }
+
+    public static Field getDeclaredField(final Class<?> clazz, final String name) {
+        try {
+            final Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            return field;
+        } catch (NoSuchFieldException ex) {
+            Log.error(ex.getMessage(), ex);
+            return null;
+        }
+    }
 }
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/gui/AbstractGui.java b/duels-plugin/src/main/java/me/realized/duels/util/gui/AbstractGui.java
@@ -56,6 +56,15 @@ public void set(final Inventory inventory, final int from, final int to, final B
         Slots.run(from, to, slot -> set(inventory, slot, button));
     }
 
+    public void remove(final Inventory inventory) {
+        buttons.remove(inventory);
+    }
+
+    public Button<P> remove(final Inventory inventory, final int slot) {
+        final Map<Integer, Button<P>> buttons;
+        return (buttons = this.buttons.get(inventory)) != null ? buttons.remove(slot) : null;
+    }
+
     public void update(final Player player, final Inventory inventory, final Button<P> button) {
         final Map<Integer, Button<P>> cached = buttons.get(inventory);
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/gui/MultiPageGui.java b/duels-plugin/src/main/java/me/realized/duels/util/gui/MultiPageGui.java
diff --git a/duels-plugin/src/main/resources/config.yml b/duels-plugin/src/main/resources/config.yml
diff --git a/libs/BountyHunters.jar b/libs/BountyHunters.jar

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`
`11`	`11`	`allprojects {`
`12`	`12`	`group 'me.realized'`
`13`		`- version '3.2.0'`
	`13`	`+ version '3.2.1-SNAPSHOT'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compile 'com.google.code.findbugs:jsr305:3.0.2'`
`3`		`- compile 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT'`
	`3`	`+ compile 'org.spigotmc:spigot-api:1.13.1-R0.1-SNAPSHOT'`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`shadowJar {`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,8 @@ boolean removePlayer(final Player player) {`
`67`	`67`	`return false;`
`68`	`68`	`}`
`69`	`69`
`70`		`- void removeAll(final Set<QueueEntry> players) {`
`71`		`- this.players.removeAll(players);`
`72`		`- update();`
	`70`	`+ boolean removeAll(final Set<QueueEntry> players) {`
	`71`	`+ return this.players.removeAll(players);`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`private void update() {`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,13 @@ public void handleLoad() throws Exception {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- queue.removeAll(remove);`
	`158`	`+ if (queue.removeAll(remove) && !update) {`
	`159`	`+ update = true;`
	`160`	`+ }`
	`161`	`+ }`
	`162`	`+`
	`163`	`+ if (update) {`
	`164`	`+ gui.calculatePages();`
`159`	`165`	`}`
`160`	`166`	`}, 20L, 40L).getTaskId();`
`161`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ class CompatBase {`
`39`	`39`	`static Class<?> TITLE_ACTIONS;`
`40`	`40`	`static final Class<?> CHAT_SERIALIZER;`
`41`	`41`
	`42`	`+ static final Field CB_INVENTORY;`
	`43`	`+ static final Field CB_INVENTORY_TITLE;`
	`44`	`+`
`42`	`45`	`static {`
`43`	`46`	`final Class<?> CB_ITEMSTACK = ReflectionUtil.getCBClass("inventory.CraftItemStack");`
`44`	`47`	`final Class<?> NMS_ITEMSTACK = ReflectionUtil.getNMSClass("ItemStack");`
`@@ -85,5 +88,8 @@ class CompatBase {`
`85`	`88`	`}`
`86`	`89`
`87`	`90`	`CHAT_SERIALIZER = !pre1_8 ? ReflectionUtil.getNMSClass("ChatComponentText") : null;`
	`91`	`+`
	`92`	`+ CB_INVENTORY = ReflectionUtil.getDeclaredField(ReflectionUtil.getCBClass("inventory.CraftInventory"), "inventory");`
	`93`	`+ CB_INVENTORY_TITLE = ReflectionUtil.getDeclaredField(ReflectionUtil.getCBClass("inventory.CraftInventoryCustom$MinecraftInventory"), "title");`
`88`	`94`	`}`
`89`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,15 @@ public static Field getField(final Class<?> clazz, final String name) {`
`65`	`65`	`return null;`
`66`	`66`	`}`
`67`	`67`	`}`
	`68`	`+`
	`69`	`+ public static Field getDeclaredField(final Class<?> clazz, final String name) {`
	`70`	`+ try {`
	`71`	`+ final Field field = clazz.getDeclaredField(name);`
	`72`	`+ field.setAccessible(true);`
	`73`	`+ return field;`
	`74`	`+ } catch (NoSuchFieldException ex) {`
	`75`	`+ Log.error(ex.getMessage(), ex);`
	`76`	`+ return null;`
	`77`	`+ }`
	`78`	`+ }`
`68`	`79`	`}`