saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

i almost got cooked

Browse Source
This commit is contained in:
selimaj-dev
2025-04-22 16:20:35 -05:00
parent 81056dd7d7
commit 052a56bcb0
23 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -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()) {
src/main/java/org/saturnclient/modules/ModManager.java
+5 -1
View File
@@ -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) -> {
src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java
+2 -1
View File
@@ -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;
src/main/java/org/saturnclient/modules/mods/FpsDisplay.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/saturnclient/auth/Auth.java
+3 -4
View File
@@ -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();
src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java
+2 -1
View File
@@ -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;
src/main/java/org/saturnclient/saturnclient/config/ConfigManager.java
+1 -1
View File
@@ -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 {
src/main/java/org/saturnclient/saturnclient/config/ThemeManager.java
+1 -1
View File
@@ -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 {
src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+2 -2
View File
@@ -96,7 +96,7 @@ public class Cloaks {
}
// Register textures on main thread
net.minecraft.client.SaturnClient.client.execute(() -> {
SaturnClient.client.execute(() -> {
try {
List<AnimatedCloakData> 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"));
}
}
}
src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java
+3 -6
View File
@@ -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;
src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui/SaturnUi.java
+1
View File
@@ -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;
src/main/java/org/saturnclient/ui/components/SaturnFloat.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui/components/SaturnHex.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui/components/SaturnString.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui/components/SkinPreview.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
+3 -1
View File
@@ -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 {
src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui2/RenderScope.java
+1 -1
View File
@@ -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;
src/main/java/org/saturnclient/ui2/resources/Fonts.java
+1 -1
View File
@@ -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;
src/main/resources/saturnclient.mixins.json
+1 -1
View File
@@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "org.saturnclient.saturnclient.mixin",
"compatibilityLevel": "JAVA_17",
"compatibilityLevel": "JAVA_21",
"client": [
"TabListMixin",
"NameTagMixin",