From 3705afb5938ee9dd6c907c3d54829070d9da43e9 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Wed, 25 Mar 2026 23:36:00 +0100 Subject: [PATCH] Saturn Screen 1.21.6 small patches --- .../impl/ui/SaturnScreenFabric.java | 27 +++---------------- .../saturnclient/event/KeyInputHandler.java | 1 - 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/versions/1.21.6/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java b/versions/1.21.6/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java index 2541142..435003c 100644 --- a/versions/1.21.6/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java +++ b/versions/1.21.6/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java @@ -3,21 +3,17 @@ package org.saturnclient.impl.ui; import java.time.Duration; import java.time.Instant; -import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.SaturnScreen.ScreenProvider; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.gui.CubeMapRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.RotatingCubeMapRenderer; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.render.DefaultFramebufferSet; import net.minecraft.client.texture.ResourceTexture; import net.minecraft.client.texture.TextureManager; -import net.minecraft.client.util.Pool; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -32,7 +28,6 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider { ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER); } - private final Pool pool = new Pool(3); public final SaturnScreen screen; public static void preload(MinecraftClient client) { @@ -56,7 +51,6 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider { screen.init(); } - @SuppressWarnings("deprecation") @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { if (screen.start == null) { @@ -67,24 +61,9 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider { mouseX *= 2; mouseY *= 2; - // if (client.world == null && client.getCurrentServerEntry() == null) { - // ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, - // screen.backgroundOpacity, delta); - // } - - // PostEffectProcessor postEffectProcessor = - // this.client.getShaderLoader().loadPostEffect( - // Identifier.ofVanilla("blur"), - // DefaultFramebufferSet.MAIN_ONLY); - - // if (postEffectProcessor != null) { - // float radius = screen.backgroundBlur * Math.min((float) elapsed / 700, 1.0f); - // postEffectProcessor.render( - // this.client.getFramebuffer(), - // this.pool, - // pass -> pass.setUniform("Radius", radius) - // ); - // } + if (client.world == null && client.getCurrentServerEntry() == null) { + ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, true); + } RenderScope renderScope = new RenderScopeImpl(context); diff --git a/versions/1.21.6/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/versions/1.21.6/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java index 8e289e2..b1bae03 100644 --- a/versions/1.21.6/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java +++ b/versions/1.21.6/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java @@ -7,7 +7,6 @@ import net.minecraft.client.util.InputUtil; import org.saturnclient.config.Config; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.client.ServiceClient; import org.saturnclient.common.provider.Providers; import org.saturnclient.ui.screens.EmoteWheel; import org.saturnclient.ui.screens.ShiftMenu;