Fix #61

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/ServerResourcePackManagerMixin.java

@@ -0,0 +1,33 @@
+package com.github.dimadencep.mods.rrls.mixins.compat;
+
+import com.github.dimadencep.mods.rrls.Rrls;
+import net.minecraft.client.resource.server.PackStateChangeCallback;
+import net.minecraft.client.resource.server.ServerResourcePackManager;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.UUID;
+
+@Mixin(ServerResourcePackManager.class)
+public class ServerResourcePackManagerMixin {
+    @Shadow
+    @Final
+    PackStateChangeCallback stateChangeCallback;
+
+    @Inject(
+            method = "onAdd",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/resource/server/ServerResourcePackManager;onPackChanged()V"
+            )
+    )
+    public void earlyResourcePackStatusSend(UUID id, ServerResourcePackManager.PackEntry pack, CallbackInfo ci) {
+        if (Rrls.MOD_CONFIG.earlyPackStatusSend) {
+            this.stateChangeCallback.onFinish(pack.id, PackStateChangeCallback.FinishState.APPLIED);
+        }
+    }
+}

common/src/main/resources/rrls-common.mixins.json

@@ -7,7 +7,7 @@
     "MinecraftClientMixin",
     "SplashOverlayMixin",
     "TitleScreenMixin",
-    "compat.ClientCommonNetworkHandlerMixin",
+    "compat.ServerResourcePackManagerMixin",
     "compat.OverlayMixin",
     "compat.SplashUseFix"
   ],

common/src/main/resources/rrls.accesswidener

@@ -1,3 +1,5 @@
 accessWidener   v2  named
+accessible field net/minecraft/client/resource/server/ServerResourcePackManager$PackEntry id Ljava/util/UUID;
 accessible field net/minecraft/client/MinecraftClient overlay Lnet/minecraft/client/gui/screen/Overlay;
+accessible class net/minecraft/client/resource/server/ServerResourcePackManager$PackEntry
 accessible class net/minecraft/client/MinecraftClient$LoadingContext

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G
     forge_version = 20.4.73-beta
 
 # Mod Properties
-    mod_version = 3.2.5
+    mod_version = 3.2.6
     maven_group = com.github.dima_dencep.mods
     archives_base_name = rrls