Release 2.6.21

build.gradle.kts

@@ -88,6 +88,7 @@ dependencies {
             12006 -> "0.98.0+1.20.6"
             12100 -> "0.100.3+1.21"
             12102 -> "0.106.1+1.21.2"
+            12104 -> "0.111.0+1.21.4"
             else -> throw UnsupportedOperationException()
         }
         val fabricApiModules = mutableListOf(
@@ -166,6 +167,7 @@ dependencies {
 
     if (platform.isFabric) {
         val modMenuVersion = when {
+            mcVersion >= 12104 -> "13.0.0-beta.1"
             mcVersion >= 12102 -> "12.0.0-beta.1"
             mcVersion >= 12100 -> "11.0.0-rc.4"
             mcVersion >= 12006 -> "10.0.0-beta.1"

root.gradle.kts

@@ -203,6 +203,7 @@ defaultTasks("bundleJar")
 preprocess {
     strictExtraMappings.set(true)
 
+    val mc12104 = createNode("1.21.4", 12104, "yarn")
     val mc12102 = createNode("1.21.2", 12102, "yarn")
     val mc12100 = createNode("1.21", 12100, "yarn")
     val mc12006 = createNode("1.20.6", 12006, "yarn")
@@ -233,6 +234,7 @@ preprocess {
     val mc10800 = createNode("1.8", 10800, "srg")
     val mc10710 = createNode("1.7.10", 10710, "srg")
 
+    mc12104.link(mc12102)
     mc12102.link(mc12100)
     mc12100.link(mc12006)
     mc12006.link(mc12004)

settings.gradle.kts

@@ -11,7 +11,7 @@ pluginManagement {
         maven("https://repo.essential.gg/repository/maven-public")
     }
     plugins {
-        id("gg.essential.multi-version.root") version "0.6.4"
+        id("gg.essential.multi-version.root") version "0.6.5"
         id("io.github.goooler.shadow") version "8.1.7"
     }
 }
@@ -41,6 +41,7 @@ val jGuiVersions = listOf(
         "1.20.6",
         "1.21",
         "1.21.2",
+        "1.21.4",
 )
 val replayModVersions = listOf(
         // "1.7.10",
@@ -72,6 +73,7 @@ val replayModVersions = listOf(
         "1.20.6",
         "1.21",
         "1.21.2",
+        "1.21.4",
 )
 
 rootProject.buildFileName = "root.gradle.kts"

src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java

@@ -1,4 +1,4 @@
-//#if MC>=10904
+//#if MC>=10904 && MC<11900
 package com.replaymod.render.blend.mixin;
 
 import net.minecraft.client.render.item.ItemRenderer;

src/main/java/com/replaymod/render/mixin/MixinParticleManager.java

@@ -33,7 +33,12 @@ import net.minecraft.client.render.Camera;
 @Mixin(ParticleManager.class)
 public abstract class MixinParticleManager {
     //#if MC>=11500
+    //#if MC>=12104
+    //$$ @Redirect(method = "renderParticles(Lnet/minecraft/client/render/Camera;FLnet/minecraft/client/render/VertexConsumerProvider$Immediate;Lnet/minecraft/client/particle/ParticleTextureSheet;Ljava/util/Queue;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;render(Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/client/render/Camera;F)V"))
+    //$$ static
+    //#else
     @Redirect(method = "renderParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;buildGeometry(Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/client/render/Camera;F)V"))
+    //#endif
     private void buildOrientedGeometry(Particle particle, VertexConsumer vertexConsumer, Camera camera, float partialTicks) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) MCVer.getMinecraft().gameRenderer).replayModRender_getHandler();
         if (handler == null || !handler.omnidirectional) {
@@ -55,7 +60,7 @@ public abstract class MixinParticleManager {
         }
     }
 
-    private void buildGeometry(Particle particle, VertexConsumer vertexConsumer, Camera camera, float partialTicks) {
+    private static void buildGeometry(Particle particle, VertexConsumer vertexConsumer, Camera camera, float partialTicks) {
         //#if MC<11900
         BlendState blendState = BlendState.getState();
         if (blendState != null) {

src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java

@@ -31,7 +31,9 @@ public abstract class Mixin_ChromaKeyColorSky {
             //#else
             //$$ method = "renderSky(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Matrix4f;FLjava/lang/Runnable;)V",
             //#endif
-            //#if MC>=12102
+            //#if MC>=12104
+            //$$ at = @At("HEAD"),
+            //#elseif MC>=12102
             //$$ at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderPhase$Target;startDrawing()V", shift = At.Shift.AFTER),
             //#else
             //$$ at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V", remap = false, shift = At.Shift.AFTER),

src/main/java/com/replaymod/replay/camera/CameraEntity.java

@@ -42,6 +42,7 @@ import net.minecraft.util.math.Box;
 
 //#if MC>=12002
 //$$ import net.minecraft.client.util.SkinTextures;
+//$$ import net.minecraft.util.math.MathHelper;
 //#endif
 
 //#if MC>=11400
@@ -219,6 +220,11 @@ public class CameraEntity
      * @param roll Roll in degrees
      */
     public void setCameraRotation(float yaw, float pitch, float roll) {
+        //#if MC>=12102
+        //$$ // Note: MC's `setPitch` now forces values into the [-90; 90] range, however the math it uses is incorrect, so
+        //$$ //       we need to wrap our value into the [-180; 180] range first to get correct results.
+        //$$ pitch = MathHelper.wrapDegrees(pitch);
+        //#endif
         this.prevYaw = yaw;
         this.prevPitch = pitch;
         this.yaw = yaw;

src/main/resources/mixins.render.blend.replaymod.json

@@ -16,7 +16,7 @@
     //#if MC<10904
     //$$ "EntityAccessor",
     //#endif
-    //#if MC>=10904
+    //#if MC>=10904 && MC<11900
     "ItemRendererAccessor",
     //#endif
     "ParticleAccessor",

version.txt

@@ -1 +1 @@
-2.6.19
+2.6.21