Merge branch '1.19.4-multiloader' into 1.19.3-multiloader

# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java

.gitignore

@@ -30,3 +30,4 @@ bin/
 
 .architectury-transformer/
 run/
+scripts/

CHANGELOG.md

@@ -4,6 +4,12 @@ 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.3.3] - 2025-06-01
+### Fixed
+- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))
+### Removed
+- Removed minecraft 1.19 support
+
 ## [2.3.2] - 2025-05-24
 ### Fixed
 - Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))

CHANGELOG_LATEST.md

@@ -1,2 +1,4 @@
 ### Fixed
-- Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))
+- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))
+### Removed
+- Removed minecraft 1.19 support

buildSrc/src/main/groovy/multiloader-publish.gradle

@@ -3,12 +3,7 @@ plugins {
 }
 
 publishMods {
-    if (project.name == 'fabric')
-        file = remapJar.archiveFile
-    else if (project.name == 'neoforge')
-        file = jar.archiveFile
-    else
-        file = tasks.named('jarJar').get().archiveFile
+    file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
 
     modLoaders.add(project.name)
     type = STABLE

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

@@ -23,12 +23,12 @@ public abstract class ServerLoginPacketListenerImplMixin {
     @Shadow @Nullable
     private GameProfile gameProfile;
     
-    @Unique
-    private CompletableFuture<Void> skinrestorer$pendingSkin;
-    
     @Shadow
     protected abstract GameProfile createFakeProfile(GameProfile original);
     
+    @Unique
+    private CompletableFuture<Void> skinrestorer$pendingSkin;
+    
     @Inject(method = "handleAcceptedLogin", at = @At(value = "HEAD"), cancellable = true)
     public void waitForSkin(CallbackInfo ci) {
         if (skinrestorer$pendingSkin == null) {

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version_list=1.19.3
 minecraft_version_range=[1.19.3,1.19.4)
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.3.2
+mod_version=2.3.3
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer