This commit is contained in:
2025-04-22 15:23:36 -05:00
parent 8dd13364fb
commit 81056dd7d7
19 changed files with 48 additions and 43 deletions
@@ -1,4 +1,4 @@
package org.saturnclient.saturnmods;
package org.saturnclient.modules;
import net.minecraft.client.gui.DrawContext;
@@ -1,4 +1,4 @@
package org.saturnclient.saturnmods;
package org.saturnclient.modules;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
@@ -1,15 +1,14 @@
package org.saturnclient.saturnmods;
package org.saturnclient.modules;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.util.math.MatrixStack;
import org.saturnclient.modules.mods.*;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.menus.HudEditor;
import org.saturnclient.saturnmods.mods.*;
public class ModManager {
@@ -28,11 +27,10 @@ public class ModManager {
});
HudRenderCallback.EVENT.register((context, _o) -> {
MinecraftClient client = SaturnClient.client;
TextRenderer textRenderer = client.textRenderer;
TextRenderer textRenderer = SaturnClient.client.textRenderer;
if (textRenderer != null &&
!(client.currentScreen instanceof HudEditor)) {
!(SaturnClient.client.currentScreen instanceof HudEditor)) {
SaturnClientConfig.textRenderer = textRenderer;
for (SaturnMod m : MODS) {
@@ -1,4 +1,4 @@
package org.saturnclient.saturnmods;
package org.saturnclient.modules;
import org.saturnclient.saturnclient.config.ConfigManager;
@@ -1,4 +1,4 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
@@ -8,12 +8,13 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.Identifier;
import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.HudMod;
import org.saturnclient.saturnmods.ModDimensions;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
public class ArmorDisplay implements SaturnMod, HudMod {
@@ -1,15 +1,16 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.Identifier;
import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.HudMod;
import org.saturnclient.saturnmods.ModDimensions;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
public class Coordinates implements SaturnMod, HudMod {
@@ -1,9 +1,10 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import net.minecraft.util.Identifier;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
public class Crosshair implements SaturnMod {
@@ -1,14 +1,15 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.util.Identifier;
import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.HudMod;
import org.saturnclient.saturnmods.ModDimensions;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
public class FpsDisplay implements SaturnMod, HudMod {
@@ -1,8 +1,8 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
import net.minecraft.client.option.Perspective;
@@ -1,10 +1,11 @@
package org.saturnclient.saturnmods.mods;
package org.saturnclient.modules.mods;
import net.minecraft.util.Identifier;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.Textures;
public class Particles implements SaturnMod {
@@ -6,6 +6,7 @@ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.TitleScreen;
import org.saturnclient.modules.ModManager;
import org.saturnclient.saturnclient.auth.Auth;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.ThemeManager;
@@ -14,7 +15,6 @@ import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
import org.saturnclient.saturnclient.event.KeyInputHandler;
import org.saturnclient.saturnclient.menus.SaturnMenu;
import org.saturnclient.saturnclient.menus.SaturnTitleScreen;
import org.saturnclient.saturnmods.ModManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -5,8 +5,9 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.option.Perspective;
import net.minecraft.client.util.InputUtil;
import org.saturnclient.modules.mods.FreeLook;
import org.saturnclient.saturnclient.menus.SaturnMenu;
import org.saturnclient.saturnmods.mods.FreeLook;
import org.lwjgl.glfw.GLFW;
/**
@@ -5,11 +5,11 @@ import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text;
import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.ModManager;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnmods.HudMod;
import org.saturnclient.saturnmods.ModDimensions;
import org.saturnclient.saturnmods.ModManager;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.SaturnUi;
import java.util.ArrayList;
@@ -1,11 +1,12 @@
package org.saturnclient.saturnclient.menus;
import net.minecraft.text.Text;
import org.saturnclient.modules.ModManager;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnmods.ModManager;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.Textures;
import org.saturnclient.ui.components.SaturnModComp;
@@ -1,10 +1,10 @@
package org.saturnclient.saturnclient.mixin;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.Camera;
import org.saturnclient.modules.mods.FreeLook;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
import org.saturnclient.saturnmods.mods.FreeLook;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@@ -30,8 +30,8 @@ public class Crosshair {
@Inject(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V", ordinal = 0))
private void drawCrosshair(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
if (org.saturnclient.saturnmods.mods.Crosshair.enabled.value
&& org.saturnclient.saturnmods.mods.Crosshair.range_indicator.value
if (org.saturnclient.modules.mods.Crosshair.enabled.value
&& org.saturnclient.modules.mods.Crosshair.range_indicator.value
&& this.client.targetedEntity != null
&& this.client.targetedEntity.isAlive()) {
RenderSystem.setShaderTexture(0, textureLocation);
@@ -4,8 +4,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.MathHelper;
import org.saturnclient.modules.mods.FreeLook;
import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
import org.saturnclient.saturnmods.mods.FreeLook;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@@ -6,7 +6,7 @@ import net.minecraft.client.particle.TotemParticle;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnmods.mods.Particles;
import org.saturnclient.modules.mods.Particles;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -2,10 +2,10 @@ package org.saturnclient.ui.components;
import net.minecraft.client.gui.DrawContext;
import org.saturnclient.modules.SaturnMod;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.menus.ConfigEditor;
import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures;