Merge branch '1.19.3-multiloader' into 1.19.1-multiloader

# Conflicts:
#	gradle.properties

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

@@ -9,11 +9,25 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
-public record SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
-                        @Nullable Property value, @Nullable Property originalValue) implements GsonPostProcessable {
+public final class SkinValue implements GsonPostProcessable {
     
     public static final SkinValue EMPTY = new SkinValue(EmptySkinProvider.PROVIDER_NAME, null, null, null);
     
+    private @NotNull String provider;
+    private @Nullable String argument;
+    private @Nullable SkinVariant variant;
+    private @Nullable Property value;
+    private @Nullable Property originalValue;
+    
+    public SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
+            @Nullable Property value, @Nullable Property originalValue) {
+        this.provider = provider;
+        this.argument = argument;
+        this.variant = variant;
+        this.value = value;
+        this.originalValue = originalValue;
+    }
+    
     public SkinValue(String provider, String argument, SkinVariant variant, Property value) {
         this(provider, argument, variant, value, null);
     }
@@ -38,4 +52,23 @@ public record SkinValue(@NotNull String provider, @Nullable String argument, @Nu
     public void gsonPostProcess() {
         Objects.requireNonNull(this.provider);
     }
+    
+    public @NotNull String provider() {
+        return provider;
+    }
+    
+    public @Nullable String argument() {
+        return argument;
+    }
+    
+    public @Nullable SkinVariant variant() {
+        return variant;}
+    
+    public @Nullable Property value() {
+        return value;
+    }
+    
+    public @Nullable Property originalValue() {
+        return originalValue;
+    }
 }

common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java

@@ -39,11 +39,11 @@ public final class Translation {
     }
     
     public static MutableComponent translatableWithFallback(String key) {
-        return Component.translatableWithFallback(key, Translation.get(key));
+        return Component.translatable(Translation.get(key));
     }
     
     public static MutableComponent translatableWithFallback(String key, Object... args) {
-        return Component.translatableWithFallback(key, Translation.get(key), args);
+        return Component.translatable(Translation.get(key), args);
     }
     
     public static void reloadTranslations() {

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

@@ -44,12 +44,8 @@ public final class PlayerUtils {
         PlayerList playerList = serverLevel.getServer().getPlayerList();
         ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
         
-        playerList.broadcastAll(new ClientboundBundlePacket(
-                List.of(
-                        new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())),
-                        ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player))
-                )
-        ));
+        playerList.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, player));
+        playerList.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, player));
         
         var trackedEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
         if (trackedEntity != null) {
@@ -77,7 +73,7 @@ public final class PlayerUtils {
                             player.gameMode.getPreviousGameModeForPlayer(),
                             player.getLevel().isDebug(),
                             player.getLevel().isFlat(),
-                            (byte) 3,
+                            true,
                             player.getLastDeathLocation()
                     )
             );

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=45.0.0
-forge_loader_version_range=[45,)
+forge_version=42.0.0
+forge_loader_version_range=[42,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.19.4
+forge_minecraft_version=1.19.1

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=17
 
 # Common
-minecraft_version=1.19.4
-minecraft_version_list=1.19.4
-minecraft_version_range=[1.19.4,1.20)
+minecraft_version=1.19.1
+minecraft_version_list=1.19.1,1.19.2
+minecraft_version_range=[1.19.1,1.19.2]
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.4.3
@@ -21,8 +21,8 @@ description=A server-side mod for managing skins.
 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.19.4
-parchment_version=2023.06.26
+parchment_minecraft=1.19.2
+parchment_version=2022.11.27
 
 # Publishing
 curseforge_id=443823