Fix human spawn packets injection

forge/src/mixins/resources/mixins.spongeforge.core.shared.json

@@ -4,6 +4,7 @@
     "package": "org.spongepowered.common.mixin.core",
     "priority": 1301,
     "mixins": [
+        "server.level.ServerEntityMixin_Shared",
         "world.entity.projectile.FishingHookMixin_Shared"
     ],
     "overwrites": {

neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/server/level/ServerEntityMixin_Neo.java

@@ -0,0 +1,75 @@
+/*
+ * 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.neoforge.mixin.core.server.level;
+
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.server.level.ServerEntity;
+import net.minecraft.world.entity.Entity;
+import net.neoforged.neoforge.network.bundle.PacketAndPayloadAcceptor;
+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.Redirect;
+import org.spongepowered.common.entity.living.human.HumanEntity;
+
+import java.util.EnumSet;
+import java.util.List;
+
+@Mixin(ServerEntity.class)
+public class ServerEntityMixin_Neo {
+    @Shadow @Final private Entity entity;
+
+    /**
+     * @author gabizou
+     * @reason Because the entity spawn packet is just a lone packet, we have to actually
+     * do some hackery to create the player list packet first, then the spawn packet,
+     * then perform the remove packet.
+     */
+    @Redirect(
+        method = "sendPairingData",
+        at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/bundle/PacketAndPayloadAcceptor;accept(Lnet/minecraft/network/protocol/Packet;)Lnet/neoforged/neoforge/network/bundle/PacketAndPayloadAcceptor;", ordinal = 0)
+    )
+    public PacketAndPayloadAcceptor impl$sendHumanSpawnPacket(PacketAndPayloadAcceptor consumer, Packet spawnPacket) {
+        if (!(this.entity instanceof final HumanEntity human)) {
+            return consumer.accept(spawnPacket);
+        }
+        // Adds the GameProfile to the client
+        consumer.accept(human.createPlayerListPacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)));
+        // Actually spawn the human (a player)
+        consumer.accept(spawnPacket);
+        // Remove from the player map
+        final ClientboundPlayerInfoRemovePacket removePacket = new ClientboundPlayerInfoRemovePacket(List.of(human.getUUID()));
+        if (human.canRemoveFromListImmediately()) {
+            consumer.accept(removePacket);
+        } else {
+            // Human is a Player entity on the client and needs to tick once for the skin to render
+            human.removeFromTabListDelayed(null, removePacket);
+        }
+        return consumer;
+    }
+}

neoforge/src/mixins/resources/mixins.spongeneo.core.json

@@ -21,6 +21,7 @@
         "server.BootstrapMixin_Neo",
         "server.MinecraftServerMixin_Neo",
         "server.commands.SpreadPlayersCommandMixin_Neo",
+        "server.level.ServerEntityMixin_Neo",
         "server.level.ServerPlayerMixin_Neo",
         "server.network.ServerGamePacketListenerImplMixin_Neo",
         "server.network.ServerLoginPacketListenerImplMixin_Neo",

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerEntityMixin_Shared.java

@@ -40,7 +40,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-// TODO NeoForge
 // Forge and Vanilla
 @Mixin(ServerEntity.class)
 public class ServerEntityMixin_Shared {
@@ -54,7 +53,7 @@ public class ServerEntityMixin_Shared {
      */
     @Redirect(
         method = "sendPairingData",
-        at = @At(value = "INVOKE", remap = false, target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V", ordinal = 0)
+        at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V", ordinal = 0)
     )
     public void impl$sendHumanSpawnPacket(final Consumer<Packet<?>> consumer, final Object spawnPacket) {
         if (!(this.entity instanceof final HumanEntity human)) {

vanilla/src/mixins/resources/mixins.spongevanilla.core.shared.json

@@ -4,6 +4,7 @@
     "package": "org.spongepowered.common.mixin.core",
     "priority": 1301,
     "mixins": [
+        "server.level.ServerEntityMixin_Shared",
         "world.entity.projectile.FishingHookMixin_Shared"
     ],
     "overwrites": {