From 8ffe3f824cbd25a5e8576ee0625d3a195d03bcd7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 17 Jun 2025 17:50:19 +0200 Subject: [PATCH] fancydialogs: Refactor FancyNpcs integration --- plugins/fancydialogs/build.gradle.kts | 8 ++++---- .../fancyinnovations/fancydialogs/FancyDialogsPlugin.java | 4 +++- .../fancydialogs/fancynpcs/OpenDialogNpcAction.java | 7 ++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/fancydialogs/build.gradle.kts b/plugins/fancydialogs/build.gradle.kts index a8a88441..4114676a 100644 --- a/plugins/fancydialogs/build.gradle.kts +++ b/plugins/fancydialogs/build.gradle.kts @@ -93,11 +93,11 @@ tasks { minecraftVersion("1.21.6") downloadPlugins { - modrinth("fancynpcs", "2.5.0") - hangar("ViaVersion", "5.3.2") - hangar("ViaBackwards", "5.3.2") +// modrinth("fancynpcs", "2.5.0") +// hangar("ViaVersion", "5.3.2") +// hangar("ViaBackwards", "5.3.2") // modrinth("multiverse-core", "4.3.11") - hangar("PlaceholderAPI", "2.11.6") +// hangar("PlaceholderAPI", "2.11.6") } } diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java index 2a3e97b0..62606511 100644 --- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java +++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java @@ -141,7 +141,9 @@ public class FancyDialogsPlugin extends JavaPlugin implements FancyDialogs { registerCommands(); // FancyNpcs actions - new OpenDialogNpcAction().register(); + if (Bukkit.getPluginManager().isPluginEnabled("FancyNpcs")) { + new OpenDialogNpcAction().register(); + } fancyLogger.info("Successfully enabled FancyDialogs version %s".formatted(getDescription().getVersion())); } diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/fancynpcs/OpenDialogNpcAction.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/fancynpcs/OpenDialogNpcAction.java index 9595ade3..d14af7ef 100644 --- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/fancynpcs/OpenDialogNpcAction.java +++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/fancynpcs/OpenDialogNpcAction.java @@ -5,7 +5,6 @@ import com.fancyinnovations.fancydialogs.api.Dialog; import de.oliver.fancynpcs.api.FancyNpcsPlugin; import de.oliver.fancynpcs.api.actions.NpcAction; import de.oliver.fancynpcs.api.actions.executor.ActionExecutionContext; -import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,9 +26,7 @@ public class OpenDialogNpcAction extends NpcAction { } public void register() { - if (Bukkit.getPluginManager().isPluginEnabled("FancyNpcs")) { - FancyNpcsPlugin.get().getActionManager().registerAction(this); - FancyDialogsPlugin.get().getFancyLogger().info("Registered NPC action 'open_dialog' for FancyNpcs."); - } + FancyNpcsPlugin.get().getActionManager().registerAction(this); + FancyDialogsPlugin.get().getFancyLogger().info("Registered NPC action 'open_dialog' for FancyNpcs."); } }