From 925ec656cab70ecfa542493776a20731ab12e5d7 Mon Sep 17 00:00:00 2001 From: YufiriaMazenta <2199098065@qq.com> Date: Sun, 14 Jan 2024 13:07:58 +0800 Subject: [PATCH] =?UTF-8?q?[2.0.0-dev7]=E6=89=80=E6=9C=89=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=99=A8=E4=BC=98=E5=85=88=E7=BA=A7=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=88=B0MONITOR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../yufiriamazenta/craftorithm/listener/AnvilHandler.java | 4 ++-- .../yufiriamazenta/craftorithm/listener/CraftHandler.java | 6 +++--- .../craftorithm/listener/FurnaceBurnHandler.java | 4 ++-- .../craftorithm/listener/ItemsAdderHandler.java | 2 +- .../craftorithm/listener/RandomSmeltHandler.java | 2 +- .../craftorithm/listener/RecipeUnlockHandler.java | 3 ++- .../craftorithm/listener/SmithingHandler.java | 6 +++--- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index acd8e2c8..2309585c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ import java.text.SimpleDateFormat -version = "2.0.0-dev6" +version = "2.0.0-dev7" 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 index 6d66c047..905ee74b 100644 --- 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 index 9bf21854..a99b92f3 100644 --- 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 index d21a227e..3a8981b9 100644 --- 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 index d04897db..e474ae57 100644 --- 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 index a77662a5..3bfef344 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RandomSmeltHandler.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RandomSmeltHandler.java @@ -32,7 +32,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(); RecipeGroup recipeGroup = RecipeManager.INSTANCE.getRecipeGroup(recipeKey); diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java index 4d348b71..408efcf7 100644 --- 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 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 index 0da7199b..077f387b 100644 --- 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);