Update functions.md

Also might include a fix for the diff language not being detected correctly

Author: DerEchtePilz

docs/.vitepress/config.mts

@@ -113,11 +113,6 @@ const vitepressOptions: UserConfig = {
                 }]
             }).then(_ => {
             })
-            shiki.loadLanguage({
-                name: 'diff',
-                scopeName: 'source.diff'
-            }).then(_ => {
-            })
         },
         config: ( md) => {
             tabsPlugin(md);

docs/en/create-commands/functions-and-tags/functions.md

@@ -1,5 +1,6 @@
 ---
 order: 1
+preferences: ["paper-spigot"]
 authors:
   - DerEchtePilz
   - willkroboth
@@ -17,29 +18,58 @@ The CommandAPI has support to use Minecraft's [functions](https://minecraft.wiki
 
 Minecraft 1.16+ changes the way that datapacks are loaded on the server, so that they load before plugins are enabled. This means that non-vanilla commands that are declared in functions and tags will be detected as invalid, causing the server to throw a lot of errors at the very start.
 
+<div class="paper">
+
+To make commands available in datapacks, they have to be registered at the right place. More on that later.
+
+</div>
+<div class="spigot">
+
 The CommandAPI reloads datapacks once the server has finished loading using all declared commands, therefore **the error messages at the start of the server can be ignored**.
 
+</div>
+
 :::
 
 ## Using custom commands in functions
 
-In order to use a command from your plugin in a `.mcfunction` file, you must register your command in your plugin's `onLoad()` method, instead of the `onEnable()` method. Failure to do so will not allow the command to be registered for Minecraft functions, causing the function file to fail to load during the server startup phase.
+<div class="paper">
+
+In order to use a command from your plugin in a `.mcfunction` file, you must register your command in your plugin's `bootstrap(BootstrapContext)` method, instead of the `onLoad()`/`onEnable()` method. Failure to do so will not allow the command to be registered for Minecraft functions, causing the function file to fail to load during the server startup phase.
 
 :::info
 
-In short, if you want to register a command which can be used in Minecraft functions, register it in your plugin's `onLoad()` method.
+In short, if you want to register a command which can be used in Minecraft functions, register it in your plugin's `bootstrap(BootstrapContext)` method.
 
 :::
 
+</div>
+
 ::::tip Example – Registering command for use in a function
 
-Say we have a command `/killall` that simply kills all entities in all worlds on the server. If we were to register this in our `onLoad()` method, this would allow us to use the `/killall` command in Minecraft functions and tags.
+<div class="paper">
+
+Say we have a command `/killall` that simply kills all entities in all worlds on the server. To make it available in a function, we want to register the command in the `bootstrap(BootstrapContext)` method.
 
 :::tabs
 ===Java
-<<< @/../reference-code/bukkit/src/main/java/createcommands/functionsandtags/Functions.java#functionsExample
+<<< @/../reference-code/paper/src/main/java/createcommands/functionsandtags/Functions.java#functionsExample
 ===Kotlin
-<<< @/../reference-code/bukkit/src/main/kotlin/createcommands/functionsandtags/Functions.kt#functionsExample
+<<< @/../reference-code/paper/src/main/kotlin/createcommands/functionsandtags/Functions.kt#functionsExample
 :::
 
+</div>
+<div class="spigot">
+
+Say we have a command `/killall` that simply kills all entities in all worlds on the server. It doesn't matter where we register to make the command available in a function, but we'll just use the `onLoad()` method here.
+
+:::tabs
+===Java
+<<< @/../reference-code/spigot/src/main/java/createcommands/functionsandtags/Functions.java#functionsExample
+===Kotlin
+<<< @/../reference-code/spigot/src/main/kotlin/createcommands/functionsandtags/Functions.kt#functionsExample
+:::
+
+</div>
+
 ::::

reference-code/paper/src/main/java/createcommands/functionsandtags/Functions.java

@@ -0,0 +1,25 @@
+package createcommands.functionsandtags;
+
+import dev.jorel.commandapi.CommandAPICommand;
+import io.papermc.paper.plugin.bootstrap.BootstrapContext;
+import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+
+class Functions {
+    // #region functionsExample
+    public class MainBoostrap implements PluginBootstrap {
+        @Override
+        public void bootstrap(BootstrapContext context) {
+            // Commands which will be used in Minecraft functions are registered here
+
+            new CommandAPICommand("killall")
+                .executes((sender, args) -> {
+                    // Kills all enemies in all worlds
+                    Bukkit.getWorlds().forEach(w -> w.getLivingEntities().forEach(e -> e.setHealth(0)));
+                })
+                .register();
+        }
+    }
+    // #endregion functionsExample
+}

reference-code/paper/src/main/kotlin/createcommands/functionsandtags/Functions.kt

@@ -0,0 +1,23 @@
+package createcommands.functionsandtags
+
+import dev.jorel.commandapi.CommandAPICommand
+import dev.jorel.commandapi.executors.CommandExecutor
+import io.papermc.paper.plugin.bootstrap.BootstrapContext
+import io.papermc.paper.plugin.bootstrap.PluginBootstrap
+import org.bukkit.Bukkit
+import org.bukkit.plugin.java.JavaPlugin
+
+// #region functionsExample
+class MainBootstrap : PluginBootstrap {
+    override fun bootstrap(context: BootstrapContext) {
+        // Commands which will be used in Minecraft functions are registered here
+
+        CommandAPICommand("killall")
+            .executes(CommandExecutor { _, _ ->
+                // Kills all enemies in all worlds
+                Bukkit.getWorlds().forEach { world -> world.livingEntities.forEach { entity -> entity.health = 0.0 } }
+            })
+            .register()
+    }
+}
+// #endregion functionsExample

reference-code/bukkit/src/main/java/createcommands/functionsandtags/Functions.java renamed to reference-code/spigot/src/main/java/createcommands/functionsandtags/Functions.java

@@ -9,20 +9,13 @@ class Functions {
     public class Main extends JavaPlugin {
         @Override
         public void onLoad() {
-            // Commands which will be used in Minecraft functions are registered here
-
             new CommandAPICommand("killall")
                 .executes((sender, args) -> {
                     // Kills all enemies in all worlds
                     Bukkit.getWorlds().forEach(w -> w.getLivingEntities().forEach(e -> e.setHealth(0)));
                 })
                 .register();
         }
-
-        @Override
-        public void onEnable() {
-            // Register all other commands here
-        }
     }
     // #endregion functionsExample
 }

reference-code/bukkit/src/main/kotlin/createcommands/functionsandtags/Functions.kt renamed to reference-code/spigot/src/main/kotlin/createcommands/functionsandtags/Functions.kt

@@ -8,18 +8,12 @@ import org.bukkit.plugin.java.JavaPlugin
 // #region functionsExample
 class Main : JavaPlugin() {
     override fun onLoad() {
-        // Commands which will be used in Minecraft functions are registered here
-
         CommandAPICommand("killall")
             .executes(CommandExecutor { _, _ ->
                 // Kills all enemies in all worlds
                 Bukkit.getWorlds().forEach { world -> world.livingEntities.forEach { entity -> entity.health = 0.0 } }
             })
             .register()
     }
-
-    override fun onEnable() {
-        // Register all other commands here
-    }
 }
 // #endregion functionsExample