Merge branch '1.21.5-multiloader' into 1.21-multiloader

# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
#	gradle.properties

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

@@ -50,26 +50,13 @@ public final class MojangSkinProvider implements SkinProvider {
             throw new IllegalArgumentException(e);
         }
         
-        PROFILE_CACHE = new GameProfileCache(new GameProfileRepository() {
-            @Override
-            public void findProfilesByNames(String[] names, ProfileLookupCallback callback) {
-                for (var name : names) {
-                    try {
-                        var profile = MojangSkinProvider.getProfile(name);
-                        callback.onProfileLookupSucceeded(profile);
-                    } catch (IOException e) {
-                        callback.onProfileLookupFailed(name, e);
-                    }
-                }
-            }
-            
-            @Override
-            public Optional<GameProfile> findProfileByName(String name) {
+        PROFILE_CACHE = new GameProfileCache((names, callback) -> {
+            for (var name : names) {
                 try {
                     var profile = MojangSkinProvider.getProfile(name);
-                    return Optional.of(profile);
+                    callback.onProfileLookupSucceeded(profile);
                 } catch (IOException e) {
-                    return Optional.empty();
+                    callback.onProfileLookupFailed(name, e);
                 }
             }
         }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());

fabric/gradle.properties

@@ -1,5 +1,5 @@
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
-fabric_api_version=0.119.5+1.21.5
+fabric_api_version=0.100.1+1.21
 
 optional_dependencies=fabric-api

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=55.0.0
-forge_loader_version_range=[55,)
+forge_version=51.0.0
+forge_loader_version_range=[51,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.21.5
+forge_minecraft_version=1.21

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=21
 
 # Common
-minecraft_version=1.21.5
-minecraft_version_list=1.21.5
-minecraft_version_range=[1.21.5, 1.22)
+minecraft_version=1.21
+minecraft_version_list=1.21,1.21.1,1.21.2,1.21.3,1.21.4
+minecraft_version_range=[1.21, 1.21.4]
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.3.3
@@ -21,8 +21,8 @@ description=A server-side mod for managing skins.
 mineskin_client_version=3.0.1-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.21.5
-parchment_version=2025.04.19
+parchment_minecraft=1.21.1
+parchment_version=2024.11.17
 
 # Publishing
 curseforge_id=443823

neoforge/gradle.properties

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