Merge branch '1.21.4' into 1.21.3

# Conflicts: # README.md # build.gradle.kts
senseiwells · Dec 21, 2024 · e702aee · e702aee
2 parents 4e276c2 + 0f6a6fb
commit e702aee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -450,7 +450,7 @@ repositories {
 }
 
 dependencies {
-    modImplementation("me.senseiwells:server-replay:1.2.4+1.21.3")
+    modImplementation("me.senseiwells:server-replay:1.2.8+1.21.3")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,7 @@ repositories {
 }
 
 
-val modVersion = "1.2.7"
+val modVersion = "1.2.8"
 val releaseVersion = "${modVersion}+mc${libs.versions.minecraft.get()}"
 version = releaseVersion
 group = "me.senseiwells"
@@ -119,7 +119,7 @@ tasks {
         file = remapJar.get().archiveFile
         changelog.set(
             """
-            - Added `"ignore_action_bar_packets"` option
+            - Fix a compatability issue with polymer
             """.trimIndent()
         )
         type = STABLE

diff --git a/src/main/java/me/senseiwells/replay/mixin/player/ServerCommonPacketListenerImplMixin.java b/src/main/java/me/senseiwells/replay/mixin/player/ServerCommonPacketListenerImplMixin.java
@@ -15,7 +15,9 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ServerCommonPacketListenerImpl.class)
+// We want to apply our #send mixin *LAST*, any
+// other mods which modify the packs should come first
+@Mixin(value = ServerCommonPacketListenerImpl.class, priority = 5000)
 public abstract class ServerCommonPacketListenerImplMixin {
 	@Shadow protected abstract GameProfile playerProfile();
-Original file line number
+Diff line change
@@ Expand Up / @@ -450,7 +450,7 @@ repositories { @@
     }
     dependencies {
-        modImplementation("me.senseiwells:server-replay:1.2.4+1.21.3")
+        modImplementation("me.senseiwells:server-replay:1.2.8+1.21.3")
     }
     ```
@@ Expand Down @@