Refactor Authlib integration and adjust entity handling for 1.21 compatibility

SpigotCore/SpigotCore_21/build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
 
     compileOnly(libs.paperapi21)
     compileOnly(libs.nms21)
+    compileOnly(libs.authlib2)
     compileOnly(libs.datafixer)
     compileOnly(libs.netty)
     compileOnly(libs.authlib)

SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java

@@ -25,6 +25,9 @@ import de.steamwar.Reflection;
 import net.minecraft.Util;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.GameType;
 import org.bukkit.GameMode;
 
@@ -34,33 +37,19 @@ import java.util.List;
 import java.util.function.LongSupplier;
 
 public class ProtocolWrapper21 implements ProtocolWrapper {
-
-    private static final Reflection.Field<List> equipmentStack = Reflection.getField(equipmentPacket, List.class, 0);
     @Override
     public void setEquipmentPacketStack(Object packet, Object slot, Object stack) {
-        equipmentStack.set(packet, Collections.singletonList(new Pair<>(slot, stack)));
+        ClientboundSetEquipmentPacket setEquipmentPacket = (ClientboundSetEquipmentPacket) packet;
+        setEquipmentPacket.getSlots().add(Pair.of((EquipmentSlot) slot, (ItemStack) stack));
     }
 
-    private static final Reflection.Constructor removePacketConstructor = Reflection.getConstructor(ClientboundPlayerInfoRemovePacket.class, List.class);
-
     @Override
-    @SuppressWarnings("deprecation")
     public Object playerInfoPacketConstructor(PlayerInfoAction action, GameProfile profile, GameMode mode) {
         if(action == PlayerInfoAction.REMOVE)
-            return removePacketConstructor.invoke(Collections.singletonList(profile.getId()));
-        return switch (action) {
-            case ADD -> new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE), new ClientboundPlayerInfoUpdatePacket.Entry(
-                    profile.getId(), profile, true, 0, GameType.byId(mode.getValue()), null, true, 0, null
-            ));
-            case GAMEMODE -> new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE), new ClientboundPlayerInfoUpdatePacket.Entry(
-                    profile.getId(), profile, true, 0, GameType.byId(mode.getValue()), null, true, 0, null
-            ));
-            default -> null;
-        };
-    }
+            return new ClientboundPlayerInfoRemovePacket(Collections.singletonList(profile.getId()));
 
-    @Override
-    public void initTPSWarp(LongSupplier longSupplier) {
-        Util.timeSource = () -> System.nanoTime() + longSupplier.getAsLong();
+        return new ClientboundPlayerInfoUpdatePacket(action == PlayerInfoAction.ADD ?
+                EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE) : EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE),
+                Collections.singletonList(new ClientboundPlayerInfoUpdatePacket.Entry(profile.getId(), profile, false, 0, GameType.byId(mode.getValue()), null, false, 0, null)));
     }
 }

SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.core;
 
+import com.mojang.authlib.properties.Property;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
@@ -40,4 +41,9 @@ public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper {
     public Material getTurtleScute() {
         return Material.TURTLE_SCUTE;
     }
+
+    @Override
+    public String getValue(Property property) {
+        return property.value();
+    }
 }

SpigotCore/SpigotCore_21/src/de/steamwar/core/authlib/SteamwarGameProfileRepository21.java

@@ -0,0 +1,73 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.core.authlib;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.ProfileLookupCallback;
+import de.steamwar.Reflection;
+import de.steamwar.sql.SteamwarUser;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.Services;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class SteamwarGameProfileRepository21 extends SteamwarGameProfileRepository {
+    private static final GameProfileRepository fallback;
+    private static final Reflection.Field<Services> field;
+    private static final Services current;
+
+    static {
+        Class<?> clazz = MinecraftServer.getServer().getClass();
+        field = Reflection.getField(clazz, Services.class, 0);
+        current = field.get(MinecraftServer.getServer());
+        fallback = current.profileRepository();
+    }
+
+    @Override
+    public void findProfilesByNames(String[] strings, ProfileLookupCallback profileLookupCallback) {
+        List<String> unknownNames = new ArrayList<>();
+        for (String name:strings) {
+            SteamwarUser user = SteamwarUser.get(name);
+            if(user == null) {
+                unknownNames.add(name);
+                continue;
+            }
+
+            profileLookupCallback.onProfileLookupSucceeded(new GameProfile(user.getUUID(), user.getUserName()));
+        }
+        if(!unknownNames.isEmpty()) {
+            fallback.findProfilesByNames(unknownNames.toArray(new String[0]), profileLookupCallback);
+        }
+    }
+
+    @Override
+    public Optional<GameProfile> findProfileByName(String s) {
+        return fallback.findProfileByName(s);
+    }
+
+    @Override
+    public void inject() {
+        Services newServices = new Services(current.sessionService(), current.servicesKeySet(), this, current.profileCache(), current.paperConfigurations());
+        field.set(MinecraftServer.getServer(), newServices);
+    }
+}

SpigotCore/SpigotCore_21/src/de/steamwar/entity/PacketConstructor21.java

@@ -19,7 +19,9 @@
 
 package de.steamwar.entity;
 
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.world.phys.Vec3;
 
@@ -31,4 +33,21 @@ public class PacketConstructor21 implements PacketConstructor{
         PositionMoveRotation rot = new PositionMoveRotation(new Vec3(x, y, z), Vec3.ZERO, pitch, yaw);
         return new ClientboundTeleportEntityPacket(entityId, rot, Collections.emptySet(), false);
     }
+
+    @Override
+    public Object createRPlayerSpawn(RPlayer player) {
+        return new ClientboundAddEntityPacket(
+                player.entityId,
+                player.uuid,
+                player.x,
+                player.y,
+                player.z,
+                player.yaw,
+                player.pitch,
+                EntityType.PLAYER,
+                0,
+                Vec3.ZERO,
+                player.headYaw
+        );
+    }
 }