Port to 1.21.1 (#9)

* Port to 1.21.1

* Use Java 21 when building in CI

* Drop Fabric API dependency

Author: amyavi

.github/workflows/build.yml

@@ -9,10 +9,10 @@ jobs:
         uses: actions/checkout@v4
       - name: validate gradle wrapper
         uses: gradle/wrapper-validation-action@v2
-      - name: setup jdk 17
+      - name: setup jdk 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'microsoft'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew

build.gradle.kts

@@ -11,29 +11,25 @@ repositories {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.20.1")
+    minecraft("com.mojang:minecraft:1.21.1")
     mappings(loom.layered {
         officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
+        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.92.5+1.20.1"))
-    }
 
+    modImplementation("net.fabricmc:fabric-loader:0.16.14")
     modImplementation("net.fabricmc:fabric-language-kotlin:1.13.2+kotlin.2.1.20")
 }
 
 java {
     withSourcesJar()
 
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 tasks {
@@ -42,7 +38,7 @@ tasks {
     }
 
     withType<JavaCompile>().configureEach {
-        options.release = 17
+        options.release = 21
         options.encoding = "UTF-8"
     }
 

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);
+    }
+}

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

@@ -1,15 +1,16 @@
 package dev.optimistic.serverauth.mixin;
 
 import com.google.common.base.Objects;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.optimistic.serverauth.ClientConstants;
 import dev.optimistic.serverauth.Constants;
 import dev.optimistic.serverauth.ducks.TaintHolder;
 import net.minecraft.network.Connection;
-import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.handshake.ClientIntent;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -30,7 +31,7 @@ public abstract class ConnectionMixin implements TaintHolder {
     }
 
     @Inject(method = "doSendPacket", at = @At("HEAD"))
-    private void doSendPacket(Packet<?> packet, @Nullable PacketSendListener sendListener, ConnectionProtocol newProtocol, ConnectionProtocol currentProtocol, CallbackInfo ci) {
+    private void doSendPacket(Packet<?> packet, PacketSendListener sendListener, boolean flush, CallbackInfo ci) {
         if (!(packet instanceof ClientIntentionPacket intentionPacket)) return;
 
         PrivateKey privateKey = ClientConstants.INSTANCE.getPrivateKey().read();
@@ -42,4 +43,16 @@ private void doSendPacket(Packet<?> packet, @Nullable PacketSendListener sendLis
 
         tainted = true;
     }
+
+    // initiateServerboundConnection lambda
+    @WrapOperation(method = "method_52900", at = @At(value = "NEW", target = "(ILjava/lang/String;ILnet/minecraft/network/protocol/handshake/ClientIntent;)Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;"))
+    private ClientIntentionPacket run$newIntentionPacket(int protocolVersion, String hostName, int port, ClientIntent intention, Operation<ClientIntentionPacket> original) {
+        ClientIntentionPacket orig = original.call(protocolVersion, hostName, port, intention);
+        UUID id = ClientConstants.INSTANCE.getUuid();
+
+        if (id == null)
+            return orig;
+
+        return ClientConstants.INSTANCE.modifyIntentionPacket(id, orig);
+    }
 }

src/main/java/dev/optimistic/serverauth/mixin/client/ClientHandshakePacketListenerImplMixin.java

@@ -1,8 +1,6 @@
 package dev.optimistic.serverauth.mixin.client;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.authlib.GameProfile;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
 import dev.optimistic.serverauth.ducks.TaintHolder;
 import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
@@ -12,15 +10,16 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.UUID;
+
 @Mixin(ClientHandshakePacketListenerImpl.class)
 public abstract class ClientHandshakePacketListenerImplMixin {
     @Shadow
     @Final
     private Connection connection;
 
-    @WrapOperation(method = "authenticateServer", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;joinServer(Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Ljava/lang/String;)V", remap = false))
-    private void joinServerSession(MinecraftSessionService instance, GameProfile gameProfile, String accessToken, String serverId, Operation<Void> original) {
-        if (!((TaintHolder) connection).serverauth$isTainted())
-            original.call(instance, gameProfile, accessToken, serverId);
+    @WrapWithCondition(method = "authenticateServer", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;joinServer(Ljava/util/UUID;Ljava/lang/String;Ljava/lang/String;)V", remap = false))
+    private boolean joinServerSession(MinecraftSessionService instance, UUID uuid, String accessToken, String serverHash) {
+        return !((TaintHolder) connection).serverauth$isTainted();
     }
 }

src/main/java/dev/optimistic/serverauth/mixin/client/ConnectScreenThreadMixin.java

@@ -25,11 +25,11 @@ public abstract class ServerHandshakePacketListenerImplMixin {
     @Unique
     private static final IllegalStateException EXCEPTION = new IllegalStateException("Unregistered public key");
 
-    @WrapOperation(method = "handleIntention", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;)Lnet/minecraft/server/network/ServerLoginPacketListenerImpl;"))
-    private ServerLoginPacketListenerImpl handleIntention$newServerLoginListener(MinecraftServer server, Connection connection,
+    @WrapOperation(method = "beginLogin", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Z)Lnet/minecraft/server/network/ServerLoginPacketListenerImpl;"))
+    private ServerLoginPacketListenerImpl handleIntention$newServerLoginListener(MinecraftServer server, Connection connection, boolean transferred,
                                                                                  Operation<ServerLoginPacketListenerImpl> original,
                                                                                  @Local(argsOnly = true) ClientIntentionPacket packet) {
-        ServerLoginPacketListenerImpl handler = original.call(server, connection);
+        ServerLoginPacketListenerImpl handler = original.call(server, connection, transferred);
         UUID override = Constants.INSTANCE.deserializeServerAuthId(packet);
         if (override != null) {
             ((IdOverrideHolder) handler).serverauth$setIdOverride(override);

src/main/java/dev/optimistic/serverauth/mixin/server/ServerHandshakePacketListenerImplMixin.java

@@ -4,6 +4,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.yggdrasil.ProfileResult;
 import dev.optimistic.serverauth.ducks.IdOverrideHolder;
 import dev.optimistic.serverauth.keys.PublicKeyHolder;
 import dev.optimistic.serverauth.mixin.accessor.ServerboundKeyPacketAccessor;
@@ -24,6 +25,7 @@
 import java.nio.ByteBuffer;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.util.Set;
 import java.util.UUID;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
@@ -78,11 +80,21 @@ public abstract static class AuthenticationThreadMixin {
         @Final
         ServerLoginPacketListenerImpl field_14176;
 
-        @WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;hasJoinedServer(Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Ljava/net/InetAddress;)Lcom/mojang/authlib/GameProfile;", remap = false))
-        private GameProfile run$hasJoinedServer(MinecraftSessionService instance, GameProfile gameProfile, String data, InetAddress inetAddress, Operation<GameProfile> original) {
+        @WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;hasJoinedServer(Ljava/lang/String;Ljava/lang/String;Ljava/net/InetAddress;)Lcom/mojang/authlib/yggdrasil/ProfileResult;", remap = false))
+        private ProfileResult run$hasJoinedServer(MinecraftSessionService instance, String profileName, String serverId, InetAddress inetAddress, Operation<ProfileResult> original) {
             UUID id = ((IdOverrideHolder) field_14176).serverauth$getIdOverride();
-            if (id == null) return original.call(instance, gameProfile, data, inetAddress);
-            return new GameProfile(id, gameProfile.getName());
+            if (id == null) return original.call(instance, profileName, serverId, inetAddress);
+
+            final GameProfile newProfile = new GameProfile(id, profileName);
+
+            // hasJoined request returns signed data, we should too
+            final ProfileResult fetchedProfile = instance.fetchProfile(id, true);
+            if (fetchedProfile != null) {
+                // mojang after not exposing properties in constructor
+                newProfile.getProperties().putAll(fetchedProfile.profile().getProperties());
+            }
+
+            return new ProfileResult(newProfile, Set.of());
         }
     }
 }

src/main/java/dev/optimistic/serverauth/mixin/server/ServerLoginPacketListenerImplMixin.java

@@ -16,6 +16,7 @@ object ClientConstants {
 
     fun modifyIntentionPacket(serverAuthId: UUID, intentionPacket: ClientIntentionPacket): ClientIntentionPacket =
         ClientIntentionPacket(
+            intentionPacket.protocolVersion,
             "\u0000server-auth\u0000${serverAuthId.toString().replace("-", "")}",
             intentionPacket.port,
             intentionPacket.intention

src/main/kotlin/dev/optimistic/serverauth/ClientConstants.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) }