Merge branch '1.20.3-multiloader' into 1.20.2-multiloader

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

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/util/PlayerUtils.java

@@ -66,12 +66,7 @@ public final class PlayerUtils {
         }
         
         if (!player.isDeadOrDying()) {
-            player.connection.send(new ClientboundBundlePacket(
+            player.connection.send(new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA));
-                    List.of(
-                            new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA),
-                            new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0)
-                    )
-            ));
             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_version=48.0.0
-forge_loader_version_range=[49,)
+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,9 +3,9 @@ group=net.lionarius
 java_version=17
 
 # Common
-minecraft_version=1.20.3
+minecraft_version=1.20.2
-minecraft_version_list=1.20.3,1.20.4
+minecraft_version_list=1.20.2
-minecraft_version_range=[1.20.3,1.20.4]
+minecraft_version_range=1.20.2
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.5.0
@@ -21,8 +21,8 @@ description=A server-side mod for managing skins.
 mineskin_client_version=3.2.1-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.20.3
+parchment_minecraft=1.20.2
-parchment_version=2023.12.31
+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,)