diff --git a/gradle.properties b/gradle.properties index ce55bb76..b35840f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -crypticlibVer=1.10.5 \ No newline at end of file +crypticlibVer=1.10.7 \ No newline at end of file diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java index f7e748a8..f19a99a6 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java @@ -10,7 +10,7 @@ import crypticlib.command.BukkitSubcommand; import crypticlib.command.CommandInfo; import crypticlib.perm.PermInfo; -import crypticlib.platform.Platform; +import crypticlib.platform.IPlatform; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -64,7 +64,7 @@ public void execute(CommandSender sender, List args) { HashMap failedItems = player.getInventory().addItem(itemStack); if (!failedItems.isEmpty()) { - if (!CrypticLibBukkit.platform().type().equals(Platform.PlatformType.FOLIA)) { + if (!CrypticLibBukkit.isFolia()) { for (ItemStack stack : failedItems.values()) { player.getWorld().dropItem(player.getLocation(), stack); } diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmeltResultRefreshHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmeltResultRefreshHandler.java index 7cb37fca..7deca174 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmeltResultRefreshHandler.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/SmeltResultRefreshHandler.java @@ -1,11 +1,9 @@ package com.github.yufiriamazenta.craftorithm.listener; -import com.github.yufiriamazenta.craftorithm.Craftorithm; import com.github.yufiriamazenta.craftorithm.item.ItemManager; import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager; import crypticlib.CrypticLibBukkit; import crypticlib.listener.EventListener; -import crypticlib.platform.Platform; import org.bukkit.NamespacedKey; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -31,7 +29,7 @@ public enum SmeltResultRefreshHandler implements Listener { @EventHandler public void putFurnaceSmeltRecipeCache(FurnaceStartSmeltEvent event) { - if (!CrypticLibBukkit.platform().type().equals(Platform.PlatformType.BUKKIT)) { + if (CrypticLibBukkit.isPaper()) { //因为Bukkit没有FurnaceSmeltEvent.getRecipe方法,如果是Paper及其下游就可以不用处理 return; } @@ -46,7 +44,7 @@ public void putFurnaceSmeltRecipeCache(FurnaceStartSmeltEvent event) { @EventHandler public void refreshSmeltResult(FurnaceSmeltEvent event) { Recipe recipe; - if (CrypticLibBukkit.platform().type().equals(Platform.PlatformType.BUKKIT)) { + if (!CrypticLibBukkit.isPaper()) { recipe = blockSmeltRecipeMap.get(event.getBlock()); blockSmeltRecipeMap.remove(event.getBlock()); } else { @@ -68,7 +66,7 @@ public void refreshSmeltResult(FurnaceSmeltEvent event) { @EventHandler public void putBlockCookRecipeCache(CampfireStartEvent event) { - if (!CrypticLibBukkit.platform().type().equals(Platform.PlatformType.BUKKIT)) { + if (CrypticLibBukkit.isPaper()) { //因为Bukkit没有CampfireStartEvent.getRecipe方法,如果是Paper及其下游就可以不用处理 return; } @@ -83,7 +81,7 @@ public void putBlockCookRecipeCache(CampfireStartEvent event) { @EventHandler public void refreshBlockCookResult(BlockCookEvent event) { Recipe recipe; - if (CrypticLibBukkit.platform().type().equals(Platform.PlatformType.BUKKIT)) { + if (!CrypticLibBukkit.isPaper()) { recipe = blockSmeltRecipeMap.get(event.getBlock()); blockSmeltRecipeMap.remove(event.getBlock()); } else { diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/hook/OtherPluginsListenerManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/hook/OtherPluginsListenerManager.java index 798fd281..a3fcefc6 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/hook/OtherPluginsListenerManager.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/hook/OtherPluginsListenerManager.java @@ -10,7 +10,6 @@ import crypticlib.lifecycle.LifeCycle; import crypticlib.lifecycle.TaskRule; import crypticlib.listener.EventListener; -import crypticlib.platform.Platform; import crypticlib.util.ReflectionHelper; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener;