Implement CommandAPI#552

Author: JorelAli

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java

@@ -217,7 +217,9 @@ public void onEnable() {
 			if (paper.isFoliaPresent()) {
 				CommandAPI.logNormal("Skipping initial datapack reloading because Folia was detected");
 			} else {
-				reloadDataPacks();
+				if (!getConfiguration().skipReloadDatapacks()) {
+					reloadDataPacks();
+				}
 			}
 			updateHelpForCommands(CommandAPI.getRegisteredCommands());
 		}, 0L);

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkitConfig.java

@@ -12,6 +12,7 @@ public class CommandAPIBukkitConfig extends CommandAPIConfig<CommandAPIBukkitCon
 
 	// Default configuration
 	boolean shouldHookPaperReload = true;
+	boolean skipReloadDatapacks = false;
 
 	/**
 	 * Creates a new CommandAPIBukkitConfig object. Variables in this
@@ -38,6 +39,18 @@ public CommandAPIBukkitConfig shouldHookPaperReload(boolean hooked) {
 		return this;
 	}
 
+	/**
+	 * Sets whether the CommandAPI should skip its datapack reload step after the server
+	 * has finished loading. This does not skip reloading of datapacks when invoked manually
+	 * when {@link #shouldHookPaperReload(boolean)} is set.
+	 * @param skip whether the CommandAPI should skip reloading datapacks when the server has finished loading
+	 * @return this CommandAPIBukkitConfig
+	 */
+	public CommandAPIBukkitConfig skipReloadDatapacks(boolean skip) {
+		this.skipReloadDatapacks = skip;
+		return this;
+	}
+	
 	/**
 	 * Sets whether the CommandAPI should use Mojang mappings as opposed to Spigot's mappings
 	 * for internal calls. If set to true, the CommandAPI will use Mojang mappings.

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/InternalBukkitConfig.java

@@ -14,6 +14,8 @@ public class InternalBukkitConfig extends InternalConfig {
 
 	// Whether to hook into paper's reload event to reload datapacks when /minecraft:reload is run
 	private final boolean shouldHookPaperReload;
+	
+	private final boolean skipReloadDatapacks;
 
 	/**
 	 * Creates an {@link InternalBukkitConfig} from a {@link CommandAPIBukkitConfig}
@@ -24,6 +26,7 @@ public InternalBukkitConfig(CommandAPIBukkitConfig config) {
 		super(config);
 		this.plugin = config.plugin;
 		this.shouldHookPaperReload = config.shouldHookPaperReload;
+		this.skipReloadDatapacks = config.skipReloadDatapacks;
 	}
 
 	/**
@@ -41,4 +44,13 @@ public JavaPlugin getPlugin() {
 	public boolean shouldHookPaperReload() {
 		return shouldHookPaperReload;
 	}
+	
+
+
+	/**
+	 * @return Whether the CommandAPI should skip reloading datapacks when the server has finished loading
+	 */
+	public boolean skipReloadDatapacks() {
+		return skipReloadDatapacks;
+	}
 }

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/src/main/java/dev/jorel/commandapi/CommandAPIMain.java

@@ -50,7 +50,8 @@ public void onLoad() {
 			.useLatestNMSVersion(fileConfig.getBoolean("use-latest-nms-version"))
 			.missingExecutorImplementationMessage(fileConfig.getString("messages.missing-executor-implementation"))
 			.dispatcherFile(fileConfig.getBoolean("create-dispatcher-json") ? new File(getDataFolder(), "command_registration.json") : null)
-			.shouldHookPaperReload(fileConfig.getBoolean("hook-paper-reload"));
+			.shouldHookPaperReload(fileConfig.getBoolean("hook-paper-reload"))
+			.skipReloadDatapacks(fileConfig.getBoolean("skip-initial-datapack-reload"));
 
 		for (String pluginName : fileConfig.getStringList("skip-sender-proxy")) {
 			if (Bukkit.getPluginManager().getPlugin(pluginName) != null) {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/src/main/resources/config.yml

@@ -50,6 +50,12 @@ use-latest-nms-version: false
 # reloading datapacks.
 hook-paper-reload: true
 
+# Skips the initial datapack reload when the server loads (default: false)
+# If "true", the CommandAPI will not reload datapacks when the server has finished
+# loading. Datapacks will still be reloaded if performed manually when "hook-paper-reload"
+# is set to "true" and /minecraft:reload is run.
+skip-initial-datapack-reload: false
+
 ################################################################################
 # Command conversion                                                           #
 ################################################################################

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java

@@ -50,7 +50,8 @@ public void onLoad() {
 			.useLatestNMSVersion(fileConfig.getBoolean("use-latest-nms-version"))
 			.missingExecutorImplementationMessage(fileConfig.getString("messages.missing-executor-implementation"))
 			.dispatcherFile(fileConfig.getBoolean("create-dispatcher-json") ? new File(getDataFolder(), "command_registration.json") : null)
-			.shouldHookPaperReload(fileConfig.getBoolean("hook-paper-reload"));
+			.shouldHookPaperReload(fileConfig.getBoolean("hook-paper-reload"))
+			.skipReloadDatapacks(fileConfig.getBoolean("skip-initial-datapack-reload"));
 
 		for (String pluginName : fileConfig.getStringList("skip-sender-proxy")) {
 			if (Bukkit.getPluginManager().getPlugin(pluginName) != null) {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/resources/config.yml

@@ -50,6 +50,12 @@ use-latest-nms-version: false
 # reloading datapacks.
 hook-paper-reload: true
 
+# Skips the initial datapack reload when the server loads (default: false)
+# If "true", the CommandAPI will not reload datapacks when the server has finished
+# loading. Datapacks will still be reloaded if performed manually when "hook-paper-reload"
+# is set to "true" and /minecraft:reload is run.
+skip-initial-datapack-reload: false
+
 ################################################################################
 # Command conversion                                                           #
 ################################################################################

docssrc/src/config.md

@@ -142,6 +142,29 @@ hook-paper-reload: false
 
 -----
 
+
+### `skip-initial-datapack-reload`
+
+Controls whether the CommandAPI should perform its initial datapack reload when the server has finished loading.
+
+The CommandAPI automatically reloads all datapacks in a similar fashion to `/minecraft:reload` in order to propagate CommandAPI commands into datapack functions and tags. This operation may cause a slight delay to server startup and is not necessary if you are not using datapacks or functions that use CommandAPI commands. This operation can be skipped by setting this value to `false`.
+
+Note that datapacks will still be reloaded if performed manually when `hook-paper-reload` is set to `true` and you run `/minecraft:reload`.
+
+**Default value**
+
+```yml
+skip-initial-datapack-reload: false
+```
+
+**Example value**
+
+```yml
+skip-initial-datapack-reload: true
+```
+
+-----
+
 ### `plugins-to-convert`
 
 Controls the list of plugins to process for command conversion. See [Command conversion](./conversionforowners.md) for more information.