Merge branch 'refs/heads/1.21.5' into improvement/breakmanager-again

Author: beanbag44

src/main/java/com/lambda/mixin/render/GameRendererMixin.java

@@ -19,11 +19,18 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
+import com.lambda.graphics.RenderMain;
 import com.lambda.gui.DearImGui;
 import com.lambda.gui.LambdaScreen;
 import com.lambda.module.modules.client.ClickGui;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.util.ObjectAllocator;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,4 +44,23 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
             info.cancel();
         }
     }
+
+    /**
+     * Begins our 3d render after the game has rendered the world
+     * <pre>{@code
+     * float m = Math.max(h, (float)(Integer)this.client.options.getFov().getValue());
+     * Matrix4f matrix4f2 = this.getBasicProjectionMatrix(m);
+     * RenderSystem.setProjectionMatrix(matrix4f, ProjectionType.PERSPECTIVE);
+     * Quaternionf quaternionf = camera.getRotation().conjugate(new Quaternionf());
+     * Matrix4f matrix4f3 = (new Matrix4f()).rotation(quaternionf);
+     * this.client.worldRenderer.setupFrustum(camera.getPos(), matrix4f3, matrix4f2);
+     * this.client.worldRenderer.render(this.pool, renderTickCounter, bl, camera, this, matrix4f3, matrix4f);
+     * }</pre>
+     */
+    @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V"))
+    void onRenderWorld(WorldRenderer instance, ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, Operation<Void> original) {
+        original.call(instance, allocator, tickCounter, renderBlockOutline, camera, gameRenderer, positionMatrix, projectionMatrix);
+
+        RenderMain.render3D(positionMatrix, projectionMatrix);
+    }
 }

src/main/java/com/lambda/mixin/render/WorldRendererMixin.java

@@ -17,20 +17,13 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.graphics.RenderMain;
 import com.lambda.module.modules.player.Freecam;
 import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.client.util.ObjectAllocator;
-import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
@@ -43,20 +36,4 @@ private boolean renderIsThirdPerson(Camera camera) {
     private boolean renderSetupTerrainModifyArg(boolean hasForcedFrustum) {
         return Freecam.INSTANCE.isEnabled() || hasForcedFrustum;
     }
-
-    /**
-     * Begins our 3d render after the game has rendered the world
-     * <pre>{@code
-     * profiler.swap("cullEntities");
-     * boolean bl3 = this.getEntitiesToRender(camera, frustum, this.renderedEntities);
-     * this.renderedEntitiesCount = this.renderedEntities.size();
-     * profiler.swap("terrain_setup");
-     * this.setupTerrain(camera, frustum, bl, this.client.player.isSpectator());
-     * profiler.swap("compile_sections");
-     * }</pre>
-     */
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;setupTerrain(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;ZZ)V", shift = At.Shift.AFTER))
-    private void onRenderWorld(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci) {
-        RenderMain.render3D(positionMatrix, projectionMatrix);
-    }
 }

src/main/kotlin/com/lambda/graphics/RenderMain.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.graphics
 
+import com.lambda.Lambda.mc
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
@@ -27,7 +28,12 @@ import com.lambda.graphics.gl.Matrices.resetMatrices
 import com.lambda.graphics.renderer.esp.global.DynamicESP
 import com.lambda.graphics.renderer.esp.global.StaticESP
 import com.lambda.util.math.Vec2d
+import com.mojang.blaze3d.opengl.GlStateManager
+import com.mojang.blaze3d.systems.RenderSystem
+import net.minecraft.client.gl.GlBackend
+import net.minecraft.client.texture.GlTexture
 import org.joml.Matrix4f
+import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER
 
 object RenderMain {
     val projectionMatrix = Matrix4f()
@@ -42,6 +48,14 @@ object RenderMain {
         projectionMatrix.set(projMatrix)
 
         setupGL {
+            val framebuffer = mc.framebuffer
+            val prevFramebuffer = (framebuffer.getColorAttachment() as GlTexture).getOrCreateFramebuffer(
+                (RenderSystem.getDevice() as GlBackend).framebufferManager,
+                null
+            )
+
+            GlStateManager._glBindFramebuffer(GL_FRAMEBUFFER, prevFramebuffer)
+
             RenderEvent.World().post()
             StaticESP.render()
             DynamicESP.render()

src/main/kotlin/com/lambda/gui/DearImGui.kt

@@ -90,7 +90,6 @@ object DearImGui : Loadable {
         )
 
         GlStateManager._glBindFramebuffer(GL_FRAMEBUFFER, prevFramebuffer)
-        glViewport(0, 0, framebuffer.textureWidth, framebuffer.textureHeight)
 
         implGlfw.newFrame()
         implGl3.newFrame()
@@ -103,8 +102,6 @@ object DearImGui : Loadable {
         GuiEvent.EndFrame.post()
 
         implGl3.renderDrawData(ImGui.getDrawData())
-
-        GlStateManager._glBindFramebuffer(GL_FRAMEBUFFER, prevFramebuffer)
     }
 
     fun destroy() {

src/main/kotlin/com/lambda/module/hud/Watermark.kt

@@ -19,7 +19,6 @@ package com.lambda.module.hud
 
 import com.lambda.graphics.texture.TextureOwner.upload
 import com.lambda.gui.Layout
-import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag