[Issue] - Fix HudElementRegistry.replaceElement() for subtitles during gameplay.

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiMixin.java

@@ -159,9 +159,4 @@ private void wrapChat(Gui instance, GuiGraphics context, DeltaTracker tickCounte
 	private void wrapPlayerList(Gui instance, GuiGraphics context, DeltaTracker tickCounter, Operation<Void> renderVanilla) {
 		HudElementRegistryImpl.getRoot(VanillaHudElements.PLAYER_LIST).render(context, tickCounter, (ctx, tc) -> renderVanilla.call(instance, ctx, tc));
 	}
-
-	@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderSubtitleOverlay(Lnet/minecraft/client/gui/GuiGraphics;Z)V"))
-	private void wrapSubtitlesHud(Gui instance, GuiGraphics context, boolean bl, Operation<Void> renderVanilla, @Local(argsOnly = true) DeltaTracker tickCounter) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.SUBTITLES).render(context, tickCounter, (ctx, tc) -> renderVanilla.call(instance, ctx, bl));
-	}
 }

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubtitleOverlayMixin.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.mixin.client.rendering;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.SubtitleOverlay;
+
+import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
+import net.fabricmc.fabric.impl.client.rendering.hud.HudElementRegistryImpl;
+
+@Mixin(SubtitleOverlay.class)
+public class SubtitleOverlayMixin {
+	@Unique
+	private boolean fabric_renderingThroughHud = false;
+
+	@Inject(method = "render", at = @At("HEAD"), cancellable = true)
+	private void wrapSubtitleRender(GuiGraphics context, CallbackInfo ci) {
+		if (!fabric_renderingThroughHud) {
+			DeltaTracker deltaTracker = Minecraft.getInstance().getDeltaTracker();
+
+			ci.cancel();
+
+			HudElementRegistryImpl.getRoot(VanillaHudElements.SUBTITLES)
+					.render(context, deltaTracker, (ctx, tc) -> {
+						fabric_renderingThroughHud = true;
+
+						try {
+							fabric_callOriginalRender(ctx);
+						} finally {
+							fabric_renderingThroughHud = false;
+						}
+					});
+		}
+	}
+
+	@Unique
+	private void fabric_callOriginalRender(GuiGraphics context) {
+		((SubtitleOverlay) (Object) this).render(context);
+	}
+}

fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json

@@ -23,6 +23,7 @@
     "GuiRendererMixin",
     "GuiAccessor",
     "GuiMixin",
+    "SubtitleOverlayMixin",
     "LivingEntityRendererAccessor",
     "LivingEntityRendererMixin",
     "ModelMixin",