Fix reference-code compilation

Author: willkroboth

reference-code/buildSrc/src/main/kotlin/common.gradle.kts

@@ -45,7 +45,7 @@ dependencies {
     compileOnly("de.tr7zw:item-nbt-api:$nbtApiVersion")
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
     testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
-    testImplementation("com.github.seeseemelk:MockBukkit-v1.21:$mockBukkitVersion")
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:$mockBukkitVersion")
     compileOnly("com.mojang:brigadier:$brigadierVersion")
     compileOnly("com.mojang:authlib:$authlibVersion")
 }

reference-code/gradle.properties

@@ -7,4 +7,4 @@ authlibVersion=3.3.39
 nbtApiVersion=2.11.1
 kotlinVersion=2.0.0
 junitVersion=5.11.0
-mockBukkitVersion=3.133.2
+mockBukkitVersion=4.76.0

reference-code/paper/build.gradle.kts

@@ -10,7 +10,9 @@ val commandApiVersion: String by project
 val paperVersion: String by project
 
 dependencies {
-    compileOnly("dev.jorel:commandapi-paper-core:$commandApiVersion")
-    compileOnly("dev.jorel:commandapi-kotlin-paper:$commandApiVersion")
-    compileOnly("io.papermc.paper:paper-api:$paperVersion")
+    implementation("dev.jorel:commandapi-paper-core:$commandApiVersion")
+    implementation("dev.jorel:commandapi-kotlin-paper:$commandApiVersion")
+    implementation("io.papermc.paper:paper-api:$paperVersion")
+
+    testImplementation("dev.jorel:commandapi-paper-test-toolkit:${commandApiVersion}")
 }

reference-code/paper/src/main/java/createcommands/Unregistration.java

