chore(minecraft): update implementations for 25w32a

Noticeable changes are in PlayerList management for server player loads.

See: https://minecraft.wiki/w/Java_Edition_25w32a

Author: gabizou

gradle/verification-metadata.xml

@@ -3751,6 +3751,11 @@
             <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
+         <artifact name="net.ltgt.errorprone.gradle.plugin-4.3.0.pom">
+            <sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
          <artifact name="gradle-errorprone-plugin-3.1.0.jar">
             <sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle"/>
@@ -3759,6 +3764,14 @@
             <sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
+         <artifact name="gradle-errorprone-plugin-4.3.0.jar">
+            <sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-errorprone-plugin-4.3.0.module">
+            <sha256 value="6d2b0a7809ffde227ec15a4cf28e68929be22a1a12a0f56ad5e795d5058f2f6e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.md-5" name="SpecialSource" version="1.8.5">
          <artifact name="SpecialSource-1.8.5.jar">
             <sha256 value="0ac4b7acac8d927e75cf47061b0c067130dd3bd713c493205ea7607241df2813" origin="Generated by Gradle"/>

src/accessors/java/org/spongepowered/common/accessor/network/chat/StyleAccessor.java

@@ -29,7 +29,6 @@
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
-import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;

src/main/java/org/spongepowered/common/data/provider/item/stack/SpawnEggItemStackData.java

@@ -30,12 +30,10 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.SpawnEggItem;
-import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.component.TypedEntityData;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.entity.EntityArchetype;
-import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 import org.spongepowered.common.entity.SpongeEntityArchetypeBuilder;
 

src/main/java/org/spongepowered/common/item/SpongeItemStack.java

@@ -28,7 +28,6 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.Dynamic;
-import net.minecraft.core.Registry;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;

src/mixins/java/org/spongepowered/common/mixin/core/client/server/IntegratedPlayerListMixin.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.mixin.core.client.server;
 
-import com.mojang.authlib.GameProfile;
 import net.minecraft.client.server.IntegratedPlayerList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.players.NameAndId;
@@ -48,9 +47,10 @@ public abstract class IntegratedPlayerListMixin extends PlayerListMixin implemen
 
     @Override
     public CompletableFuture<Component> bridge$canPlayerLoginClient(final SocketAddress param0, final com.mojang.authlib.GameProfile param1) {
-        final Component component = this.shadow$canPlayerLogin(param0, new NameAndId(param1));
+        final var name = new NameAndId(param1);
+        final Component component = this.shadow$canPlayerLogin(param0, name);
         if (component == null) {
-            return this.impl$canPlayerLoginServer(param0, param1);
+            return this.impl$canPlayerLoginServer(param0, name);
         }
         return CompletableFuture.completedFuture(component);
     }

src/mixins/java/org/spongepowered/common/mixin/core/server/ServerFunctionLibraryMixin.java

@@ -28,7 +28,6 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.server.ServerFunctionLibrary;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.minecraft.server.packs.resources.ResourceManager;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.asm.mixin.Mixin;
 
