Merge branch '1.20.3-multiloader' into 1.20.2-multiloader

# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java

CHANGELOG.md

@@ -4,11 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.0] - 2026-01-14
-### Added
-- Added collection skin provider (allows assigning random skins from a predefined set)
-- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin
-
 ## [2.4.3] - 2025-07-25
 ### Fixed
 - Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))

CHANGELOG_LATEST.md

@@ -1,3 +1,3 @@
-### Added
-- Added collection skin provider (allows assigning random skins from a predefined set) (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providerscollection))
-- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#forcefirstjoinskinfetch))
+### Fixed
+- Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))
+- Fixed server freeze when loading player head skin

common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java

@@ -88,7 +88,6 @@ public final class SkinRestorer {
         SkinRestorer.registerDefaultSkinProvider(MojangSkinProvider.PROVIDER_NAME, SkinProvider.MOJANG, SkinRestorer.getConfig().providersConfig().mojang());
         SkinRestorer.registerDefaultSkinProvider(ElyBySkinProvider.PROVIDER_NAME, SkinProvider.ELY_BY, SkinRestorer.getConfig().providersConfig().ely_by());
         SkinRestorer.registerDefaultSkinProvider(MineskinSkinProvider.PROVIDER_NAME, SkinProvider.MINESKIN, SkinRestorer.getConfig().providersConfig().mineskin());
-        SkinRestorer.registerDefaultSkinProvider(CollectionSkinProvider.PROVIDER_NAME, SkinProvider.COLLECTION, SkinRestorer.getConfig().providersConfig().collection());
     }
     
     private static void registerDefaultSkinProvider(String defaultName, SkinProvider provider, BuiltInProviderConfig config) {
@@ -107,7 +106,6 @@ public final class SkinRestorer {
         MojangSkinProvider.reload();
         ElyBySkinProvider.reload();
         MineskinSkinProvider.reload();
-        CollectionSkinProvider.reload();
     }
     
     public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value, boolean save) {

common/src/main/java/net/lionarius/skinrestorer/config/Config.java

@@ -22,8 +22,6 @@ public final class Config implements GsonPostProcessable {
     
     private boolean fetchSkinOnFirstJoin = true;
     
-    private boolean forceFirstJoinSkinFetch = false;
-    
     private FirstJoinSkinProvider firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
     
     private String proxy = "";
@@ -49,10 +47,6 @@ public final class Config implements GsonPostProcessable {
         return this.fetchSkinOnFirstJoin;
     }
     
-    public boolean forceFirstJoinSkinFetch() {
-        return this.forceFirstJoinSkinFetch;
-    }
-    
     public FirstJoinSkinProvider firstJoinSkinProvider() {
         return this.firstJoinSkinProvider;
     }

common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java

@@ -1,7 +1,6 @@
 package net.lionarius.skinrestorer.config;
 
 import com.google.gson.annotations.SerializedName;
-import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
 import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
 import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 
@@ -9,9 +8,7 @@ public enum FirstJoinSkinProvider {
     @SerializedName(value = "MOJANG", alternate = {"mojang"})
     MOJANG(MojangSkinProvider.PROVIDER_NAME),
     @SerializedName(value = "ELY.BY", alternate = {"ely.by", "ELY_BY", "ely_by"})
-    ELY_BY(ElyBySkinProvider.PROVIDER_NAME),
-    @SerializedName(value = "COLLECTION", alternate = {"collection"})
-    COLLECTION(CollectionSkinProvider.PROVIDER_NAME);
+    ELY_BY(ElyBySkinProvider.PROVIDER_NAME);
     
     private final String name;
     

common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java

@@ -8,13 +8,8 @@ public abstract class BuiltInProviderConfig implements GsonPostProcessable {
     protected String name;
     protected CacheConfig cache;
     
-    
     public BuiltInProviderConfig(String name, CacheConfig cache) {
-        this(name, cache, true);
-    }
-    
-    public BuiltInProviderConfig(String name, CacheConfig cache, boolean enabled) {
-        this.enabled = enabled;
+        this.enabled = true;
         this.name = name;
         this.cache = cache;
     }

common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java

@@ -1,27 +1,23 @@
 package net.lionarius.skinrestorer.config.provider;
 
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.provider.collection.CollectionProviderConfig;
 import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
 public final class ProvidersConfig implements GsonPostProcessable {
     public static final ProvidersConfig DEFAULT = new ProvidersConfig(
             new MojangProviderConfig(),
             new ElyByProviderConfig(),
-            new MineskinProviderConfig(),
-            new CollectionProviderConfig()
+            new MineskinProviderConfig()
     );
     
     private MojangProviderConfig mojang;
     private ElyByProviderConfig ely_by;
     private MineskinProviderConfig mineskin;
-    private CollectionProviderConfig collection;
     
-    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin, CollectionProviderConfig collection) {
+    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) {
         this.mojang = mojang;
         this.ely_by = ely_by;
         this.mineskin = mineskin;
-        this.collection = collection;
     }
     
     public MojangProviderConfig mojang() {
@@ -36,10 +32,6 @@ public final class ProvidersConfig implements GsonPostProcessable {
         return this.mineskin;
     }
     
-    public CollectionProviderConfig collection() {
-        return this.collection;
-    }
-    
     @Override
     public void gsonPostProcess() {
         if (this.mojang == null) {
@@ -56,10 +48,5 @@ public final class ProvidersConfig implements GsonPostProcessable {
             SkinRestorer.LOGGER.warn("Mineskin provider config is null, using default");
             this.mineskin = ProvidersConfig.DEFAULT.mineskin();
         }
-        
-        if (this.collection == null) {
-            SkinRestorer.LOGGER.warn("Collection provider config is null, using default");
-            this.collection = ProvidersConfig.DEFAULT.collection();
-        }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java

@@ -1,32 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import com.google.gson.annotations.JsonAdapter;
-import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
-import net.lionarius.skinrestorer.config.provider.CacheConfig;
-import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class CollectionProviderConfig extends BuiltInProviderConfig implements GsonPostProcessable {
-    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 604800);
-    
-    @JsonAdapter(CollectionSkinSourceListDeserializer.class)
-    private List<CollectionSkinSource> sources = new ArrayList<>();
-    
-    public CollectionProviderConfig() {
-        super(CollectionSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE, false);
-    }
-    
-    public List<CollectionSkinSource> sources() {
-        return this.sources;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.sources == null) {
-            this.sources = new ArrayList<>();
-        }
-    }
-}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java

@@ -1,60 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public final class CollectionSkinFile implements CollectionSkinSource, GsonPostProcessable {
-    private String path = "";
-    private SkinVariant variant = SkinVariant.CLASSIC;
-    
-    @Override
-    public @Nullable URI uri() {
-        if (this.path.isEmpty())
-            return null;
-        
-        try {
-            var filePath = SkinRestorer.getConfigDir().resolve(this.path);
-            
-            if (!Files.exists(filePath)) {
-                SkinRestorer.LOGGER.warn("Skin file does not exist: {}", this.path);
-                return null;
-            }
-            
-            if (!Files.isRegularFile(filePath)) {
-                SkinRestorer.LOGGER.warn("Skin path is not a file: {}", this.path);
-                return null;
-            }
-            
-            if (!this.path.toLowerCase().endsWith(".png")) {
-                SkinRestorer.LOGGER.warn("Skin file is not a PNG file: {}", this.path);
-                return null;
-            }
-            
-            return filePath.toUri();
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.warn("Invalid file path: {}", this.path, e);
-            return null;
-        }
-    }
-    
-    @Override
-    public SkinVariant variant() {
-        return this.variant;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.path == null) {
-            this.path = "";
-        }
-        if (this.variant == null) {
-            this.variant = SkinVariant.CLASSIC;
-        }
-    }
-}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java

@@ -1,12 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-
-public interface CollectionSkinSource {
-    @Nullable URI uri();
-    
-    SkinVariant variant();
-}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java

@@ -1,35 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CollectionSkinSourceListDeserializer implements JsonSerializer<List<CollectionSkinSource>>, JsonDeserializer<List<CollectionSkinSource>> {
-    @Override
-    public JsonElement serialize(List<CollectionSkinSource> src, Type typeOfT, JsonSerializationContext context) {
-        return context.serialize(src, List.class);
-    }
-    
-    @Override
-    public List<CollectionSkinSource> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
-        List<CollectionSkinSource> sources = new ArrayList<>();
-        
-        if (json.isJsonArray()) {
-            for (JsonElement element : json.getAsJsonArray()) {
-                if (element.isJsonObject()) {
-                    JsonObject obj = element.getAsJsonObject();
-                    if (obj.has("url")) {
-                        sources.add(context.deserialize(obj, CollectionSkinUrl.class));
-                    } else if (obj.has("path")) {
-                        sources.add(context.deserialize(obj, CollectionSkinFile.class));
-                    }
-                }
-            }
-        }
-        
-        return sources;
-    }
-}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java

@@ -1,41 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-
-public final class CollectionSkinUrl implements CollectionSkinSource, GsonPostProcessable {
-    private String url = "";
-    private SkinVariant variant = SkinVariant.CLASSIC;
-    
-    @Override
-    public @Nullable URI uri() {
-        try {
-            if (this.url.isEmpty())
-                return null;
-            
-            return new URI(this.url);
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.warn("Invalid URI: {}", this.url, e);
-            return null;
-        }
-    }
-    
-    @Override
-    public SkinVariant variant() {
-        return this.variant;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.url == null) {
-            this.url = "";
-        }
-        if (this.variant == null) {
-            this.variant = SkinVariant.CLASSIC;
-        }
-    }
-}

common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java

@@ -2,7 +2,6 @@ package net.lionarius.skinrestorer.mixin;
 
 import com.mojang.authlib.GameProfile;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.FirstJoinSkinProvider;
 import net.lionarius.skinrestorer.skin.SkinValue;
 import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.util.PlayerUtils;
@@ -54,15 +53,9 @@ public abstract class ServerLoginPacketListenerImplMixin {
                     return null;
                 }
                 
-                var config = SkinRestorer.getConfig();
-                var provider = config.firstJoinSkinProvider();
-                
-                var shouldFetch = (originalSkin == null && config.fetchSkinOnFirstJoin()) ||
-                                      (originalSkin != null && config.forceFirstJoinSkinFetch() && provider != FirstJoinSkinProvider.MOJANG);
-                
-                if (shouldFetch) {
+                if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
                     var context = new SkinProviderContext(
-                            provider.getName(),
+                            SkinRestorer.getConfig().firstJoinSkinProvider().getName(),
                             profile.getName(),
                             null
                     );

common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java

@@ -5,8 +5,10 @@ import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.util.PlayerUtils;
 import net.minecraft.Util;
 import net.minecraft.server.Services;
+import net.minecraft.server.players.GameProfileCache;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -21,14 +23,20 @@ import java.util.function.BooleanSupplier;
 @Mixin(SkullBlockEntity.class)
 public abstract class SkullBlockEntityMixin {
     
-    @Inject(method = "loadProfile", at = @At("HEAD"),
+    @Shadow
+    private static GameProfileCache profileCache;
+    
+    @Inject(method = "fetchGameProfile", at = @At("HEAD"),
             cancellable = true)
-    private static void fetchProfileByName(String name, Services services, BooleanSupplier hasCache, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+    private static void fetchProfileByName(String name, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+        if (profileCache == null)
+            return;
+        
         if (name == null)
             return;
         
         var profileOpt = Optional.<GameProfile>empty();
-        var gameProfileInfo = ((GameProfileCacheAccessor) services.profileCache()).getProfilesByName().get(name.toLowerCase(Locale.ROOT));
+        var gameProfileInfo = ((GameProfileCacheAccessor) profileCache).getProfilesByName().get(name.toLowerCase(Locale.ROOT));
         
         if (gameProfileInfo != null)
             profileOpt = Optional.of(gameProfileInfo.getProfile());

common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java

@@ -1,11 +1,8 @@
 package net.lionarius.skinrestorer.skin;
 
-import com.google.gson.annotations.SerializedName;
-
 public enum SkinVariant {
-    @SerializedName(value = "classic", alternate = {"CLASSIC"})
+    
     CLASSIC("classic"),
-    @SerializedName(value = "slim", alternate = {"SLIM"})
     SLIM("slim");
     
     private final String name;

common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java

@@ -1,91 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.mojang.authlib.properties.Property;
-import it.unimi.dsi.fastutil.Pair;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.provider.collection.CollectionSkinSource;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.Result;
-import org.jetbrains.annotations.NotNull;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-public final class CollectionSkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "collection";
-    
-    private static LoadingCache<Integer, Optional<Property>> SKIN_CACHE;
-    
-    private static List<Pair<URI, SkinVariant>> COLLECTION_SKINS;
-    
-    public static void reload() {
-        COLLECTION_SKINS = loadCollectionSkins();
-        
-        createCache();
-    }
-    
-    private static List<Pair<URI, SkinVariant>> loadCollectionSkins() {
-        List<Pair<URI, SkinVariant>> skins = new ArrayList<>();
-        
-        var config = SkinRestorer.getConfig().providersConfig().collection();
-        
-        for (CollectionSkinSource source : config.sources()) {
-            var uri = source.uri();
-            if (uri != null) {
-                skins.add(Pair.of(uri, source.variant()));
-            }
-        }
-        
-        return skins;
-    }
-    
-    private static void createCache() {
-        var config = SkinRestorer.getConfig().providersConfig().collection();
-        var time = config.cache().enabled() ? config.cache().duration() : 0;
-        
-        SKIN_CACHE = CacheBuilder.newBuilder()
-                .expireAfterWrite(time, TimeUnit.SECONDS)
-                .build(new CacheLoader<>() {
-                    @Override
-                    public @NotNull Optional<Property> load(@NotNull Integer key) throws Exception {
-                        var skinEntry = COLLECTION_SKINS.get(key);
-                        return MineskinSkinProvider.loadSkin(skinEntry.first(), skinEntry.second());
-                    }
-                });
-    }
-    
-    @Override
-    public String getArgumentName() {
-        return "seed";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
-        if (COLLECTION_SKINS.isEmpty()) {
-            return Result.error(new IllegalStateException("No collection skins configured"));
-        }
-        
-        var skinIndex = Math.abs(argument.hashCode()) % COLLECTION_SKINS.size();
-        
-        try {
-            return Result.success(SKIN_CACHE.get(skinIndex));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
-        } catch (Exception e) {
-            return Result.error(e);
-        }
-    }
-}

common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java

@@ -22,8 +22,6 @@ import org.mineskin.response.QueueResponse;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -96,18 +94,13 @@ public final class MineskinSkinProvider implements SkinProvider {
         }
     }
     
-    static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
+    private static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
         var mineskinVariant = switch (variant) {
             case CLASSIC -> Variant.CLASSIC;
             case SLIM -> Variant.SLIM;
         };
         
-        var request = "file".equals(uri.getScheme())
-                ? GenerateRequest.upload(Files.newInputStream(Path.of(uri)))
-                .variant(mineskinVariant)
-                .name("skinrestorer-skin")
-                .visibility(Visibility.UNLISTED)
-                : GenerateRequest.url(uri)
+        var request = GenerateRequest.url(uri)
                 .variant(mineskinVariant)
                 .name("skinrestorer-skin")
                 .visibility(Visibility.UNLISTED);

common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java

@@ -13,7 +13,6 @@ public interface SkinProvider {
     MojangSkinProvider MOJANG = new MojangSkinProvider();
     ElyBySkinProvider ELY_BY = new ElyBySkinProvider();
     MineskinSkinProvider MINESKIN = new MineskinSkinProvider();
-    CollectionSkinProvider COLLECTION = new CollectionSkinProvider();
     SkinShuffleSkinProvider SKIN_SHUFFLE = new SkinShuffleSkinProvider();
     
     Set<String> BUILTIN_PROVIDER_NAMES = ImmutableSet.of(
@@ -21,7 +20,6 @@ public interface SkinProvider {
             MojangSkinProvider.PROVIDER_NAME,
             ElyBySkinProvider.PROVIDER_NAME,
             MineskinSkinProvider.PROVIDER_NAME,
-            CollectionSkinProvider.PROVIDER_NAME,
             SkinShuffleSkinProvider.PROVIDER_NAME
     );
     

common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java

@@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import net.lionarius.skinrestorer.mixin.ChunkMapAccessor;
+import net.lionarius.skinrestorer.mixin.TrackedEntityAccessorInvoker;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.ChunkMap;
@@ -66,12 +67,7 @@ public final class PlayerUtils {
         }
         
         if (!player.isDeadOrDying()) {
-            player.connection.send(new ClientboundBundlePacket(
-                    List.of(
-                            new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA),
-                            new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0)
-                    )
-            ));
+            player.connection.send(new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA));
             player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
             player.connection.send(new ClientboundSetEntityMotionPacket(player));
             var vehicle = player.getVehicle();

fabric/gradle.properties

@@ -1,6 +1,6 @@
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
-fabric_api_version=0.91.1+1.20.3
+fabric_api_version=0.89.0+1.20.2
 
 optional_dependencies=fabric-api
 additional_modloaders=quilt

fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java

@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MinecraftServerMixin {
     
     @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0))
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0))
     private void onServerStarted(CallbackInfo ci) {
         SkinRestorer.Events.onServerStarted((MinecraftServer) (Object) this);
     }

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=49.0.1
-forge_loader_version_range=[49,)
+forge_version=48.0.0
+forge_loader_version_range=[48,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.20.3
+forge_minecraft_version=1.20.2

gradle.properties

@@ -3,12 +3,12 @@ group=net.lionarius
 java_version=17
 
 # Common
-minecraft_version=1.20.3
-minecraft_version_list=1.20.3,1.20.4
-minecraft_version_range=[1.20.3,1.20.4]
+minecraft_version=1.20.2
+minecraft_version_list=1.20.2
+minecraft_version_range=1.20.2
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.5.0
+mod_version=2.4.3
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer
@@ -18,11 +18,11 @@ credits=
 description=A server-side mod for managing skins.
 
 # Dependencies
-mineskin_client_version=3.2.1-SNAPSHOT
+mineskin_client_version=3.0.6-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.20.3
-parchment_version=2023.12.31
+parchment_minecraft=1.20.2
+parchment_version=2023.12.10
 
 # Publishing
 curseforge_id=443823

neoforge/gradle.properties

@@ -1,3 +1,3 @@
 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=20.3.1-beta
+neoforge_version=20.2.3-beta
 neoforge_loader_version_range=[1,)