From 5fc2e03bbb4a9438a3d4a724d27ccd25bfebe75c Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Sat, 13 Apr 2024 17:09:13 +0800 Subject: [PATCH] removed isEnabled check for some plugins --- .../customfishing/api/manager/PlaceholderManager.java | 9 +++++++++ build.gradle.kts | 2 +- plugin/build.gradle.kts | 2 +- .../compatibility/IntegrationManagerImpl.java | 8 ++++---- .../compatibility/papi/PlaceholderManagerImpl.java | 11 ++++++++++- .../libraries/dependencies/Dependency.java | 6 +++--- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java index 5cd26729..922db18c 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java +++ b/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java @@ -26,6 +26,15 @@ import java.util.Map; public interface PlaceholderManager { + /** + * Register a custom placeholder + * + * @param placeholder for instance {level} + * @param original for instance %player_level% + * @return success or not, it would fail if the placeholder has been registered + */ + boolean registerCustomPlaceholder(String placeholder, String original); + /** * Set placeholders in a text string for a player. * diff --git a/build.gradle.kts b/build.gradle.kts index 23f5a88f..8577181d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.1.3.1" + version = "2.1.3.2" apply() apply(plugin = "java") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index c0c74254..1766b95c 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { compileOnly("dev.aurelium:auraskills-api-bukkit:2.0.0-SNAPSHOT") compileOnly("com.github.MilkBowl:VaultAPI:1.7") compileOnly("org.betonquest:betonquest:2.0.0") - compileOnly("xyz.xenondevs.invui:invui:1.26") + compileOnly("xyz.xenondevs.invui:invui:1.27") compileOnly("com.github.Xiao-MoMi:Custom-Crops:3.4-BETA-1") implementation("com.github.Xiao-MoMi:BiomeAPI:0.3") diff --git a/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java index 0ce65322..1879c881 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java @@ -63,17 +63,17 @@ public class IntegrationManagerImpl implements IntegrationManager { } public void load() { - if (plugin.isHookedPluginEnabled("ItemsAdder")) { + if (Bukkit.getPluginManager().getPlugin("ItemsAdder") != null) { plugin.getItemManager().registerItemLibrary(new ItemsAdderItemImpl()); plugin.getBlockManager().registerBlockLibrary(new ItemsAdderBlockImpl()); plugin.getEntityManager().registerEntityLibrary(new ItemsAdderEntityImpl()); hookMessage("ItemsAdder"); } - if (plugin.isHookedPluginEnabled("MMOItems")) { + if (Bukkit.getPluginManager().getPlugin("MMOItems") != null) { plugin.getItemManager().registerItemLibrary(new MMOItemsItemImpl()); hookMessage("MMOItems"); } - if (plugin.isHookedPluginEnabled("Oraxen")) { + if (Bukkit.getPluginManager().getPlugin("Oraxen") != null) { plugin.getItemManager().registerItemLibrary(new OraxenItemImpl()); hookMessage("Oraxen"); } @@ -85,7 +85,7 @@ public class IntegrationManagerImpl implements IntegrationManager { plugin.getItemManager().registerItemLibrary(new NeigeItemsItemImpl()); hookMessage("NeigeItems"); } - if (plugin.isHookedPluginEnabled("MythicMobs")) { + if (Bukkit.getPluginManager().getPlugin("MythicMobs") != null) { plugin.getItemManager().registerItemLibrary(new MythicMobsItemImpl()); plugin.getEntityManager().registerEntityLibrary(new MythicEntityImpl()); hookMessage("MythicMobs"); diff --git a/plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderManagerImpl.java index 8a36128f..79f5ef63 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderManagerImpl.java @@ -82,11 +82,20 @@ public class PlaceholderManagerImpl implements PlaceholderManager { ConfigurationSection section = config.getConfigurationSection("other-settings.placeholder-register"); if (section != null) { for (Map.Entry entry : section.getValues(false).entrySet()) { - this.customPlaceholderMap.put(entry.getKey(), (String) entry.getValue()); + registerCustomPlaceholder(entry.getKey(), (String) entry.getValue()); } } } + @Override + public boolean registerCustomPlaceholder(String placeholder, String original) { + if (this.customPlaceholderMap.containsKey(placeholder)) { + return false; + } + this.customPlaceholderMap.put(placeholder, original); + return true; + } + /** * Set placeholders in a text string for a player. * diff --git a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java index 24c82d6e..2bff2a2d 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java +++ b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java @@ -304,21 +304,21 @@ public enum Dependency { INV_UI( "xyz{}xenondevs{}invui", "invui-core", - "1.26", + "1.27", "xenondevs", "invui-core" ), INV_UI_ACCESS( "xyz{}xenondevs{}invui", "inventory-access", - "1.26", + "1.27", "xenondevs", "inventory-access" ), INV_UI_NMS( "xyz{}xenondevs{}invui", getInvUINms(), - "1.26", + "1.27", "xenondevs", getInvUINms() ),