@@ -39,10 +38,11 @@
 public abstract class ServerFunctionLibraryMixin {
 
     @WrapMethod(method = "reload")
-    private CompletableFuture<Void> impl$onReload(final PreparableReloadListener.PreparationBarrier barrier, final ResourceManager manager,
-                                                  final Executor executor1, final Executor executor2, final Operation<CompletableFuture<Void>> original) {
+    private CompletableFuture<Void> impl$onReload(
+        final PreparableReloadListener.SharedState state, final Executor executor1,
+        final PreparableReloadListener.PreparationBarrier barrier, Executor executor2, Operation<CompletableFuture<Void>> original) {
         if (Sponge.isServerAvailable()) {
-            return original.call(barrier, manager, executor1, executor2);
+            return original.call(state, executor1, barrier, executor2);
         }
         return barrier.wait(null);
     }

src/mixins/java/org/spongepowered/common/mixin/core/server/dedicated/DedicatedPlayerListMixin.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.mixin.core.server.dedicated;
 
-import com.mojang.authlib.GameProfile;
 import net.minecraft.core.LayeredRegistryAccess;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.RegistryLayer;

src/mixins/java/org/spongepowered/common/mixin/core/server/network/ServerConfigurationPacketListenerImplMixin.java

@@ -32,6 +32,7 @@
 import net.minecraft.network.protocol.configuration.ServerboundFinishConfigurationPacket;
 import net.minecraft.server.network.ConfigurationTask;
 import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
+import net.minecraft.server.players.NameAndId;
 import net.minecraft.server.players.PlayerList;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.event.SpongeEventFactory;
@@ -137,8 +138,8 @@ public abstract class ServerConfigurationPacketListenerImplMixin extends ServerC
     }
 
     @Redirect(method = "handleConfigurationFinished",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/network/chat/Component;"))
-    private Component impl$onCanPlayerLogin(final PlayerList instance, final SocketAddress $$0, final GameProfile $$1) {
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lnet/minecraft/server/players/NameAndId;)Lnet/minecraft/network/chat/Component;"))
+    private Component impl$onCanPlayerLogin(final PlayerList instance, final SocketAddress $$0, final NameAndId $$1) {
         //Skip as we check it at the start.
         return null;
     }

src/mixins/java/org/spongepowered/common/mixin/core/server/network/ServerLoginPacketListenerImplMixin.java

@@ -37,6 +37,7 @@
 import net.minecraft.network.protocol.login.custom.CustomQueryAnswerPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+import net.minecraft.server.players.NameAndId;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.util.Crypt;
 import net.minecraft.util.CryptException;
@@ -138,8 +139,8 @@ public abstract class ServerLoginPacketListenerImplMixin implements ServerLoginP
     }
 
     @Redirect(method = "verifyLoginAndFinishConnectionSetup",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/network/chat/Component;"))
-    private Component impl$onCanPlayerLogin(final PlayerList instance, final SocketAddress $$0, final GameProfile $$1) {
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lnet/minecraft/server/players/NameAndId;)Lnet/minecraft/network/chat/Component;"))
+    private Component impl$onCanPlayerLogin(final PlayerList instance, final SocketAddress $$0, final NameAndId $$1) {
         //We check this as part of auth event.
         return null;
     }

src/mixins/java/org/spongepowered/common/mixin/core/server/network/config/PrepareSpawnTask_ReadyMixin.java

@@ -0,0 +1,98 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.core.server.network.config;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.world.level.storage.ValueInput;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+@Mixin(targets = "net.minecraft.server.network.config.PrepareSpawnTask$Ready")
+public class PrepareSpawnTask_ReadyMixin {
+
+    @WrapOperation(
+        method = "spawn", // or the mapped method containing the Player.load call
+        at = @At(
+            value = "INVOKE",
+            target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V"
+            // If your version uses CompoundTag instead, use the proper descriptor
+        )
+    )
+    private void impl$afterPlayerLoad(
+        final Optional<ValueInput> instance, final Consumer<? super ValueInput> action,
+        final Operation<Void> original,
+        @Local net.minecraft.server.level.ServerPlayer player
+        ) throws IOException {
+        // Call vanilla first
+        original.call(instance, action);
+
+        final ServerPlayer sPlayer = (ServerPlayer) player;
+        if (sPlayer.get(Keys.FIRST_DATE_JOINED).isEmpty()) {
+            // TODO - 25w32a changed where we have access to the Player and moved access to the data files elsewhere.
+//            final Path file = new File(this.playerDir, player.getStringUUID() + ".dat").toPath();
+//            final Instant creationTime = java.nio.file.Files.exists(file)
+//                ? java.nio.file.Files.readAttributes(file, java.nio.file.attribute.BasicFileAttributes.class)
+//                .creationTime().toInstant()
+//                : null;
+//
+//            ((SpongeServer) SpongeCommon.server())
+//                .getPlayerDataManager()
+//                .readLegacyPlayerData(sPlayer, nbtOrValueInput, creationTime);
+        }
+
+        sPlayer.offer(Keys.LAST_DATE_JOINED, java.time.Instant.now());
+    }
+
+
+    @WrapOperation(method = "spawn",
+        at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V"),
+        slice = @Slice(
+            from = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;loadPlayerData(Lnet/minecraft/server/players/NameAndId;)Ljava/util/Optional;"),
+            to = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;snapTo(Lnet/minecraft/world/phys/Vec3;FF)V")
+        )
+    )
+    private void impl$setPlayerDataForNewPlayers(
+        final Optional<ValueInput> instance, final Consumer<? super ValueInput> action,
+        final Operation<Void> original,
+        @Local final net.minecraft.server.level.ServerPlayer playerIn
+    ) {
+        original.call(instance, action);
+        if (instance.isEmpty()) {
+            final Instant now = Instant.now();
+            ((ServerPlayer) playerIn).offer(Keys.FIRST_DATE_JOINED, now);
+            ((ServerPlayer) playerIn).offer(Keys.LAST_DATE_JOINED, now);
+        }
+    }
+}