Adds event priority

weihao · Jun 12, 2018 · 4a085cc · 4a085cc
1 parent 72f1c97
commit 4a085cc
Show file tree

Hide file tree

Showing 72 changed files with 111 additions and 94 deletions.
diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/Main.java b/src/main/java/org/pixeltime/enchantmentsenhance/Main.java
@@ -109,6 +109,8 @@ public void onEnable() {
         SettingsManager.setup();
         // Register listener.
         registerCore();
+        // Register data.
+        registerDataSettings();
         // Register all the compatible modules.
         registerCompatibility();
         // When plugin is reloaded, load all the inventory of online players.
@@ -142,9 +144,6 @@ public void onEnable() {
             }
         }
 
-        // Kotlin setup
-        KM.setUp();
-
 
         // Plugin fully initialized.
         getLogger().info(SettingsManager.lang.getString(
@@ -191,20 +190,30 @@ private void registerCore() {
             getLogger().info(
                     "EnchantmentsEnhance runs fine on Cauldron/KCauldron.");
         }
-        new AnimalBreeding();
-        new DataManager();
         // Start bStats metrics.
         new Metrics(this);
+        Bukkit.getPluginManager().registerEvents(new GUIListener(), Main.getMain());
+        Bukkit.getPluginManager().registerEvents(new MenuHandler(), Main.getMain());
+    }
+
+    /**
+     * Register data settings.
+     */
+    public void registerDataSettings() {
         commandManager = new CommandManager();
+        PluginManager pm = Bukkit.getPluginManager();
         if (SettingsManager.config.getBoolean("enableStackMob")) {
             pm.registerEvents(new StackMobHandler(), this);
         }
         if (!SettingsManager.config.getBoolean("enableVanillaEnchant")) {
             pm.registerEvents(new VanillaEnchantHandler(), this);
         }
 
-        Bukkit.getPluginManager().registerEvents(new GUIListener(), Main.getMain());
-        Bukkit.getPluginManager().registerEvents(new MenuHandler(), Main.getMain());
+        DataManager.setUp();
+        AnimalBreeding.setUp();
+
+        // Kotlin setup
+        KM.setUp();
     }
 
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/command/ReloadCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/command/ReloadCommand.java
@@ -19,7 +19,7 @@
 package org.pixeltime.enchantmentsenhance.command;
 
 import org.bukkit.entity.Player;
-import org.pixeltime.enchantmentsenhance.manager.DataManager;
+import org.pixeltime.enchantmentsenhance.Main;
 import org.pixeltime.enchantmentsenhance.manager.SettingsManager;
 import org.pixeltime.enchantmentsenhance.util.Util;
 
@@ -30,8 +30,7 @@ public void onCommand(Player player, String[] args) {
         SettingsManager.reloadConfig();
         SettingsManager.reloadData();
         SettingsManager.reloadLang();
-        new DataManager();
-        SettingsManager.setup();
+        Main.getMain().registerDataSettings();
         Util.sendMessage(SettingsManager.lang.getString("Config.reload"),
                 player);
     }

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/gui/GUIListener.java b/src/main/java/org/pixeltime/enchantmentsenhance/gui/GUIListener.java
@@ -21,14 +21,15 @@
 import org.bukkit.Material;
 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.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class GUIListener implements Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onClick(InventoryClickEvent e) {
         // Handles invalid clicks.
         if (e.getSlot() < 0) {
@@ -59,15 +60,15 @@ public void onClick(InventoryClickEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onClose(InventoryCloseEvent e) {
         Player player = (Player) e.getPlayer();
         String playerName = player.getName();
         GUIAbstract.playerMap.remove(playerName);
     }
 
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onQuit(PlayerQuitEvent e) {
         Player player = e.getPlayer();
         String playerName = player.getName();

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/gui/menu/MenuHandler.java b/src/main/java/org/pixeltime/enchantmentsenhance/gui/menu/MenuHandler.java
@@ -3,6 +3,7 @@
 import org.bukkit.Material;
 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.inventory.InventoryCloseEvent;
@@ -11,7 +12,7 @@
 
 public class MenuHandler implements Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onClick(InventoryClickEvent e) {
         // Handles invalid clicks.
         if (e.getSlot() < 0) {
@@ -44,7 +45,7 @@ public void onClick(InventoryClickEvent e) {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onInventoryClose(InventoryCloseEvent e) {
         Player player = (Player) e.getPlayer();
         Menu.itemOnEnhancingSlot.remove(player.getName());

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/listener/ItemDropHandler.java b/src/main/java/org/pixeltime/enchantmentsenhance/listener/ItemDropHandler.java
@@ -22,6 +22,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.player.PlayerDropItemEvent;
 import org.bukkit.inventory.ItemStack;
@@ -37,7 +38,7 @@ public class ItemDropHandler implements Listener {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onItemDrop(PlayerDropItemEvent e) {
         Item droppedItem = e.getItemDrop();
         ItemStack DroppedItemStack = droppedItem.getItemStack();
@@ -56,7 +57,6 @@ public void onItemDrop(PlayerDropItemEvent e) {
                 e.setCancelled(true);
                 Util.sendMessage(SettingsManager.lang.getString(
                         "Messages.noDrop"), p);
-                return;
             }
         }
     }

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/listener/LifeskillingHandler.java b/src/main/java/org/pixeltime/enchantmentsenhance/listener/LifeskillingHandler.java
@@ -121,7 +121,7 @@ public void onKilling(EntityDeathEvent e) {
      *
      * @param e
      */
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
     public void onBreeding(PlayerInteractEntityEvent e) {
         if (AnimalBreeding.breeadableFood.contains(e.getPlayer().getItemInHand()
                 .getType())) {

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/listener/PlayerDeathHandler.java b/src/main/java/org/pixeltime/enchantmentsenhance/listener/PlayerDeathHandler.java
@@ -97,7 +97,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerRespawn(PlayerRespawnEvent e) {
         Player p = e.getPlayer();
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/listener/PlayerStreamHandler.java b/src/main/java/org/pixeltime/enchantmentsenhance/listener/PlayerStreamHandler.java
@@ -21,6 +21,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
@@ -46,7 +47,7 @@ public PlayerStreamHandler() {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onJoin(PlayerJoinEvent e) {
         Player player = e.getPlayer();
         Util.sendMessage(SettingsManager.lang.getString("Config.welcome")
@@ -63,7 +64,7 @@ public void onJoin(PlayerJoinEvent e) {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onQuit(PlayerQuitEvent e) {
         Player player = e.getPlayer();
         Failstack.saveLevels(player, false);
@@ -78,7 +79,7 @@ public void onQuit(PlayerQuitEvent e) {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onKick(PlayerKickEvent e) {
         Player player = e.getPlayer();
         Failstack.saveLevels(player, false);
@@ -91,7 +92,7 @@ public void onKick(PlayerKickEvent e) {
      *
      * @param e
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onJoin2(PlayerJoinEvent e) {
         if (e.getPlayer() != null) {
             Player player = e.getPlayer();

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/manager/DataManager.java b/src/main/java/org/pixeltime/enchantmentsenhance/manager/DataManager.java
@@ -34,7 +34,7 @@ public class DataManager {
     public static boolean[] destroyIfFail;
     public static boolean[] requireConcentratedStones;
 
-    public DataManager() {
+    public static void setUp() {
         Set<String> temp = SettingsManager.config.getConfigurationSection(
                 "enhance").getKeys(false);
         levels = temp.size();

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/util/events/AnimalBreeding.java b/src/main/java/org/pixeltime/enchantmentsenhance/util/events/AnimalBreeding.java
@@ -39,16 +39,16 @@ public class AnimalBreeding {
     /**
      * Initialization Constructor.
      */
-    public AnimalBreeding() {
-        this.addBreeadableAnimals();
-        this.addBreeadableFood();
+    public static void setUp() {
+        addBreeadableAnimals();
+        addBreeadableFood();
     }
 
 
     /**
      * Defines breedable food.
      */
-    public void addBreeadableFood() {
+    public static void addBreeadableFood() {
         goldenApple = new ItemStack(Material.GOLDEN_APPLE);
         goldenCarrot = new ItemStack(Material.GOLDEN_CARROT);
         wheat = new ItemStack(Material.WHEAT);
@@ -68,7 +68,7 @@ public void addBreeadableFood() {
     /**
      * Defines breedable animals.
      */
-    public void addBreeadableAnimals() {
+    public static void addBreeadableAnimals() {
         horse = EntityType.HORSE;
         sheep = EntityType.SHEEP;
         cow = EntityType.COW;

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Aegis.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Aegis.kt
@@ -29,7 +29,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 private val translateAlternateColorCodes: String = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "aegis"))
 
 class Aegis : Listener {
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun block(playerInteractEvent: PlayerInteractEvent) {
         val player = playerInteractEvent.player
         if (playerInteractEvent.action != Action.RIGHT_CLICK_AIR) {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Assassin.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Assassin.kt
@@ -35,7 +35,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 class Assassin : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "assassin"))
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             val player = entityDamageByEntityEvent.damager as Player

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Battlecry.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Battlecry.kt
@@ -34,7 +34,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 class Battlecry : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "battlecry"))
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             val player = entityDamageByEntityEvent.damager as Player

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Batvision.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Batvision.kt
@@ -30,7 +30,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 class Batvision : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "batvision"))
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onWalk(playerMoveEvent: PlayerMoveEvent) {
         val player = playerMoveEvent.player
         try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Blessed.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Blessed.kt
@@ -20,6 +20,7 @@ package org.pixeltime.enchantmentsenhance.event.enchantment
 
 import org.bukkit.ChatColor
 import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerMoveEvent
 import org.pixeltime.enchantmentsenhance.manager.IM
@@ -28,7 +29,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 class Blessed : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "blessed"))
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onMove(playerMoveEvent: PlayerMoveEvent) {
         val player = playerMoveEvent.player
         try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Corruption.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Corruption.kt
@@ -34,7 +34,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Corruption : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "corruption"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Crits.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Crits.kt
@@ -14,7 +14,7 @@ import org.pixeltime.enchantmentsenhance.util.Sounds
 
 class Crits : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "crits"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             val player = entityDamageByEntityEvent.damager as Player

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Crushing.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Crushing.kt
@@ -32,7 +32,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Crushing : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "crushing"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Cure.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Cure.kt
@@ -30,7 +30,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 class Cure : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "cure"))
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onWalk(playerMoveEvent: PlayerMoveEvent) {
         val player = playerMoveEvent.player
         try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Curse.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Curse.kt
@@ -34,7 +34,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Curse : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "curse"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.entity is Player && entityDamageByEntityEvent.damager is Player) {
             try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Demonic.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Demonic.kt
@@ -34,7 +34,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Demonic : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "demonic"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Divine.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Divine.kt
@@ -32,7 +32,7 @@ import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Divine : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "divine"))
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageByEntityEvent: EntityDamageByEntityEvent) {
         if (entityDamageByEntityEvent.damager is Player && entityDamageByEntityEvent.entity is Player) {
             try {

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Dodge.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/event/enchantment/Dodge.kt
@@ -21,14 +21,15 @@ package org.pixeltime.enchantmentsenhance.event.enchantment
 import org.bukkit.ChatColor
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDamageEvent
 import org.pixeltime.enchantmentsenhance.manager.IM
 import org.pixeltime.enchantmentsenhance.manager.SettingsManager
 
 class Dodge : Listener {
     private val translateAlternateColorCodes = ChatColor.translateAlternateColorCodes('&', SettingsManager.lang.getString("enchantments." + "dodge"))
-    @EventHandler
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     fun onDamage(entityDamageEvent: EntityDamageEvent) {
         if (entityDamageEvent.entity is Player) {
             val player = entityDamageEvent.entity as Player