From 052a56bcb0a0d93ea4c675e577dc5276aa9aa4c1 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Tue, 22 Apr 2025 16:20:35 -0500 Subject: [PATCH] i almost got cooked --- build.gradle | 2 +- src/main/java/org/saturnclient/modules/ModManager.java | 6 +++++- .../java/org/saturnclient/modules/mods/ArmorDisplay.java | 3 ++- .../java/org/saturnclient/modules/mods/FpsDisplay.java | 2 +- .../java/org/saturnclient/saturnclient/auth/Auth.java | 7 +++---- .../saturnclient/saturnclient/auth/PlayerTracker.java | 3 ++- .../saturnclient/saturnclient/config/ConfigManager.java | 2 +- .../saturnclient/saturnclient/config/ThemeManager.java | 2 +- .../saturnclient/cosmetics/HatFeatureRenderer.java | 2 +- .../saturnclient/cosmetics/cloaks/Cloaks.java | 4 ++-- .../cosmetics/cloaks/utils/IdentifierUtils.java | 2 +- .../org/saturnclient/saturnclient/mixin/Crosshair.java | 9 +++------ .../saturnclient/saturnclient/mixin/NameTagMixin.java | 2 +- src/main/java/org/saturnclient/ui/SaturnUi.java | 1 + .../java/org/saturnclient/ui/components/SaturnFloat.java | 2 +- .../java/org/saturnclient/ui/components/SaturnHex.java | 2 +- .../org/saturnclient/ui/components/SaturnString.java | 2 +- .../java/org/saturnclient/ui/components/SkinPreview.java | 2 +- .../java/org/saturnclient/ui/widgets/SaturnButton.java | 4 +++- .../java/org/saturnclient/ui/widgets/SaturnInputBox.java | 2 +- src/main/java/org/saturnclient/ui2/RenderScope.java | 2 +- src/main/java/org/saturnclient/ui2/resources/Fonts.java | 2 +- src/main/resources/saturnclient.mixins.json | 2 +- 23 files changed, 36 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 247ab45..9f5c6bd 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ processResources { } } -def targetJavaVersion = 17 +def targetJavaVersion = 21 tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { diff --git a/src/main/java/org/saturnclient/modules/ModManager.java b/src/main/java/org/saturnclient/modules/ModManager.java index 67296c5..e482479 100644 --- a/src/main/java/org/saturnclient/modules/ModManager.java +++ b/src/main/java/org/saturnclient/modules/ModManager.java @@ -5,6 +5,8 @@ import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.util.math.MatrixStack; +import java.util.Objects; + import org.saturnclient.modules.mods.*; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig; @@ -23,7 +25,9 @@ public class ModManager { public static void init() { ClientTickEvents.START_CLIENT_TICK.register(client -> { - + if (SaturnClient.client.options.forwardKey.isPressed() && !SaturnClient.client.options.backKey.isPressed() && !SaturnClient.client.player.horizontalCollision) { + Objects.requireNonNull(SaturnClient.client.player).setSprinting(true); + } }); HudRenderCallback.EVENT.register((context, _o) -> { diff --git a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java index 4b0127a..cd751dc 100644 --- a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -1,6 +1,6 @@ package org.saturnclient.modules.mods; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.EquipmentSlot; @@ -13,6 +13,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.SaturnMod; import org.saturnclient.saturnclient.SaturnClientConfig; +import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.config.ConfigManager; import org.saturnclient.saturnclient.config.Property; import org.saturnclient.ui.Textures; diff --git a/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java b/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java index 0406ff0..868d4f8 100644 --- a/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java +++ b/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java @@ -1,6 +1,6 @@ package org.saturnclient.modules.mods; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.Identifier; diff --git a/src/main/java/org/saturnclient/saturnclient/auth/Auth.java b/src/main/java/org/saturnclient/saturnclient/auth/Auth.java index 30061a8..b284b14 100644 --- a/src/main/java/org/saturnclient/saturnclient/auth/Auth.java +++ b/src/main/java/org/saturnclient/saturnclient/auth/Auth.java @@ -22,13 +22,12 @@ public class Auth { ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> close()); try { - MinecraftClient client = SaturnClient.client; - if (client.getSession() == null) { + if (SaturnClient.client.getSession() == null) { SaturnClient.LOGGER.error("No active Minecraft session found"); return false; } - String accessToken = client.getSession().getAccessToken(); + String accessToken = SaturnClient.client.getSession().getAccessToken(); SaturnClient.LOGGER.info("Authenticating"); Network.init(); @@ -55,7 +54,7 @@ public class Auth { Cloaks.loadCloak(uuid); - playerNames.put(client.getSession().getUsername(), uuid); + playerNames.put(SaturnClient.client.getSession().getUsername(), uuid); afterAuth(); diff --git a/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java b/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java index 47e8e0a..a6aff97 100644 --- a/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java +++ b/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java @@ -2,8 +2,9 @@ package org.saturnclient.saturnclient.auth; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.client.MinecraftClient; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java b/src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java index 39ee93d..c76fdaa 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java +++ b/src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java @@ -12,7 +12,7 @@ import java.nio.file.Files; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient; public class ConfigManager { diff --git a/src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java b/src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java index 114663f..f3b6ead 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java +++ b/src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java @@ -16,7 +16,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; public class ThemeManager { diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java index 1e82d0b..da08814 100644 --- a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java +++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java @@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.cosmetics; import org.saturnclient.saturnclient.auth.SaturnPlayer; import org.saturnclient.saturnclient.auth.Auth; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.feature.FeatureRenderer; diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java index 6b42ca0..1fe20a8 100644 --- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java +++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java @@ -96,7 +96,7 @@ public class Cloaks { } // Register textures on main thread - net.minecraft.client.SaturnClient.client.execute(() -> { + SaturnClient.client.execute(() -> { try { List animatedFrames = new ArrayList<>(); for (int i = 0; i < frameCount; i++) { @@ -118,7 +118,7 @@ public class Cloaks { } }).start(); } else { - net.minecraft.client.SaturnClient.client.execute(() -> loadStaticCloak(player.cloak + ".png")); + SaturnClient.client.execute(() -> loadStaticCloak(player.cloak + ".png")); } } } diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java index 6320c95..40cda74 100644 --- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java +++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java @@ -1,6 +1,6 @@ package org.saturnclient.saturnclient.cosmetics.cloaks.utils; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.util.Identifier; diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java b/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java index 9ad5b43..0b4b560 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java @@ -6,7 +6,7 @@ package org.saturnclient.saturnclient.mixin; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderTickCounter; import net.minecraft.util.Identifier; @@ -22,9 +22,6 @@ import net.minecraft.client.gui.DrawContext; @Mixin(InGameHud.class) public class Crosshair { - @Shadow - @Final - private MinecraftClient client; @Unique Identifier textureLocation = Identifier.of("saturnclient", "textures/gui/hud/crosshair_range.png"); @@ -32,8 +29,8 @@ public class Crosshair { private void drawCrosshair(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) { if (org.saturnclient.modules.mods.Crosshair.enabled.value && org.saturnclient.modules.mods.Crosshair.range_indicator.value - && this.client.targetedEntity != null - && this.client.targetedEntity.isAlive()) { + && SaturnClient.client.targetedEntity != null + && SaturnClient.client.targetedEntity.isAlive()) { RenderSystem.setShaderTexture(0, textureLocation); int scaledWidth = 15; int scaledHeight = 15; diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java index c1043b0..e315656 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java @@ -1,6 +1,6 @@ package org.saturnclient.saturnclient.mixin; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer.TextLayerType; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/src/main/java/org/saturnclient/ui/SaturnUi.java b/src/main/java/org/saturnclient/ui/SaturnUi.java index 6e5f69d..d59bc3b 100644 --- a/src/main/java/org/saturnclient/ui/SaturnUi.java +++ b/src/main/java/org/saturnclient/ui/SaturnUi.java @@ -7,6 +7,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.gui.CubeMapRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnFloat.java b/src/main/java/org/saturnclient/ui/components/SaturnFloat.java index 726c88b..8348c5b 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnFloat.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnFloat.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnHex.java b/src/main/java/org/saturnclient/ui/components/SaturnHex.java index 925c2f1..bf66ddd 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnHex.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnHex.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnString.java b/src/main/java/org/saturnclient/ui/components/SaturnString.java index 2e61201..c7908b9 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnString.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnString.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/org/saturnclient/ui/components/SkinPreview.java b/src/main/java/org/saturnclient/ui/components/SkinPreview.java index ff5deb5..cbf3fd2 100644 --- a/src/main/java/org/saturnclient/ui/components/SkinPreview.java +++ b/src/main/java/org/saturnclient/ui/components/SkinPreview.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.Nullable; import org.joml.Quaternionf; import org.joml.Vector3f; import org.saturnclient.ui.SaturnWidget; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java index a4765c0..7e26284 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.widgets; import com.mojang.blaze3d.systems.RenderSystem; import java.util.function.Consumer; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; @@ -10,6 +10,8 @@ import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.Textures; +import net.minecraft.client.MinecraftClient; + public class SaturnButton extends SaturnWidget { diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java index 91f25c4..d428977 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.widgets; import org.saturnclient.ui.SaturnWidget; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/org/saturnclient/ui2/RenderScope.java b/src/main/java/org/saturnclient/ui2/RenderScope.java index a1f9175..1ebf58c 100644 --- a/src/main/java/org/saturnclient/ui2/RenderScope.java +++ b/src/main/java/org/saturnclient/ui2/RenderScope.java @@ -3,7 +3,7 @@ package org.saturnclient.ui2; import org.joml.Matrix4f; import org.saturnclient.ui2.resources.Fonts; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer.TextLayerType; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/org/saturnclient/ui2/resources/Fonts.java b/src/main/java/org/saturnclient/ui2/resources/Fonts.java index 9b630c8..3a1b2e7 100644 --- a/src/main/java/org/saturnclient/ui2/resources/Fonts.java +++ b/src/main/java/org/saturnclient/ui2/resources/Fonts.java @@ -1,6 +1,6 @@ package org.saturnclient.ui2.resources; -import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/main/resources/saturnclient.mixins.json b/src/main/resources/saturnclient.mixins.json index 7fc7fdb..8541d59 100644 --- a/src/main/resources/saturnclient.mixins.json +++ b/src/main/resources/saturnclient.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "org.saturnclient.saturnclient.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "TabListMixin", "NameTagMixin",