Merge branch 'refs/heads/1.20.3-multiloader' into 1.20.2-multiloader

# Conflicts:
#	gradle.properties

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

@@ -9,11 +9,7 @@ import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.*;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import net.minecraft.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -67,7 +63,7 @@ public final class ElyBySkinProvider implements SkinProvider {
     @Override
     public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
         try {
-            if (!StringUtil.isValidPlayerName(username))
+            if (!StringUtils.isValidPlayerName(username))
                 throw new IllegalArgumentException("invalid username");
             
             var usernameLowerCase = username.toLowerCase(Locale.ROOT);

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

@@ -10,12 +10,8 @@ import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import com.mojang.util.UndashedUuid;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.*;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
 import net.minecraft.server.players.GameProfileCache;
-import net.minecraft.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -91,7 +87,7 @@ public final class MojangSkinProvider implements SkinProvider {
     @Override
     public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
         try {
-            if (!StringUtil.isValidPlayerName(username))
+            if (!StringUtils.isValidPlayerName(username))
                 throw new IllegalArgumentException("invalid username");
             
             var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);

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

@@ -67,12 +67,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();
@@ -86,13 +81,13 @@ public final class PlayerUtils {
             playerList.sendPlayerPermissionLevel(player);
             playerList.sendLevelInfo(player, serverLevel);
             playerList.sendAllPlayerInfo(player);
-            playerList.sendActivePlayerEffects(player);
+            PlayerUtils.sendActivePlayerEffects(player);
         }
     }
     
     private static void sendActivePlayerEffects(ServerPlayer player) {
         for (var effect : player.getActiveEffects()) {
-            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false));
+            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect));
         }
     }
     

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.onServerStarted((MinecraftServer) (Object) this);
     }

forge/build.gradle

@@ -20,8 +20,6 @@ minecraft {
 
     copyIdeResources = true //Calls processResources when in dev
 
-    reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG
-
     // Automatically enable forge AccessTransformers if the file exists
     // This location is hardcoded in Forge and can not be changed.
     // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123

gradle.properties

@@ -1,11 +1,11 @@
 # Project
 group=net.lionarius.skinrestorer
-java_version=21
+java_version=17
 
 # Common
-minecraft_version=1.21
+minecraft_version=1.20.2
-minecraft_version_list=1.21,1.21.1
+minecraft_version_list=1.20.2
-minecraft_version_range=[1.21, 1.22)
+minecraft_version_range=1.20.2
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.1.0
@@ -18,21 +18,21 @@ credits=
 description=A server-side mod for managing skins.
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.21
+parchment_minecraft=1.20.2
-parchment_version=2024.07.28
+parchment_version=2023.12.10
 
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
 
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=51.0.0
+forge_version=48.0.0
-forge_loader_version_range=[51,)
+forge_loader_version_range=[48,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.21
+forge_minecraft_version=1.20.2
 
 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=21.0.0-beta
+neoforge_version=20.2.3-beta
-neoforge_loader_version_range=[4,)
+neoforge_loader_version_range=[1,)
 
 # Publishing
 curseforge_id=443823

neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java

@@ -3,14 +3,13 @@ package net.lionarius.skinrestorer.neoforge;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.command.SkinCommand;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 
 @Mod(SkinRestorer.MOD_ID)
-@EventBusSubscriber(modid = SkinRestorer.MOD_ID)
+@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID)
 public final class SkinRestorerNeoForge {
     
     public SkinRestorerNeoForge() {

neoforge/src/main/resources/META-INF/mods.toml

@@ -17,14 +17,14 @@ config = "${mod_id}.mixins.json"
 
 [[dependencies.${mod_id}]]
 modId = "neoforge"
-type = "required"
+mandatory = true
 versionRange = "[${neoforge_version},)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
-type = "required"
+mandatory = true
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"