[1.8.9]所有监听器优先级提升到MONITOR,修复与EcoEnchants兼容问题

YufiriaMazenta · Jan 14, 2024 · 8ae22fa · 8ae22fa
1 parent 1013f5a
commit 8ae22fa
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.8.8"
+version = "1.8.9"
 
 plugins {
     `java-library`

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/AnvilHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/AnvilHandler.java
@@ -26,7 +26,7 @@ public enum AnvilHandler implements Listener {
 
     INSTANCE;
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPrepareAnvil(PrepareAnvilEvent event) {
         if (!PluginConfigs.ENABLE_ANVIL_RECIPE.value())
             return;
@@ -68,7 +68,7 @@ public void onPrepareAnvil(PrepareAnvilEvent event) {
         event.setResult(result);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onClickAnvil(InventoryClickEvent event) {
         if (!PluginConfigs.ENABLE_ANVIL_RECIPE.value())
             return;

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/CraftHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/CraftHandler.java
@@ -23,7 +23,7 @@ public enum CraftHandler implements Listener {
 
     INSTANCE;
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void dispatchConditions(PrepareItemCraftEvent event) {
         if (event.getRecipe() == null)
             return;
@@ -40,7 +40,7 @@ public void dispatchConditions(PrepareItemCraftEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void dispatchActions(CraftItemEvent event) {
         if (event.getInventory().getResult() == null) {
             event.getInventory().setResult(null);
@@ -60,7 +60,7 @@ public void dispatchActions(CraftItemEvent event) {
         CraftorithmAPI.INSTANCE.arcencielDispatcher().dispatchArcencielFunc(player, actions);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void checkCannotCraft(PrepareItemCraftEvent event) {
         ItemStack[] items = event.getInventory().getMatrix();
         boolean containsLore = ItemUtils.hasCannotCraftLore(items);

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/FurnaceBurnHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/FurnaceBurnHandler.java
@@ -16,7 +16,7 @@
 @BukkitListener
 public class FurnaceBurnHandler implements Listener {
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onClickFurnace(InventoryClickEvent event) {
         if (event.isCancelled())
             return;
@@ -82,7 +82,7 @@ public void onClickFurnace(InventoryClickEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onFurnaceBurn(FurnaceBurnEvent event) {
         if (event.isCancelled())
             return;

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/ItemsAdderHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/ItemsAdderHandler.java
@@ -39,7 +39,7 @@ public enum ItemsAdderHandler implements Listener {
             throw new IllegalArgumentException("Can not find ItemsAdder plugin instance");
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onItemsAdderLoaded(ItemsAdderLoadDataEvent event) {
         RecipeManager.INSTANCE.reloadRecipeManager();
         //注销IA合成监听器

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RandomSmeltHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RandomSmeltHandler.java
@@ -30,7 +30,7 @@ public enum RandomSmeltHandler implements Listener {
         randomFurnaceBlockMap = new HashMap<>();
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onFurnaceStartSmelt(FurnaceStartSmeltEvent event) {
         NamespacedKey recipeKey = event.getRecipe().getKey();
         Map<String, RecipeGroup> randomCookingRecipeGroups = RecipeManager.INSTANCE.recipeMap().getOrDefault(RecipeType.RANDOM_COOKING, new HashMap<>());
@@ -51,7 +51,7 @@ public void onFurnaceStartSmelt(FurnaceStartSmeltEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onFurnaceSmelt(FurnaceSmeltEvent event) {
         if (randomFurnaceBlockMap.containsKey(event.getBlock())) {
             List<String> resultList = randomFurnaceBlockMap.get(event.getBlock()).getStringList("result");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java
@@ -6,6 +6,7 @@
 import org.bukkit.NamespacedKey;
 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;
 
@@ -18,7 +19,7 @@ public enum RecipeUnlockHandler implements Listener {
 
     INSTANCE;
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         Map<NamespacedKey, Boolean> unlockMap = RecipeManager.INSTANCE.recipeUnlockMap();

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmithingHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmithingHandler.java
@@ -23,7 +23,7 @@ public enum SmithingHandler implements Listener {
 
     INSTANCE;
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPrepareSmith(PrepareSmithingEvent event) {
         NamespacedKey recipeKey = RecipeManager.INSTANCE.getRecipeKey(event.getInventory().getRecipe());
         if (recipeKey == null)
@@ -41,7 +41,7 @@ public void onPrepareSmith(PrepareSmithingEvent event) {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onSmithItem(SmithItemEvent event) {
         HumanEntity entity = event.getWhoClicked();
         if (!(entity instanceof Player)) {
@@ -58,7 +58,7 @@ public void onSmithItem(SmithItemEvent event) {
         CraftorithmAPI.INSTANCE.arcencielDispatcher().dispatchArcencielFunc(player, actions);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void checkCannotCraftLore(PrepareSmithingEvent event) {
         ItemStack[] items = event.getInventory().getContents();
         boolean containsLore = ItemUtils.hasCannotCraftLore(items);