Drop Fabric API dependency

Author: amyavi

build.gradle.kts

@@ -16,12 +16,8 @@ dependencies {
         officialMojangMappings()
         parchment("org.parchmentmc.data:parchment-1.21.1:2024.11.17@zip")
     })
-    modImplementation("net.fabricmc:fabric-loader:0.16.14")
-
-    setOf("fabric-api-base", "fabric-command-api-v2").forEach {
-        modImplementation(fabricApi.module(it, "0.115.4+1.21.1"))
-    }
 
+    modImplementation("net.fabricmc:fabric-loader:0.16.14")
     modImplementation("net.fabricmc:fabric-language-kotlin:1.13.2+kotlin.2.1.20")
 }
 

src/main/java/dev/optimistic/serverauth/mixin/CommandsMixin.java

@@ -0,0 +1,25 @@
+package dev.optimistic.serverauth.mixin;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.optimistic.serverauth.command.ServerAuthCommand;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Commands.class)
+public abstract class CommandsMixin {
+    @Shadow
+    @Final
+    private CommandDispatcher<CommandSourceStack> dispatcher;
+
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;setConsumer(Lcom/mojang/brigadier/ResultConsumer;)V", remap = false))
+    private void init$setConsumer(Commands.CommandSelection selection, CommandBuildContext context, CallbackInfo ci) {
+        ServerAuthCommand.INSTANCE.register(this.dispatcher);
+    }
+}

…dev/optimistic/serverauth/Initializer.kt …/serverauth/command/ServerAuthCommand.ktsrc/main/kotlin/dev/optimistic/serverauth/Initializer.kt renamed to src/main/kotlin/dev/optimistic/serverauth/command/ServerAuthCommand.kt src/main/kotlin/dev/optimistic/serverauth/Initializer.kt renamed to src/main/kotlin/dev/optimistic/serverauth/command/ServerAuthCommand.kt

@@ -1,25 +1,14 @@
-package dev.optimistic.serverauth
+package dev.optimistic.serverauth.command
 
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
 import dev.optimistic.serverauth.keys.PublicKeyHolder
-import net.fabricmc.api.DedicatedServerModInitializer
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
-import net.minecraft.commands.CommandBuildContext
 import net.minecraft.commands.CommandSourceStack
 import net.minecraft.commands.Commands
 import net.minecraft.network.chat.Component
 
-class Initializer : DedicatedServerModInitializer, CommandRegistrationCallback {
-    override fun onInitializeServer() {
-        CommandRegistrationCallback.EVENT.register(this)
-    }
-
-    override fun register(
-        dispatcher: CommandDispatcher<CommandSourceStack>,
-        context: CommandBuildContext,
-        selection: Commands.CommandSelection
-    ) {
+object ServerAuthCommand {
+    fun register(dispatcher: CommandDispatcher<CommandSourceStack>) {
         dispatcher.register(
             Commands.literal("serverauth")
                 .requires { it.hasPermission(4) }

src/main/resources/fabric.mod.json

@@ -14,22 +14,13 @@
   },
   "license": "MIT",
   "environment": "*",
-  "entrypoints": {
-    "server": [
-      {
-        "adapter": "kotlin",
-        "value": "dev.optimistic.serverauth.Initializer"
-      }
-    ]
-  },
   "mixins": [
     "server-auth.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.16.14",
     "minecraft": "~1.21.1",
     "java": ">=21",
-    "fabric-command-api-v2": "*",
     "fabric-language-kotlin": ">=1.13.2+kotlin.2.1.20"
   },
   "conflicts": {

src/main/resources/server-auth.mixins.json

@@ -6,6 +6,7 @@
     "defaultRequire": 1
   },
   "mixins": [
+    "CommandsMixin",
     "ConnectionMixin",
     "CryptMixin",
     "accessor.ServerboundKeyPacketAccessor",