From 6dc662b6c6b0f3d9b0c9bb4bb007cc034a625f98 Mon Sep 17 00:00:00 2001
From: JustRed23 <manuel.bormans@gmail.com>
Date: Mon, 25 Nov 2024 19:23:30 +0100
Subject: [PATCH] Fix AFTER_SETUP event not being able to render (#4219)

* Add BEFORE_TERRAIN world render event

* Add 1.21.2 rendering issue warning

* Add comment to injection point

* close b tag

* Undo all new event changes

* Move AFTER_SETUP event to new mixin

* Remove event interface

* Refine mixin

(cherry picked from commit 69228316a925a5727f40c0cf4560ecfa01d8e5cb)
---
 .../mixin/client/rendering/WorldRendererMixin.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/WorldRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/WorldRendererMixin.java
index ed3e7b9aa..dc67a43ca 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/WorldRendererMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/WorldRendererMixin.java
@@ -79,6 +79,18 @@ public abstract class WorldRendererMixin {
 	@Inject(method = "setupTerrain", at = @At("RETURN"))
 	private void afterTerrainSetup(Camera camera, Frustum frustum, boolean hasForcedFrustum, boolean spectator, CallbackInfo ci) {
 		context.setFrustum(frustum);
+	}
+
+	@Inject(
+			method = "method_62214",
+			at = @At(
+				value = "INVOKE_STRING",
+				target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V",
+				args = "ldc=terrain",
+				shift = Shift.AFTER
+			) // Points to after profiler.push("terrain");
+	)
+	private void beforeTerrainSolid(CallbackInfo ci) {
 		WorldRenderEvents.AFTER_SETUP.invoker().afterSetup(context);
 	}