From acb6e0bb304e6aa6ee53242d5da9331ba3c7202b Mon Sep 17 00:00:00 2001 From: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Sat, 25 Apr 2026 13:28:39 +0200 Subject: [PATCH] Skybox III clean up GameRendererMixin --- .../mixin/client/GameRendererMixin.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/common/src/main/java/io/github/slimeistdev/crystalline_sky/mixin/client/GameRendererMixin.java b/common/src/main/java/io/github/slimeistdev/crystalline_sky/mixin/client/GameRendererMixin.java index 52ef6b2..91dedf6 100644 --- a/common/src/main/java/io/github/slimeistdev/crystalline_sky/mixin/client/GameRendererMixin.java +++ b/common/src/main/java/io/github/slimeistdev/crystalline_sky/mixin/client/GameRendererMixin.java @@ -7,16 +7,13 @@ import com.mojang.datafixers.util.Pair; import io.github.slimeistdev.crystalline_sky.registry.client.CrystallineShaderInstances; import net.minecraft.client.Camera; import net.minecraft.client.DeltaTracker; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.server.packs.resources.ResourceProvider; import org.joml.Matrix4f; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -28,13 +25,6 @@ import static io.github.slimeistdev.crystalline_sky.util.SharedRenderVariables.i @Mixin(GameRenderer.class) public abstract class GameRendererMixin { - @Shadow - @Final - Minecraft minecraft; - - @Shadow - public abstract float getDepthFar(); - @Unique private static final Matrix4f crystalline_sky$scratch = new Matrix4f(); @@ -58,18 +48,6 @@ public abstract class GameRendererMixin { return original.call(instance, e); } - @WrapOperation(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;getProjectionMatrix(D)Lorg/joml/Matrix4f;")) - private Matrix4f storeInverseProjectionMatrix(GameRenderer instance, double fov, Operation original) { - invSkyboxMat.setPerspective( - (float)(fov * (float) (Math.PI / 180.0)), - (float)this.minecraft.getWindow().getWidth() / this.minecraft.getWindow().getHeight(), - 0.05F, - this.getDepthFar() - ).invert(); - // TODO: do we need inv view multiplied in here? - return original.call(instance, fov); - } - @WrapOperation(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderLevel(Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V")) private void mulInvViewMat(LevelRenderer instance, DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f frustumMatrix, Matrix4f projectionMatrix, Operation original) { // invSkyboxMat = inv(ModelViewMat) * inv(ProjMat)