@@ -19,7 +19,7 @@ public class MyPluginBootstrap implements PluginBootstrap {
 
         @Override
         public void bootstrap(@NotNull BootstrapContext context) {
-            CommandAPI.onLoad(new CommandAPIPaperConfig<>(context.getPluginMeta(), context));
+            CommandAPI.onLoad(new CommandAPIPaperConfig(context));
 
             new CommandAPICommand("inbootstrap")
                 .executes((sender, args) -> {

reference-code/paper/src/main/java/createcommands/arguments/types/NBTArguments.java

@@ -14,7 +14,7 @@ class NBTArguments {
             // #region hookNbtAPIExample
             @Override
             public void onLoad() {
-                CommandAPI.onLoad(new CommandAPIPaperConfig<>(this.getPluginMeta(), this)
+                CommandAPI.onLoad(new CommandAPIPaperConfig(this)
                     .initializeNBTAPI(NBTContainer.class, NBTContainer::new)
                 );
             }

reference-code/paper/src/main/java/devsetup/Shading.java

@@ -10,15 +10,15 @@ class Shading {
     static {
         JavaPlugin plugin = null;
         // #region bukkitConfigExample
-        CommandAPI.onLoad(new CommandAPIPaperConfig<>(plugin.getPluginMeta(), plugin).silentLogs(true));
+        CommandAPI.onLoad(new CommandAPIPaperConfig(plugin).silentLogs(true));
         // #endregion bukkitConfigExample
     }
 
     // #region shadingExample
     class MyPlugin extends JavaPlugin {
         @Override
         public void onLoad() {
-            CommandAPI.onLoad(new CommandAPIPaperConfig<>(this.getPluginMeta(), this).verboseOutput(true)); // Load with verbose output
+            CommandAPI.onLoad(new CommandAPIPaperConfig(this).verboseOutput(true)); // Load with verbose output
 
             new CommandAPICommand("ping")
                 .executes((sender, args) -> {

reference-code/paper/src/main/kotlin/createcommands/Unregistration.kt

@@ -18,7 +18,7 @@ class UnregistrationKT {
     class MyPluginBootstrap : PluginBootstrap {
 
         override fun bootstrap(context: BootstrapContext) {
-            CommandAPI.onLoad(CommandAPIPaperConfig(context.pluginMeta, context))
+            CommandAPI.onLoad(CommandAPIPaperConfig(context))
 
             CommandAPICommand("inbootstrap")
                 .executes(CommandExecutor { sender, _ ->

reference-code/paper/src/main/kotlin/createcommands/arguments/types/NBTArguments.kt

@@ -14,7 +14,7 @@ import org.bukkit.plugin.java.JavaPlugin
 val nbtArguments = object : JavaPlugin() {
     // #region hookNbtAPIExample
     override fun onLoad() {
-        CommandAPI.onLoad(CommandAPIPaperConfig(this.pluginMeta, this)
+        CommandAPI.onLoad(CommandAPIPaperConfig(this)
             .initializeNBTAPI(NBTContainer::class.java, ::NBTContainer)
         )
     }

reference-code/paper/src/main/kotlin/devsetup/Shading.kt

@@ -11,14 +11,14 @@ class KotlinShadingPlugin : JavaPlugin()
 fun shading() {
     val plugin: JavaPlugin = KotlinShadingPlugin()
     // #region bukkitConfigExample
-    CommandAPI.onLoad(CommandAPIPaperConfig(plugin.pluginMeta, plugin).silentLogs(true))
+    CommandAPI.onLoad(CommandAPIPaperConfig(plugin).silentLogs(true))
     // #endregion bukkitConfigExample
 }
 
 // #region shadingExample
 class MyPlugin : JavaPlugin() {
     override fun onLoad() {
-        CommandAPI.onLoad(CommandAPIPaperConfig(this.pluginMeta, this).verboseOutput(true)) // Load with verbose output
+        CommandAPI.onLoad(CommandAPIPaperConfig(this).verboseOutput(true)) // Load with verbose output
 
         CommandAPICommand("ping")
             .executes(CommandExecutor { sender, _ ->

reference-code/bukkit/src/test/java/test/LoadMockCommandAPI.java renamed to reference-code/paper/src/test/java/test/LoadMockCommandAPI.java

@@ -1,15 +1,24 @@
 package test;
 
-import be.seeseemelk.mockbukkit.MockBukkit;
-import be.seeseemelk.mockbukkit.ServerMock;
-import createcommands.functionsandtags.Main;
-import dev.jorel.commandapi.CommandAPI;
+import com.mojang.brigadier.CommandDispatcher;
 import dev.jorel.commandapi.CommandAPIVersionHandler;
-import dev.jorel.commandapi.MockCommandAPIBukkit;
+import dev.jorel.commandapi.MockCommandAPIPaper;
 import dev.jorel.commandapi.MockCommandAPIPlugin;
+import dev.jorel.commandapi.MockCommandSource;
+import dev.jorel.commandapi.nms.MockPaperNMS;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.junit.jupiter.api.BeforeEach;
+import org.mockbukkit.mockbukkit.MockBukkit;
+import org.mockbukkit.mockbukkit.ServerMock;
+
+import java.io.File;
+import java.io.IOException;
 
 class LoadMockCommandAPI {
+    class Main extends JavaPlugin {
+
+    }
+
     // #region loadMockCommandAPIExample
     @BeforeEach
     public void setUp() {
@@ -34,12 +43,11 @@ public void tearDown() {
 
     class CustomExample {
         // #region loadCustomCommandAPIPlatformImplementationExample
-        public class CustomMockCommandAPIBukkit extends MockCommandAPIBukkit {
+        public class CustomMockPaperNMS extends MockPaperNMS {
             // Implement a method that usually throws `UnimplementedMethodException`
             @Override
-            public void reloadDataPacks() {
-                CommandAPI.logInfo("Simulating data pack reload");
-                // Further logic
+            public void createDispatcherFile(File file, CommandDispatcher<MockCommandSource> brigadierDispatcher) throws IOException {
+                // Whatever logic you need
             }
         }
 
@@ -49,7 +57,9 @@ public void setUp() {
             MockBukkit.mock();
 
             // Tell the CommandAPI to use your custom platform implementation
-            CommandAPIVersionHandler.usePlatformImplementation(new CustomMockCommandAPIBukkit());
+            CommandAPIVersionHandler.usePlatformImplementation(
+                config -> new MockCommandAPIPaper(config, new CustomMockPaperNMS())
+            );
 
             // Load CommandAPI and your plugin as mentioned above...
         }