auto Sprint and Clock

2026-03-06 23:37:03 +01:00
parent debf9ce96d
commit 5544946769
5 changed files with 89 additions and 14 deletions
@@ -1,13 +1,14 @@
 package org.saturnclient.impl;

-import org.saturnclient.impl.modules.ArmorDisplayFabric;
 import org.saturnclient.modules.Module;
 import org.saturnclient.modules.ModManager.ModuleProvider;
 import org.saturnclient.modules.mods.*;
+import org.saturnclient.impl.modules.*;

 public class FabricModuleProvider implements ModuleProvider {
    public static Module[] MODS = {
-            new ArmorDisplay(new ArmorDisplayFabric())
+            new ArmorDisplay(new ArmorDisplayFabric()),
+            new AutoSprint(new AutoSprintFabric())
    };

    @Override
@@ -0,0 +1,50 @@
+package org.saturnclient.impl.modules;
+
+import org.saturnclient.modules.interfaces.AutoSprintInterface;
+
+import net.minecraft.client.MinecraftClient;
+
+public class AutoSprintFabric implements AutoSprintInterface {
+
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
+    @Override
+    public boolean hasPlayer() {
+        return mc.player != null;
+    }
+
+    @Override
+    public boolean hasNetwork() {
+        return mc.getNetworkHandler() != null;
+    }
+
+    @Override
+    public boolean isForwardPressed() {
+        return mc.options.forwardKey.isPressed();
+    }
+
+    @Override
+    public boolean isBackPressed() {
+        return mc.options.backKey.isPressed();
+    }
+
+    @Override
+    public boolean isSneaking() {
+        return mc.player.isSneaking();
+    }
+
+    @Override
+    public boolean hasHorizontalCollision() {
+        return mc.player.horizontalCollision;
+    }
+
+    @Override
+    public boolean isUsingItem() {
+        return mc.player.isUsingItem();
+    }
+
+    @Override
+    public void setSprinting(boolean sprinting) {
+        mc.player.setSprinting(sprinting);
+    }
+}
@@ -1,46 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import java.util.Objects;
-
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.config.manager.Property;
-
-public class AutoSprint extends Module {
-    private static Property<Boolean> enabled = Property.bool(false);
-
-    public AutoSprint() {
-        super(
-                new ModuleDetails("Auto Sprint", "sprint")
-                        .description("Makes the player always sprint")
-                        .tags("Movement")
-                        .version("v0.1.0"),
-                enabled.named("Enabled"));
-    }
-
-    @Override
-    public void tick() {
-        if (SaturnClient.client.player == null || SaturnClient.client.getNetworkHandler() == null) {
-            return;
-        }
-        if (SaturnClient.client.options.forwardKey.isPressed()
-                && !SaturnClient.client.options.backKey.isPressed()
-                && !SaturnClient.client.player.isSneaking()
-                && !SaturnClient.client.player.horizontalCollision
-                && !SaturnClient.client.player.isUsingItem()) {
-
-            Objects.requireNonNull(SaturnClient.client.player).setSprinting(true);
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}
@@ -1,82 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import java.time.format.DateTimeFormatter;
-import java.time.LocalTime;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.config.manager.Property;
-import org.saturnclient.ui.RenderScope;
-import org.saturnclient.ui.resources.Fonts;
-
-public class Clock extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static Property<Integer> format = Property.select(0, "24 hour", "12 hour");
-    private static Property<Boolean> seconds = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
-
-    public Clock() {
-        super(new ModuleDetails("Clock", "clock")
-                .description("Displays the current real-world time")
-                .version("v0.1.0")
-                .tags("Utility"),
-                enabled.named("Enabled"),
-                format.named("Format"),
-                seconds.named("Show seconds"),
-                dimensions.prop());
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderClock(scope);
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        renderClock(scope);
-    }
-
-    public void renderClock(RenderScope scope) {
-        String text = "";
-        LocalTime currentTime = LocalTime.now();
-
-        switch (format.value) {
-            case 0:
-                if (seconds.value) {
-                    text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss"));
-                } else {
-                    text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm"));
-                }
-                break;
-            case 1:
-                if (seconds.value) {
-                    text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a"));
-                } else {
-                    text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a"));
-                }
-                break;
-        }
-
-        scope.drawText(text,
-                0, 0, dimensions.font.value, dimensions.fgColor.value);
-        dimensions.width = Fonts.getWidth(text, dimensions.font.value);
-        dimensions.height = 18 * text.split("\n").length;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}